Merge branch 'develop-basic' of cau-git.rz.uni-kiel.de:astrophysik/ag-wolf/polaris into develop-basic

Author: mlietzow

src/Detector.cpp

@@ -55,7 +55,10 @@ void CDetector::init(string _path,
     nr_spectral_bins = _nr_spectral_bins;
 
     wavelength_list_det.resize(nr_spectral_bins);
-    CMathFunctions::LogList(lam_min, lam_max, wavelength_list_det, 10);
+    if(USE_LOG_SPACING)
+        {CMathFunctions::LogList(lam_min, lam_max, wavelength_list_det, 10);}
+    else
+        {CMathFunctions::LinearList(lam_min, lam_max, wavelength_list_det);}
 
     sedI = new double[nr_spectral_bins];
     sedQ = new double[nr_spectral_bins];

src/Detector.hpp

@@ -158,7 +158,10 @@ class CDetector
         nr_extra = _nr_extra;
 
         wavelength_list_det.resize(nr_spectral_bins);
-        CMathFunctions::LogList(lam_min, lam_max, wavelength_list_det, 10);
+        if(USE_LOG_SPACING)
+            {CMathFunctions::LogList(lam_min, lam_max, wavelength_list_det, 10);}
+        else
+            {CMathFunctions::LinearList(lam_min, lam_max, wavelength_list_det);}
 
         sedI = new double[nr_extra * nr_spectral_bins];
         sedQ = new double[nr_extra * nr_spectral_bins];
@@ -246,7 +249,10 @@ class CDetector
         nr_extra = _nr_extra;
 
         wavelength_list_det.resize(nr_spectral_bins);
-        CMathFunctions::LogList(lam_min, lam_max, wavelength_list_det, 10);
+        if(USE_LOG_SPACING)
+            {CMathFunctions::LogList(lam_min, lam_max, wavelength_list_det, 10);}
+        else
+            {CMathFunctions::LinearList(lam_min, lam_max, wavelength_list_det);}
 
         sedI = new double[nr_extra * nr_spectral_bins];
         sedQ = new double[nr_extra * nr_spectral_bins];

src/DustMixture.cpp

@@ -347,9 +347,15 @@ void CDustMixture::printParameters(parameters & param, CGridBasic * grid)
             uint pos = i / NR_OF_RAY_DET;
 
             if(uint(dust_ray_detectors[i + 2]) > 1)
-                cout << "- Emission detetector " << (pos + 1) << "   : from " << dust_ray_detectors[i + 0]
+                {if(USE_LOG_SPACING)
+                    {cout << "- Emission detetector " << (pos + 1) << "   : from " << dust_ray_detectors[i + 0]
                      << " [m] to " << dust_ray_detectors[i + 1] << " [m] with "
-                     << uint(dust_ray_detectors[i + 2]) << " logarithmic values" << endl;
+                     << uint(dust_ray_detectors[i + 2]) << " logarithmic values" << endl;}
+                else
+                    {cout << "- Emission detetector " << (pos + 1) << "   : from " << dust_ray_detectors[i + 0]
+                     << " [m] to " << dust_ray_detectors[i + 1] << " [m] with "
+                     << uint(dust_ray_detectors[i + 2]) << " linear values" << endl;}
+                }
             else if(uint(dust_ray_detectors[i + 2]) == 1)
                 cout << "- Emission detetector " << (pos + 1) << "   : " << dust_ray_detectors[i + 0]
                      << " [m]" << endl;
@@ -372,9 +378,15 @@ void CDustMixture::printParameters(parameters & param, CGridBasic * grid)
             uint pos = i / NR_OF_MC_DET;
 
             if(uint(dust_mc_detectors[i + 2]) > 1)
-                cout << "- Scattering detetector " << (pos + 1) << " : from " << dust_mc_detectors[i + 0]
+                {if(USE_LOG_SPACING)
+                    {cout << "- Scattering detetector " << (pos + 1) << " : from " << dust_mc_detectors[i + 0]
                      << " [m]) to " << dust_mc_detectors[i + 1] << " [m]) with "
-                     << uint(dust_mc_detectors[i + 2]) << " logarithmic values" << endl;
+                     << uint(dust_mc_detectors[i + 2]) << " logarithmic values" << endl;}
+                else
+                    {cout << "- Scattering detetector " << (pos + 1) << " : from " << dust_mc_detectors[i + 0]
+                     << " [m]) to " << dust_mc_detectors[i + 1] << " [m]) with "
+                     << uint(dust_mc_detectors[i + 2]) << " linear values" << endl;}
+                }
             else if(uint(dust_mc_detectors[i + 2]) == 1)
                 cout << "- Scattering detetector " << (pos + 1) << "   : " << dust_mc_detectors[i + 0]
                      << " [m]" << endl;

src/Typedefs.hpp

@@ -305,6 +305,9 @@ using namespace std;
 // multiple scattering at dust grains
 #define SCATTERED_DUST_2 3
 
+// Wavelength spacing for single detector (1 = logarithmic, 0 = linear)
+#define USE_LOG_SPACING 1
+
 // Type of emission
 #define RESULTS_RAY 0
 #define RESULTS_MC 1