Changeset 9348 for trunk/MagicSoft/Mars/mcorsika

Timestamp:

02/19/09 15:38:48 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcorsika

Files:

• MCorsikaRunHeader.cc (modified) (2 diffs)
• MCorsikaRunHeader.h (modified) (1 diff)

trunk/MagicSoft/Mars/mcorsika/MCorsikaRunHeader.cc

@@ -251 +251 @@
 {
     *fLog << all << endl;
-    *fLog << "Run Number:    " << fRunNumber << "  (" << fRunStart.GetStringFmt("%d.%m.%Y") << ", V" << fProgramVersion << ")" << endl;
-    *fLog << "Particle ID:   " << MMcEvt::GetParticleName(fParticleID) << endl;
+    *fLog << "Run Number:     " << fRunNumber << "  (" << fRunStart.GetStringFmt("%d.%m.%Y") << ", V" << fProgramVersion << ")" << endl;
+    *fLog << "Particle ID:    " << MMcEvt::GetParticleName(fParticleID) << endl;
     if (fNumEvents>0)
-        *fLog << "Num Events:    " << fNumEvents << endl;
-    *fLog << "Obs Level:    ";
+        *fLog << "Num Events:     " << fNumEvents << endl;
+    *fLog << "Obs Level:     ";
     for (Byte_t i=0; i<fNumObsLevel; i++)
         *fLog << " " << fObsLevel[i]/100. << "m";
     *fLog << endl;
 
-    *fLog << "MagneticField: X/Z=(" << fMagneticFieldX << "/";
+    *fLog << "MagneticField:  X/Z=(" << fMagneticFieldX << "/";
     *fLog << fMagneticFieldZ << ")  Az=" << fMagneticFieldAz*TMath::RadToDeg() << "deg" << endl;
 
-    *fLog << "Spectrum:      Slope=" << fSlopeSpectrum << "  (" << fEnergyMin << "GeV-" << fEnergyMax << "GeV)" <<  endl;
-    *fLog << "Wavelength:    " << fWavelengthMin << "nm - " << fWavelengthMax << "nm" << endl;
+    *fLog << "Spectrum:       Slope=" << fSlopeSpectrum << "  (" << fEnergyMin << "GeV-" << fEnergyMax << "GeV)" <<  endl;
+    *fLog << "Wavelength:     " << fWavelengthMin << "nm - " << fWavelengthMax << "nm" << endl;
 
     if (fViewConeOuterAngle>0)
-        *fLog << "ViewCone:      " << fViewConeInnerAngle << "deg-" << fViewConeOuterAngle << "deg" << endl;
+        *fLog << "ViewCone:       " << fViewConeInnerAngle << "deg-" << fViewConeOuterAngle << "deg" << endl;
 
     if (fZdMax>=0)
     {
-        *fLog << "Zd/Az:         " << fZdMin << "deg";
+        *fLog << "Zd/Az:          " << fZdMin << "deg";
         if (fZdMin==fZdMax)
             *fLog << " (fixed)";
@@ -284 +284 @@
     }
 
-    *fLog << "Atm.Coeff A:  ";
+    *fLog << "Atm.Coeff A:   ";
     for (int i=0; i<5; i++)
         *fLog << " " << fAtmosphericCoeffA[i];
     *fLog << endl;
-    *fLog << "Atm.Coeff B:  ";
+    *fLog << "Atm.Coeff B:   ";
     for (int i=0; i<5; i++)
         *fLog << " " << fAtmosphericCoeffB[i];
     *fLog << endl;
-    *fLog << "Atm.Coeff C:  ";
+    *fLog << "Atm.Coeff C:   ";
     for (int i=0; i<5; i++)
         *fLog << " " << fAtmosphericCoeffC[i];
     *fLog << endl;
-}
-
+
+    *fLog << "Options used:  ";
+    if (Has(kCerenkov))
+        *fLog << " CERENKOV";
+    if (Has(kIact))
+        *fLog << " IACT";
+    if (Has(kCeffic))
+        *fLog << " CEFFIC";
+    if (Has(kAtmext))
+        *fLog << " ATMEXT";
+    if (Has(kRefraction))
+        *fLog << " AtmRefraction";
+    if (Has(kVolumedet))
+        *fLog << " VOLUMEDET";
+    if (Has(kCurved))
+        *fLog << " CURVED";
+    if (Has(kSlant))
+        *fLog << " SLANT";
+    *fLog << endl;
+}
+

trunk/MagicSoft/Mars/mcorsika/MCorsikaRunHeader.h

@@ -102 +102 @@
     Float_t GetObsLevel(UInt_t i=0) const { return i>9 ? -1 : fObsLevel[i]; }
 
-    Bool_t Has(CerenkovFlag_t opt) { return fCerenkovFlag&opt ? 1 : 0; }
+    Bool_t Has(CerenkovFlag_t opt) const { return fCerenkovFlag&opt ? 1 : 0; }
 
     static Double_t EarthRadius() { return fgEarthRadius; }