Changeset 19343 for trunk

Timestamp:

10/30/18 22:12:37 (6 years ago)

Author:

tbretz

Message:

Reading and printing some more options from the file headers

Location:

trunk/Mars/mcorsika

Files:

• MCorsikaRunHeader.cc (modified) (5 diffs)
• MCorsikaRunHeader.h (modified) (2 diffs)

trunk/Mars/mcorsika/MCorsikaRunHeader.cc

@@ -50 +50 @@
 // ----------------
 //  + UInt_t  fCerenkovFileOption
+//  + UInt_t fHadronModelLowEnergy
+//  + UInt_t fHadronModelHighEnergy
+//  + Float_t fTransitionEnergy
+//  + Bool_t fCurvedAtmosphere
 //  + Float_t fEnergyCutoffHadrons
 //  + Float_t fEnergyCutoffMuons
@@ -194 +198 @@
     fMagneticFieldAz =  g[91];  // Azimuth angle of magnetic north expressed in telescope coordinates
 
+    fHadronModelLowEnergy  = TMath::Nint(g[73]);
+    fHadronModelHighEnergy = TMath::Nint(g[74]);
+
     // WITH rounding: unbelievable!
     fCerenkovFlag = TMath::Nint(g[75]);
     fCerenkovFileOption = TMath::Nint(g[90]);
+
+    fCurvedAtmosphere = TMath::Nint(g[77])==2;
 
     fZdMin = g[79];                // lower edge of theta in °
@@ -235 +244 @@
     fViewConeOuterAngle = g[152];  // outer angle of view cone (°)
 
+    fTransitionEnergy = g[153];
+
     return kTRUE;
 }
@@ -328 +339 @@
     else
         *fLog << "<off>" << endl;
+
+    *fLog << "Interact.model: ";
+    switch (fHadronModelLowEnergy)
+    {
+    case 1:  *fLog << "GEISHA"; break;
+    case 2:  *fLog << "UrQMD";  break;
+    case 3:  *fLog << "FLUKA";  break;
+    default: *fLog << "<n/a>";  break;
+    }
+    *fLog << " / ";
+    switch (fHadronModelHighEnergy)
+    {
+    case 0:  *fLog << "HDPM";   break;
+    case 1:  *fLog << "VENUS";  break;
+    case 2:  *fLog << "SIBYLL"; break;
+    case 3:  *fLog << "QGSJET"; break;
+    case 4:  *fLog << "DPMJET"; break;
+    case 5:  *fLog << "neXus";  break;
+    case 6:  *fLog << "EPOS";   break;
+    default: *fLog << "<n/a>";  break;
+    }
+    *fLog << " [lo/hi], Transition at " << fTransitionEnergy << " GeV" << endl;
 
     *fLog << "Options used:  ";
@@ -343 +376 @@
         *fLog << " VOLUMEDET";
     if (Has(kCurved))
-        *fLog << " CURVED";
+        *fLog << " CURVED" << (fCurvedAtmosphere?"<on>":"<off>");
     if (Has(kSlant))
         *fLog << " SLANT";

trunk/Mars/mcorsika/MCorsikaRunHeader.h

@@ -71 +71 @@
     UInt_t fCerenkovFileOption;       // MCERFI
 
+    UInt_t fHadronModelLowEnergy;
+    UInt_t fHadronModelHighEnergy;
+
+    Float_t fTransitionEnergy;        // [GeV]
+
+    Bool_t fCurvedAtmosphere;
+
     Float_t fEnergyCutoffHadrons;     // [GeV]
     Float_t fEnergyCutoffMuons;       // [GeV]
@@ -81 +88 @@
     Float_t fThinningWeightLimitEM;    // EM weight limit: WMAX*WEITRAT
     Float_t fThinningMaxRadius;        // [cm] Max radial raius for thinning
+
 
 public: