use usual log levels

mlietzow · mlietzow · commit 793a894a79b8 · 2025-01-20T13:01:05.000+01:00
diff --git a/compile.sh b/compile.sh
@@ -323,7 +323,7 @@ function usage() {
     echo "usage: compile.sh [-h] [-frdu] [-c CXX_COMPILER] [-g CMAKE_GENERATOR]"
     echo ""
     echo "Install POLARIS, PolarisTools, and optionally the cfitsio and CCfits libraries"
-    echo -e "${YELLOW}HINT:${NC} For first installation, use option -f"
+    echo -e "${YELLOW}Info:${NC} For first installation, use option -f"
     echo ""
     echo "optional arguments:"
     echo "-h      show this help message and exit"
@@ -401,7 +401,7 @@ if $release && $debug; then CO="fast-debug"; fi
 
 # Print hint for first installation
 echo ""
-echo -e "${YELLOW}HINT:${NC} For first installation, use option -f"
+echo -e "${YELLOW}Info:${NC} For first installation, use option -f"
 echo ""
 
 
diff --git a/projects/disk/example/dust_mc/POLARIS.cmd b/projects/disk/example/dust_mc/POLARIS.cmd
@@ -33,7 +33,7 @@
 	<source_star nr_photons = "1e7">	0	0	0	0.9	4000
 	
 	# include dust as source to consider self-scattering (optionally)
-	# HINT: a temperature simulation has to be performed first
+	# INFO: a temperature simulation has to be performed first
 	# and the grid file containing the dust temperature has to be used (see below)
 	# <source_dust nr_photons = "1e8">
 
diff --git a/src/CommandParser.cpp b/src/CommandParser.cpp
@@ -1225,9 +1225,7 @@ bool CCommandParser::parseLine(parameters * param, string cmd, string data, uint
         // HINT: +1 because the gas species id is not saved in the gas_species list!
         if(values.size() != (NR_OF_LINE_DET + 1))
         {
-            cout << ERROR_LINE << "Number of parameters in line detector could not be "
-                    "recognized!"
-                 << endl;
+            cout << ERROR_LINE << "Number of parameters in line detector could not be recognized!" << endl;
             return false;
         }
 
@@ -2517,9 +2515,7 @@ bool CCommandParser::parseLine(parameters * param, string cmd, string data, uint
         }
         else if(P_l < 0)
         {
-            cout << NOTE_LINE << "Chosen polarization of source star is less than 0 (now set "
-                    "to 0)!"
-                 << endl;
+            cout << INFO_LINE << "Chosen polarization of source star is less than 0 (now set to 0)!" << endl;
             values[5] = 0;
             values[6] = 0;
         }
@@ -2582,9 +2578,7 @@ bool CCommandParser::parseLine(parameters * param, string cmd, string data, uint
         }
         else if(P_l < 0)
         {
-            cout << NOTE_LINE << "Chosen polarization of source star is less than 0 (now set "
-                    "to 0)!"
-                 << endl;
+            cout << INFO_LINE << "Chosen polarization of source star is less than 0 (now set to 0)!" << endl;
             values[6] = 0;
             values[7] = 0;
         }
diff --git a/src/DustComponent.cpp b/src/DustComponent.cpp
@@ -1409,8 +1409,8 @@ bool CDustComponent::readDustRefractiveIndexFile(parameters & param,
 
     if(max_rel_diff > 0.5) // arbitrary limit
     {
-        cout << WARNING_LINE << "Number of scattering angles might be too low (max rel diff = " << max_rel_diff << ").\n"
-             << "         If required, increase 'NANG' or decrease 'MAX_MIE_SCA_REL_DIFF' (for x < 100) in src/Typedefs.h and recompile!" << endl;
+        cout << WARNING_LINE << "Number of scattering angles might be too low (max rel diff = " << max_rel_diff << ")." << endl;
+        cout << "  If required, increase 'NANG' or decrease 'MAX_MIE_SCA_REL_DIFF' (for x < 100) in src/Typedefs.h and recompile!" << endl;
     }
 
     return true;
diff --git a/src/DustMixture.cpp b/src/DustMixture.cpp
@@ -260,7 +260,7 @@ void CDustMixture::printParameters(parameters & param, CGridBasic * grid)
                     "temperatures"
                  << endl;
             if(param.getStochasticHeatingMaxSize() > 0)
-                cout << NOTE_LINE << "Stochastic heating was already calculated. This "
+                cout << INFO_LINE << "Stochastic heating was already calculated. This "
                         "should not happen!"
                      << endl;
         }
@@ -395,11 +395,9 @@ void CDustMixture::printParameters(parameters & param, CGridBasic * grid)
                  << param.getStochasticHeatingMaxSize() << " [m]" << endl;
         else if(param.getStochasticHeatingMaxSize() > 0 && param.getSaveRadiationField())
         {
-            cout << NOTE_LINE << "Stochastic heating and saving the radiation field is chosen." << endl
-                 << "      The radiation field will be saved and stochastic heating "
-                    "should be set"
-                 << endl
-                 << "      with CMD_DUST_EMISSION simulation." << endl;
+            cout << INFO_LINE << "Stochastic heating and saving the radiation field is chosen." << endl;
+            cout << "  The radiation field will be saved and stochastic heating should be set" << endl;
+            cout << "  with CMD_DUST_EMISSION simulation." << endl;
         }
     }
 
@@ -1607,7 +1605,7 @@ void CDustMixture::scatter(CGridBasic * grid, photon_package * pp, CRandomGenera
                 *pp->getStokesVector() *= getCscaMean(grid, *pp) / getCextMean(grid, *pp);
             else
             {
-                cout << NOTE_LINE << "Mean cross section for extinction is zero or negative!" << endl;
+                cout << INFO_LINE << "Mean cross section for extinction is zero or negative!" << endl;
                 pp->getStokesVector()->clear();
             }
         }
@@ -1710,7 +1708,7 @@ void CDustMixture::getEscapePhoton(CGridBasic * grid,
             *pp_escape->getStokesVector() *= getCscaMean(grid, *pp) / getCextMean(grid, *pp);
         else
         {
-            cout << NOTE_LINE << "Mean cross section for extinction is zero or negative!" << endl;
+            cout << INFO_LINE << "Mean cross section for extinction is zero or negative!" << endl;
             pp_escape->getStokesVector()->clear();
         }
     }
diff --git a/src/GasMixture.cpp b/src/GasMixture.cpp
@@ -514,8 +514,10 @@ void CGasMixture::printParameters(parameters & param, CGridBasic * grid)
     cout << SEP_LINE;
     cout << "- Velocity field                : ";
     if(getKeplerStarMass() > 0)
-        cout << "kepler rotation, M_star: " << getKeplerStarMass() << " [M_sun]\n"
-             << "\nHINT: only available with one central star" << endl;
+    {
+        cout << "kepler rotation, M_star: " << getKeplerStarMass() << " [M_sun]" << endl;
+        cout << INFO_LINE << "Only available with one central star" << endl;
+    }
     else if(grid->isVelocityFieldAvailable())
         cout << "taken from grid" << endl;
     else
diff --git a/src/GridBasic.cpp b/src/GridBasic.cpp
@@ -1478,10 +1478,10 @@ bool CGridBasic::writeMidplaneFits(string data_path, parameters & param, uint bi
                 plt_rad_field1 = true;
 
                 if(!spec_length_as_vector)
-                    cout << NOTE_LINE << "The full radiation field can only be saved if it was used by the "
-                            "simulation\n"
-                            "      (when saving the radiation field in the grid or calculating RATs)!"
-                         << endl;
+                {
+                    cout << INFO_LINE << "The full radiation field can only be saved if it was used by the simulation" << endl;
+                    cout << "  (when saving the radiation field in the grid or calculating RATs)!" << endl;
+                }
                 break;
 
             case 3:
@@ -5391,7 +5391,7 @@ uint CGridBasic::CheckSynchrotron(parameters & param)
     {
         if(data_pos_T_e != MAX_UINT)
         {
-            cout << NOTE_LINE << "Grid contains a electron temperature component!" << endl;
+            cout << INFO_LINE << "Grid contains a electron temperature component!" << endl;
             cout << "      This component is currently ignored!          " << endl;
         }
     }
@@ -5504,7 +5504,7 @@ uint CGridBasic::CheckTemp(parameters & param, uint & tmp_data_offset)
             data_ids.push_back(GRIDgas_temp);
             tmp_data_offset++;
             cout << SEP_LINE;
-            cout << NOTE_LINE << "No gas temperature found in grid." << endl;
+            cout << INFO_LINE << "No gas temperature found in grid." << endl;
             cout << "    Add entry and set gas temperature to dust temperature after "
                     "calculation!"
                     << endl;
diff --git a/src/GridCylindrical.cpp b/src/GridCylindrical.cpp
@@ -393,13 +393,8 @@ bool CGridCylindrical::loadGridFromBinaryFile(parameters & param, uint _data_len
 
                 if(dz == 0)
                 {
-                    cout << ERROR_LINE << "No step size in z-direction of cylindrical grid!" << endl
-                         << "\nHINT: Update of POLARIS v4.02 includes variable phi "
-                            "spacing."
-                         << endl
-                         << "      Please look in the manual or use \"polaris-gen ... "
-                            "--update\""
-                         << endl;
+                    cout << ERROR_LINE << "No step size in z-direction of cylindrical grid!" << endl;
+                    cout << "Please look in the manual" << endl;
                     return false;
                 }
 
diff --git a/src/GridSpherical.cpp b/src/GridSpherical.cpp
@@ -247,9 +247,7 @@ bool CGridSpherical::loadGridFromBinaryFile(parameters & param, uint _data_len)
 
             if(dr == 0)
             {
-                cout << ERROR_LINE << "Cannot write to:\n No step size in r-direction of "
-                        "spherical grid!"
-                     << endl;
+                cout << ERROR_LINE << "No step size in r-direction of spherical grid!" << endl;
                 return false;
             }
 
@@ -267,9 +265,7 @@ bool CGridSpherical::loadGridFromBinaryFile(parameters & param, uint _data_len)
 
                 if(dph == 0)
                 {
-                    cout << ERROR_LINE << "Cannot write to:\n No step size in phi-direction "
-                            "of spherical grid!"
-                         << endl;
+                    cout << ERROR_LINE << "No step size in phi-direction of spherical grid!" << endl;
                     return false;
                 }
 
@@ -287,15 +283,7 @@ bool CGridSpherical::loadGridFromBinaryFile(parameters & param, uint _data_len)
 
                 if(dth == 0)
                 {
-                    cout << ERROR_LINE << "Cannot write to:\n No step size in theta-direction "
-                            "of spherical grid!"
-                         << endl
-                         << "\nHINT: Update of POLARIS v4.02 includes variable phi "
-                            "spacing."
-                         << endl
-                         << "      Please look in the manual or use \"polaris-gen ... "
-                            "--update\""
-                         << endl;
+                    cout << ERROR_LINE << "No step size in theta-direction of spherical grid!" << endl;
                     return false;
                 }
 
diff --git a/src/Parameters.cpp b/src/Parameters.cpp
@@ -965,8 +965,7 @@ void parameters::set3dMidplane(uint plane, uint nr_of_slices, double z_min, doub
         midplane_3d_param.push_back(z_max);
     }
     else
-        cout << NOTE_LINE << "Multiple 3D midplane plot commands found. The first command "
-                "will be considered!";
+        cout << INFO_LINE << "Multiple 3D midplane plot commands found. The first command will be considered!" << endl;
 }
 
 void parameters::setInpMidDataPoints(uint val)
@@ -1109,32 +1108,40 @@ void parameters::setSIConvVField(double val)
 void parameters::updateSIConvLength(double val)
 {
     if(conv_l_in_SI != 1 && val != 1)
-        cout << NOTE_LINE << "<conv_len> may not be used multiple times!" << endl
-                << "      -> No problem if <path_grid_cgs> was used!" << endl;
+    {
+        cout << INFO_LINE << "<conv_len> may not be used multiple times!" << endl;
+        cout << "  -> No problem if <path_grid_cgs> was used!" << endl;
+    }
     conv_l_in_SI *= val;
 }
 
 void parameters::updateSIConvDH(double val)
 {
     if(conv_dH_in_SI != 1 && val != 1)
-        cout << NOTE_LINE << "<conv_dens> may not be used multiple times!" << endl
-                << "      -> No problem if <path_grid_cgs> was used!" << endl;
+    {
+        cout << INFO_LINE << "<conv_dens> may not be used multiple times!" << endl;
+        cout << "  -> No problem if <path_grid_cgs> was used!" << endl;
+    }
     conv_dH_in_SI *= val;
 }
 
 void parameters::updateSIConvBField(double val)
 {
     if(conv_B_in_SI != 1 && val != 1)
-        cout << NOTE_LINE << "<conv_mag> may not be used multiple times!" << endl
-                << "      -> No problem if <path_grid_cgs> was used!" << endl;
+    {
+        cout << INFO_LINE << "<conv_mag> may not be used multiple times!" << endl;
+        cout << "  -> No problem if <path_grid_cgs> was used!" << endl;
+    }
     conv_B_in_SI *= val;
 }
 
 void parameters::updateSIConvVField(double val)
 {
     if(conv_V_in_SI != 1 && val != 1)
-        cout << NOTE_LINE << "<conv_vel> may not be used multiple times!" << endl
-                << "      -> No problem if <path_grid_cgs> was used!" << endl;
+    {
+        cout << INFO_LINE << "<conv_vel> may not be used multiple times!" << endl;
+        cout << "  -> No problem if <path_grid_cgs> was used!" << endl;
+    }
     conv_V_in_SI *= val;
 }
 
diff --git a/src/Pipeline.cpp b/src/Pipeline.cpp
@@ -785,11 +785,11 @@ CDetector * CPipeline::createDetectorList(parameters & param, CDustMixture * dus
         detector[pos].setOrientation(axis1, axis2, rot_angle_1, rot_angle_2);
         /*if(param.getPeelOff() && param.getNrOfDustPhotons() != 0)
         {
-            cout << NOTE_LINE << "Peel-off technique disabled for self-scattering of dust grain
+            cout << INFO_LINE << "Peel-off technique disabled for self-scattering of dust grain
         emission!" << endl; param.setPeelOff(false);
         }*/
         if(param.getPeelOff() && param.getAcceptanceAngle() > 1.0)
-            cout << NOTE_LINE << "Peel-off technique needs no acceptance angle!" << endl;
+            cout << INFO_LINE << "Peel-off technique needs no acceptance angle!" << endl;
         else
             detector[pos].setAcceptanceAngle(param.getAcceptanceAngle() * PI / 180.0);
     }
@@ -824,7 +824,7 @@ void CPipeline::createSourceLists(parameters & param, CDustMixture * dust, CGrid
 
         if(param.getNrOfBackgroundSources() == 0)
         {
-            cout << NOTE_LINE << "No background source was defined!" << endl;
+            cout << INFO_LINE << "No background source was defined!" << endl;
             cout << "- Default background source initiated." << endl;
             cout << SEP_LINE;
 
diff --git a/src/RadiativeTransfer.cpp b/src/RadiativeTransfer.cpp
@@ -1103,7 +1103,7 @@ bool CRadiativeTransfer::calcMonteCarloLvlPopulation(uint i_species, uint global
     if(global_iteration_counter == MC_LVL_POP_MAX_GLOBAL_ITER)
     {
         cout << CLR_LINE;
-        cout << NOTE_LINE << "Global iteration not reached! Continue, but results might be wrong!" << endl;
+        cout << INFO_LINE << "Global iteration not reached! Continue, but results might be wrong!" << endl;
     }
 
     // Format prints
@@ -1820,9 +1820,8 @@ bool CRadiativeTransfer::calcPolMapsViaMC()
         if(peel_off && tm_source->getID() == SRC_DUST)
         {
             cout << CLR_LINE;
-            cout << NOTE_LINE << "MC simulations with dust source and peel-off include only "
-                    "the scattered radiation.\n"
-                 << "Add results from Raytracing simulations for full dust emission!" << endl;
+            cout << INFO_LINE << "MC simulations with dust source and peel-off include only the scattered radiation." << endl;
+            cout << "  Add results from Raytracing simulations for full dust emission!" << endl;
         }
     }
 
@@ -2170,10 +2169,10 @@ bool CRadiativeTransfer::calcSyncMapsViaRaytracing(parameters & param)
             if(tracer[i_det]->getSubpixelWarning())
             {
                 cout << WARNING_LINE << "level of subpixeling (" << param.getMaxSubpixelLvl() << ") might be too low" << endl;
-                cout << "if required, increase the maximum level of subpixeling with <max_subpixel_lvl> in the command file" << endl;
+                cout << "  if required, increase the maximum level of subpixeling with <max_subpixel_lvl> in the command file" << endl;
             }
             // if(tracer[i_det]->getDetectorShape() == DET_PLANE && (grid->getDataID() == GRID_ID_SPH || grid->getDataID() == GRID_ID_CYL))
-            //     cout << NOTE_LINE << "a 'polar' detector should be used for a spherical or cylindrical grid" << endl;
+            //     cout << INFO_LINE << "a 'polar' detector should be used for a spherical or cylindrical grid" << endl;
         }
     }
 
@@ -2661,10 +2660,10 @@ bool CRadiativeTransfer::calcPolMapsViaRaytracing(parameters & param)
             if(tracer[i_det]->getSubpixelWarning())
             {
                 cout << WARNING_LINE << "level of subpixeling (" << param.getMaxSubpixelLvl() << ") might be too low" << endl;
-                cout << "if required, increase the maximum level of subpixeling with <max_subpixel_lvl> in the command file" << endl;
+                cout << "  if required, increase the maximum level of subpixeling with <max_subpixel_lvl> in the command file" << endl;
             }
             // if(tracer[i_det]->getDetectorShape() == DET_PLANE && (grid->getDataID() == GRID_ID_SPH || grid->getDataID() == GRID_ID_CYL))
-            //     cout << NOTE_LINE << "a 'polar' detector should be used for a spherical or cylindrical grid" << endl;
+            //     cout << INFO_LINE << "a 'polar' detector should be used for a spherical or cylindrical grid" << endl;
         }
     }
 
