Changeset 19765 for trunk/Mars

Timestamp:

10/12/19 20:06:55 (5 years ago)

Author:

tbretz

Message:

fHeight is not used right now... (note that the current default coeffieints also don't match). The loops for ozone and aerosols stopped one entry to early which produced a step in aerosol contents as for all hogher values the last entry was used, aerosol and ozone was only properly initialized if numericall by chance the counting hit the bin border, InitOzone errornesously checked for valid Aerosols, prepared a more reaosnable default consztrucotr: the current one did more or less nothing as the fObLevel was not yet initialized.

Location:

trunk/Mars/msim

Files:

• MAtmosphere.cc (modified) (9 diffs)
• MAtmosphere.h (modified) (1 diff)

trunk/Mars/msim/MAtmosphere.cc

@@ -137 +137 @@
 
 MAtmRayleigh::MAtmRayleigh() : fR(MCorsikaRunHeader::fgEarthRadius),
-    fHeight{0, 300000, 1e+06, 5e+06, 1e+07},
+    //fHeight{0, 300000, 1e+06, 5e+06, 1e+07},
     //fAtmA{-144.838, -124.071, 0.360027, -0.000824761, 0.00221589},
     fAtmB{1192.34, 1173.98, 1412.08, 810.682, 1},
@@ -171 +171 @@
         fObsLevel,                     // fObsLevel,                   //   0km
         TMath::Max(fObsLevel, 7.75e5), // TMath::Max(fObsLevel, 4e5),  //   4km
-        16.5e5,                       //  10e5,                       //  10km
-        50.0e5,                       //  40e5,                       //  40km
+        16.5e5,                        //  10e5,                       //  10km
+        50.0e5,                        //  40e5,                       //  40km
         105.0e5,                       // 100e5                        // 100km
     };
@@ -414 +414 @@
 
         Double_t path_slant = 0;
-        for (Double_t h = fObsLevel; h <= 50e5; h += dh)
+        for (Double_t h=fObsLevel; h<50e5+dh/2; h+=dh)
         {
             // h is the true height vertical above ground
-            if (fmod(h,1e4) == 0)
-                ozone_path[(int)(h/1e4)][j] = path_slant;
+            //if (fmod(h,1e4) == 0)
+            {
+                ozone_path[TMath::FloorNint(h/1e4)][j] = path_slant;
+            }
 
             const Double_t km  = h/1e5;
@@ -450 +452 @@
 
         Double_t path_slant = 0;
-        for (Double_t h = fObsLevel; h <= 30e5; h += dh)
+        for (Double_t h=fObsLevel; h<=30e5+dh/2; h+=dh)
         {
             // h is the true height vertical above ground
-            if (fmod(h,1e4) == 0)
-                aerosol_path[(int)(h/1e4)][j] = path_slant;
+            //if (fmod(h,1e4) == 0)
+            {
+                aerosol_path[TMath::FloorNint(h/1e4)][j] = path_slant;
+            }
 
             const Double_t km  = h/1e5;
@@ -482 +486 @@
     }
 
-    if (!HasValidAerosol())
+    if (!HasValidOzone())
         return kFALSE;
 
@@ -539 +543 @@
 
     //******* Ozone absorption *******
-    if (h > 50.e5)
-        h = 50.e5;
 
     // Vigroux Ozone absorption coefficient a.s.l. through interpolation:
@@ -549 +551 @@
     // Now use the pre-calculated values of the path integral
     // for h and theta
-    const UInt_t H = TMath::Nint(h/1e4);
-    const UInt_t T = TMath::Min(89, TMath::Nint(theta/STEPTHETA));
+    const UInt_t H = TMath::Min(500, TMath::Nint(h/1e4));
+    const UInt_t T = TMath::Min( 89, TMath::Nint(theta/STEPTHETA));
 
     const Double_t path = ozone_path[H][T];
@@ -563 +565 @@
 
     //******* Mie (aerosol) *******
-    if (h > 30.e5)
-        h = 30.e5;
 
     //const float aero_betap[15] = {0.27, 0.26, 0.25, 0.24, 0.24, 0.23, 0.20, 0.180, 0.167, 0.158, 0.150, 0.142, 0.135, 0.127, 0.120};
@@ -572 +572 @@
     // Now use the pre-calculated values of the path integral
     // for h and theta
-    const UInt_t H = TMath::Nint(h/1e4);
-    const UInt_t T = TMath::Min(89, TMath::Nint(theta/STEPTHETA));
-
+    const UInt_t H = TMath::Min(300, TMath::Nint(h/1e4));
+    const UInt_t T = TMath::Min( 89, TMath::Nint(theta/STEPTHETA));
 
     const Double_t path = aerosol_path[H][T];

trunk/Mars/msim/MAtmosphere.h

@@ -98 +98 @@
         Init(h);//, "ozone.txt", "aerosols.txt");
     }
+    MAtmosphere(Double_t obs=-1, const char *name1=0, const char *name2=0) : fAbsCoeffOzone(0), fAbsCoeffAerosols(0)
+    {
+        MAtmRayleigh::Init(obs);
 
-    MAtmosphere(const char *name1=0, const char *name2=0) : fAbsCoeffOzone(0), fAbsCoeffAerosols(0)
-    {
         if (name1)
             InitOzone(name1);