@@ -3116,10 +3115,10 @@ bool CRadiativeTransfer::calcOPIATEMapsViaRaytracing(parameters& param)
         if(tracer[i_det]->getSubpixelWarning())
         {
             cout << WARNING_LINE << "level of subpixeling (" << param.getMaxSubpixelLvl() << ") might be too low" << endl;
-            cout << "if required, increase the maximum level of subpixeling with <max_subpixel_lvl> in the command file" << endl;
+            cout << "  if required, increase the maximum level of subpixeling with <max_subpixel_lvl> in the command file" << endl;
         }
         // if(tracer[i_det]->getDetectorShape() == DET_PLANE && (grid->getDataID() == GRID_ID_SPH || grid->getDataID() == GRID_ID_CYL))
-        //     cout << NOTE_LINE << "a 'polar' detector should be used for a spherical or cylindrical grid" << endl;
+        //     cout << INFO_LINE << "a 'polar' detector should be used for a spherical or cylindrical grid" << endl;
     }
 
     cout << CLR_LINE;
@@ -3248,10 +3247,10 @@ bool CRadiativeTransfer::calcChMapsViaRaytracing(parameters & param)
             if(tracer[i_det]->getSubpixelWarning())
             {
                 cout << WARNING_LINE << "level of subpixeling (" << param.getMaxSubpixelLvl() << ") might be too low" << endl;
-                cout << "if required, increase the maximum level of subpixeling with <max_subpixel_lvl> in the command file" << endl;
+                cout << "  if required, increase the maximum level of subpixeling with <max_subpixel_lvl> in the command file" << endl;
             }
             // if(tracer[i_det]->getDetectorShape() == DET_PLANE && (grid->getDataID() == GRID_ID_SPH || grid->getDataID() == GRID_ID_CYL))
-            //     cout << NOTE_LINE << "a 'polar' detector should be used for a spherical or cylindrical grid" << endl;
+            //     cout << INFO_LINE << "a 'polar' detector should be used for a spherical or cylindrical grid" << endl;
 
             // Increment index for line RT
             i_det++;
diff --git a/src/RaytracingPolar.cpp b/src/RaytracingPolar.cpp
diff --git a/src/Typedefs.hpp b/src/Typedefs.hpp

Original file line number	Diff line number	Diff line change
`@@ -1225,9 +1225,7 @@ bool CCommandParser::parseLine(parameters * param, string cmd, string data, uint`
`1225`	`1225`	`// HINT: +1 because the gas species id is not saved in the gas_species list!`
`1226`	`1226`	`if(values.size() != (NR_OF_LINE_DET + 1))`
`1227`	`1227`	`{`
`1228`		`- cout << ERROR_LINE << "Number of parameters in line detector could not be "`
`1229`		`- "recognized!"`
`1230`		`- << endl;`
	`1228`	`+ cout << ERROR_LINE << "Number of parameters in line detector could not be recognized!" << endl;`
`1231`	`1229`	`return false;`
`1232`	`1230`	`}`
`1233`	`1231`
`@@ -2517,9 +2515,7 @@ bool CCommandParser::parseLine(parameters * param, string cmd, string data, uint`
`2517`	`2515`	`}`
`2518`	`2516`	`else if(P_l < 0)`
`2519`	`2517`	`{`
`2520`		`- cout << NOTE_LINE << "Chosen polarization of source star is less than 0 (now set "`
`2521`		`- "to 0)!"`
`2522`		`- << endl;`
	`2518`	`+ cout << INFO_LINE << "Chosen polarization of source star is less than 0 (now set to 0)!" << endl;`
`2523`	`2519`	`values[5] = 0;`
`2524`	`2520`	`values[6] = 0;`
`2525`	`2521`	`}`
`@@ -2582,9 +2578,7 @@ bool CCommandParser::parseLine(parameters * param, string cmd, string data, uint`
`2582`	`2578`	`}`
`2583`	`2579`	`else if(P_l < 0)`
`2584`	`2580`	`{`
`2585`		`- cout << NOTE_LINE << "Chosen polarization of source star is less than 0 (now set "`
`2586`		`- "to 0)!"`
`2587`		`- << endl;`
	`2581`	`+ cout << INFO_LINE << "Chosen polarization of source star is less than 0 (now set to 0)!" << endl;`
`2588`	`2582`	`values[6] = 0;`
`2589`	`2583`	`values[7] = 0;`
`2590`	`2584`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1409,8 +1409,8 @@ bool CDustComponent::readDustRefractiveIndexFile(parameters & param,`
`1409`	`1409`
`1410`	`1410`	`if(max_rel_diff > 0.5) // arbitrary limit`
`1411`	`1411`	`{`
`1412`		`- cout << WARNING_LINE << "Number of scattering angles might be too low (max rel diff = " << max_rel_diff << ").\n"`
`1413`		`- << " If required, increase 'NANG' or decrease 'MAX_MIE_SCA_REL_DIFF' (for x < 100) in src/Typedefs.h and recompile!" << endl;`
	`1412`	`+ cout << WARNING_LINE << "Number of scattering angles might be too low (max rel diff = " << max_rel_diff << ")." << endl;`
	`1413`	`+ cout << " If required, increase 'NANG' or decrease 'MAX_MIE_SCA_REL_DIFF' (for x < 100) in src/Typedefs.h and recompile!" << endl;`
`1414`	`1414`	`}`
`1415`	`1415`
`1416`	`1416`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ void CDustMixture::printParameters(parameters & param, CGridBasic * grid)`
`260`	`260`	`"temperatures"`
`261`	`261`	`<< endl;`
`262`	`262`	`if(param.getStochasticHeatingMaxSize() > 0)`
`263`		`- cout << NOTE_LINE << "Stochastic heating was already calculated. This "`
	`263`	`+ cout << INFO_LINE << "Stochastic heating was already calculated. This "`
`264`	`264`	`"should not happen!"`
`265`	`265`	`<< endl;`
`266`	`266`	`}`
`@@ -395,11 +395,9 @@ void CDustMixture::printParameters(parameters & param, CGridBasic * grid)`
`395`	`395`	`<< param.getStochasticHeatingMaxSize() << " [m]" << endl;`
`396`	`396`	`else if(param.getStochasticHeatingMaxSize() > 0 && param.getSaveRadiationField())`
`397`	`397`	`{`
`398`		`- cout << NOTE_LINE << "Stochastic heating and saving the radiation field is chosen." << endl`
`399`		`- << " The radiation field will be saved and stochastic heating "`
`400`		`- "should be set"`
`401`		`- << endl`
`402`		`- << " with CMD_DUST_EMISSION simulation." << endl;`
	`398`	`+ cout << INFO_LINE << "Stochastic heating and saving the radiation field is chosen." << endl;`
	`399`	`+ cout << " The radiation field will be saved and stochastic heating should be set" << endl;`
	`400`	`+ cout << " with CMD_DUST_EMISSION simulation." << endl;`
`403`	`401`	`}`
`404`	`402`	`}`
`405`	`403`
`@@ -1607,7 +1605,7 @@ void CDustMixture::scatter(CGridBasic * grid, photon_package * pp, CRandomGenera`
`1607`	`1605`	`pp->getStokesVector() = getCscaMean(grid, pp) / getCextMean(grid, pp);`
`1608`	`1606`	`else`
`1609`	`1607`	`{`
`1610`		`- cout << NOTE_LINE << "Mean cross section for extinction is zero or negative!" << endl;`
	`1608`	`+ cout << INFO_LINE << "Mean cross section for extinction is zero or negative!" << endl;`
`1611`	`1609`	`pp->getStokesVector()->clear();`
`1612`	`1610`	`}`
`1613`	`1611`	`}`
`@@ -1710,7 +1708,7 @@ void CDustMixture::getEscapePhoton(CGridBasic * grid,`
`1710`	`1708`	`pp_escape->getStokesVector() = getCscaMean(grid, pp) / getCextMean(grid, pp);`
`1711`	`1709`	`else`
`1712`	`1710`	`{`
`1713`		`- cout << NOTE_LINE << "Mean cross section for extinction is zero or negative!" << endl;`
	`1711`	`+ cout << INFO_LINE << "Mean cross section for extinction is zero or negative!" << endl;`
`1714`	`1712`	`pp_escape->getStokesVector()->clear();`
`1715`	`1713`	`}`
`1716`	`1714`	`}`
Original file line number	Diff line number	Diff line change
`@@ -393,13 +393,8 @@ bool CGridCylindrical::loadGridFromBinaryFile(parameters & param, uint _data_len`
`393`	`393`
`394`	`394`	`if(dz == 0)`
`395`	`395`	`{`
`396`		`- cout << ERROR_LINE << "No step size in z-direction of cylindrical grid!" << endl`
`397`		`- << "\nHINT: Update of POLARIS v4.02 includes variable phi "`
`398`		`- "spacing."`
`399`		`- << endl`
`400`		`- << " Please look in the manual or use \"polaris-gen ... "`
`401`		`- "--update\""`
`402`		`- << endl;`
	`396`	`+ cout << ERROR_LINE << "No step size in z-direction of cylindrical grid!" << endl;`
	`397`	`+ cout << "Please look in the manual" << endl;`
`403`	`398`	`return false;`
`404`	`399`	`}`
`405`	`400`
Original file line number	Diff line number	Diff line change
`@@ -247,9 +247,7 @@ bool CGridSpherical::loadGridFromBinaryFile(parameters & param, uint _data_len)`
`247`	`247`
`248`	`248`	`if(dr == 0)`
`249`	`249`	`{`
`250`		`- cout << ERROR_LINE << "Cannot write to:\n No step size in r-direction of "`
`251`		`- "spherical grid!"`
`252`		`- << endl;`
	`250`	`+ cout << ERROR_LINE << "No step size in r-direction of spherical grid!" << endl;`
`253`	`251`	`return false;`
`254`	`252`	`}`
`255`	`253`
`@@ -267,9 +265,7 @@ bool CGridSpherical::loadGridFromBinaryFile(parameters & param, uint _data_len)`
`267`	`265`
`268`	`266`	`if(dph == 0)`
`269`	`267`	`{`
`270`		`- cout << ERROR_LINE << "Cannot write to:\n No step size in phi-direction "`
`271`		`- "of spherical grid!"`
`272`		`- << endl;`
	`268`	`+ cout << ERROR_LINE << "No step size in phi-direction of spherical grid!" << endl;`
`273`	`269`	`return false;`
`274`	`270`	`}`
`275`	`271`
`@@ -287,15 +283,7 @@ bool CGridSpherical::loadGridFromBinaryFile(parameters & param, uint _data_len)`
`287`	`283`
`288`	`284`	`if(dth == 0)`
`289`	`285`	`{`
`290`		`- cout << ERROR_LINE << "Cannot write to:\n No step size in theta-direction "`
`291`		`- "of spherical grid!"`
`292`		`- << endl`
`293`		`- << "\nHINT: Update of POLARIS v4.02 includes variable phi "`
`294`		`- "spacing."`
`295`		`- << endl`
`296`		`- << " Please look in the manual or use \"polaris-gen ... "`
`297`		`- "--update\""`
`298`		`- << endl;`
	`286`	`+ cout << ERROR_LINE << "No step size in theta-direction of spherical grid!" << endl;`
`299`	`287`	`return false;`
`300`	`288`	`}`
`301`	`289`
Original file line number	Diff line number	Diff line change
`@@ -965,8 +965,7 @@ void parameters::set3dMidplane(uint plane, uint nr_of_slices, double z_min, doub`
`965`	`965`	`midplane_3d_param.push_back(z_max);`
`966`	`966`	`}`
`967`	`967`	`else`
`968`		`- cout << NOTE_LINE << "Multiple 3D midplane plot commands found. The first command "`
`969`		`- "will be considered!";`
	`968`	`+ cout << INFO_LINE << "Multiple 3D midplane plot commands found. The first command will be considered!" << endl;`
`970`	`969`	`}`
`971`	`970`
`972`	`971`	`void parameters::setInpMidDataPoints(uint val)`
`@@ -1109,32 +1108,40 @@ void parameters::setSIConvVField(double val)`
`1109`	`1108`	`void parameters::updateSIConvLength(double val)`
`1110`	`1109`	`{`
`1111`	`1110`	`if(conv_l_in_SI != 1 && val != 1)`
`1112`		`- cout << NOTE_LINE << "<conv_len> may not be used multiple times!" << endl`
`1113`		`- << " -> No problem if <path_grid_cgs> was used!" << endl;`
	`1111`	`+ {`
	`1112`	`+ cout << INFO_LINE << "<conv_len> may not be used multiple times!" << endl;`
	`1113`	`+ cout << " -> No problem if <path_grid_cgs> was used!" << endl;`
	`1114`	`+ }`
`1114`	`1115`	`conv_l_in_SI *= val;`
`1115`	`1116`	`}`
`1116`	`1117`
`1117`	`1118`	`void parameters::updateSIConvDH(double val)`
`1118`	`1119`	`{`
`1119`	`1120`	`if(conv_dH_in_SI != 1 && val != 1)`
`1120`		`- cout << NOTE_LINE << "<conv_dens> may not be used multiple times!" << endl`
`1121`		`- << " -> No problem if <path_grid_cgs> was used!" << endl;`
	`1121`	`+ {`
	`1122`	`+ cout << INFO_LINE << "<conv_dens> may not be used multiple times!" << endl;`
	`1123`	`+ cout << " -> No problem if <path_grid_cgs> was used!" << endl;`
	`1124`	`+ }`
`1122`	`1125`	`conv_dH_in_SI *= val;`
`1123`	`1126`	`}`
`1124`	`1127`
`1125`	`1128`	`void parameters::updateSIConvBField(double val)`
`1126`	`1129`	`{`
`1127`	`1130`	`if(conv_B_in_SI != 1 && val != 1)`
`1128`		`- cout << NOTE_LINE << "<conv_mag> may not be used multiple times!" << endl`
`1129`		`- << " -> No problem if <path_grid_cgs> was used!" << endl;`
	`1131`	`+ {`
	`1132`	`+ cout << INFO_LINE << "<conv_mag> may not be used multiple times!" << endl;`
	`1133`	`+ cout << " -> No problem if <path_grid_cgs> was used!" << endl;`
	`1134`	`+ }`
`1130`	`1135`	`conv_B_in_SI *= val;`
`1131`	`1136`	`}`
`1132`	`1137`
`1133`	`1138`	`void parameters::updateSIConvVField(double val)`
`1134`	`1139`	`{`
`1135`	`1140`	`if(conv_V_in_SI != 1 && val != 1)`
`1136`		`- cout << NOTE_LINE << "<conv_vel> may not be used multiple times!" << endl`
`1137`		`- << " -> No problem if <path_grid_cgs> was used!" << endl;`
	`1141`	`+ {`
	`1142`	`+ cout << INFO_LINE << "<conv_vel> may not be used multiple times!" << endl;`
	`1143`	`+ cout << " -> No problem if <path_grid_cgs> was used!" << endl;`
	`1144`	`+ }`
`1138`	`1145`	`conv_V_in_SI *= val;`
`1139`	`1146`	`}`
`1140`	`1147`
Original file line number	Diff line number	Diff line change
`@@ -1103,7 +1103,7 @@ bool CRadiativeTransfer::calcMonteCarloLvlPopulation(uint i_species, uint global`
`1103`	`1103`	`if(global_iteration_counter == MC_LVL_POP_MAX_GLOBAL_ITER)`
`1104`	`1104`	`{`
`1105`	`1105`	`cout << CLR_LINE;`
`1106`		`- cout << NOTE_LINE << "Global iteration not reached! Continue, but results might be wrong!" << endl;`
	`1106`	`+ cout << INFO_LINE << "Global iteration not reached! Continue, but results might be wrong!" << endl;`
`1107`	`1107`	`}`
`1108`	`1108`
`1109`	`1109`	`// Format prints`
`@@ -1820,9 +1820,8 @@ bool CRadiativeTransfer::calcPolMapsViaMC()`
`1820`	`1820`	`if(peel_off && tm_source->getID() == SRC_DUST)`
`1821`	`1821`	`{`
`1822`	`1822`	`cout << CLR_LINE;`
`1823`		`- cout << NOTE_LINE << "MC simulations with dust source and peel-off include only "`
`1824`		`- "the scattered radiation.\n"`
`1825`		`- << "Add results from Raytracing simulations for full dust emission!" << endl;`
	`1823`	`+ cout << INFO_LINE << "MC simulations with dust source and peel-off include only the scattered radiation." << endl;`
	`1824`	`+ cout << " Add results from Raytracing simulations for full dust emission!" << endl;`
`1826`	`1825`	`}`
`1827`	`1826`	`}`
`1828`	`1827`
`@@ -2170,10 +2169,10 @@ bool CRadiativeTransfer::calcSyncMapsViaRaytracing(parameters & param)`
`2170`	`2169`	`if(tracer[i_det]->getSubpixelWarning())`
`2171`	`2170`	`{`
`2172`	`2171`	`cout << WARNING_LINE << "level of subpixeling (" << param.getMaxSubpixelLvl() << ") might be too low" << endl;`
`2173`		`- cout << "if required, increase the maximum level of subpixeling with <max_subpixel_lvl> in the command file" << endl;`
	`2172`	`+ cout << " if required, increase the maximum level of subpixeling with <max_subpixel_lvl> in the command file" << endl;`
`2174`	`2173`	`}`
`2175`	`2174`	`// if(tracer[i_det]->getDetectorShape() == DET_PLANE && (grid->getDataID() == GRID_ID_SPH \|\| grid->getDataID() == GRID_ID_CYL))`
`2176`		`- // cout << NOTE_LINE << "a 'polar' detector should be used for a spherical or cylindrical grid" << endl;`
	`2175`	`+ // cout << INFO_LINE << "a 'polar' detector should be used for a spherical or cylindrical grid" << endl;`
`2177`	`2176`	`}`
`2178`	`2177`	`}`
`2179`	`2178`
`@@ -2661,10 +2660,10 @@ bool CRadiativeTransfer::calcPolMapsViaRaytracing(parameters & param)`
`2661`	`2660`	`if(tracer[i_det]->getSubpixelWarning())`
`2662`	`2661`	`{`
`2663`	`2662`	`cout << WARNING_LINE << "level of subpixeling (" << param.getMaxSubpixelLvl() << ") might be too low" << endl;`
`2664`		`- cout << "if required, increase the maximum level of subpixeling with <max_subpixel_lvl> in the command file" << endl;`
	`2663`	`+ cout << " if required, increase the maximum level of subpixeling with <max_subpixel_lvl> in the command file" << endl;`
`2665`	`2664`	`}`
`2666`	`2665`	`// if(tracer[i_det]->getDetectorShape() == DET_PLANE && (grid->getDataID() == GRID_ID_SPH \|\| grid->getDataID() == GRID_ID_CYL))`
`2667`		`- // cout << NOTE_LINE << "a 'polar' detector should be used for a spherical or cylindrical grid" << endl;`
	`2666`	`+ // cout << INFO_LINE << "a 'polar' detector should be used for a spherical or cylindrical grid" << endl;`
`2668`	`2667`	`}`
`2669`	`2668`	`}`
`2670`	`2669`
`@@ -3116,10 +3115,10 @@ bool CRadiativeTransfer::calcOPIATEMapsViaRaytracing(parameters& param)`
`3116`	`3115`	`if(tracer[i_det]->getSubpixelWarning())`
`3117`	`3116`	`{`
`3118`	`3117`	`cout << WARNING_LINE << "level of subpixeling (" << param.getMaxSubpixelLvl() << ") might be too low" << endl;`
`3119`		`- cout << "if required, increase the maximum level of subpixeling with <max_subpixel_lvl> in the command file" << endl;`
	`3118`	`+ cout << " if required, increase the maximum level of subpixeling with <max_subpixel_lvl> in the command file" << endl;`
`3120`	`3119`	`}`
`3121`	`3120`	`// if(tracer[i_det]->getDetectorShape() == DET_PLANE && (grid->getDataID() == GRID_ID_SPH \|\| grid->getDataID() == GRID_ID_CYL))`
`3122`		`- // cout << NOTE_LINE << "a 'polar' detector should be used for a spherical or cylindrical grid" << endl;`
	`3121`	`+ // cout << INFO_LINE << "a 'polar' detector should be used for a spherical or cylindrical grid" << endl;`
`3123`	`3122`	`}`
`3124`	`3123`
`3125`	`3124`	`cout << CLR_LINE;`
`@@ -3248,10 +3247,10 @@ bool CRadiativeTransfer::calcChMapsViaRaytracing(parameters & param)`
`3248`	`3247`	`if(tracer[i_det]->getSubpixelWarning())`
`3249`	`3248`	`{`
`3250`	`3249`	`cout << WARNING_LINE << "level of subpixeling (" << param.getMaxSubpixelLvl() << ") might be too low" << endl;`
`3251`		`- cout << "if required, increase the maximum level of subpixeling with <max_subpixel_lvl> in the command file" << endl;`
	`3250`	`+ cout << " if required, increase the maximum level of subpixeling with <max_subpixel_lvl> in the command file" << endl;`
`3252`	`3251`	`}`
`3253`	`3252`	`// if(tracer[i_det]->getDetectorShape() == DET_PLANE && (grid->getDataID() == GRID_ID_SPH \|\| grid->getDataID() == GRID_ID_CYL))`
`3254`		`- // cout << NOTE_LINE << "a 'polar' detector should be used for a spherical or cylindrical grid" << endl;`
	`3253`	`+ // cout << INFO_LINE << "a 'polar' detector should be used for a spherical or cylindrical grid" << endl;`
`3255`	`3254`
`3256`	`3255`	`// Increment index for line RT`
`3257`	`3256`	`i_det++;`