Changeset 9312 for trunk/MagicSoft/Mars/mcorsika

Timestamp:

02/10/09 20:00:10 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcorsika

Files:

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

trunk/MagicSoft/Mars/mcorsika/MCorsikaRunHeader.cc

@@ -33 +33 @@
 // ----------------
 //  + UInt_t fParticleID
+//  + Float_t fImpactMax
 //
 ////////////////////////////////////////////////////////////////////////////
@@ -148 +149 @@
     fParticleID = TMath::Nint(g[1]);
 
-    //fImpactMax = g[86];
+    fImpactMax = g[86];
 
     fZdMin = g[79];                // lower edge of theta in °

trunk/MagicSoft/Mars/mcorsika/MCorsikaRunHeader.h

@@ -16 +16 @@
 
 private:
-    UInt_t    fRunNumber;         // Run number
-    UInt_t    fParticleID;        // Particle ID (see MMcEvtBasic or CORSIKA manual)
-    UInt_t    fNumEvents;         // Number of events
-    MTime     fRunStart;          // Date of begin (yymmdd)
-    Float_t   fProgramVersion;    // Version of program
+    UInt_t   fRunNumber;              // Run number
+    UInt_t   fParticleID;             // Particle ID (see MMcEvtBasic or CORSIKA manual)
+    UInt_t   fNumEvents;              // Number of events
+    MTime    fRunStart;               // Date of begin (yymmdd)
+    Float_t  fProgramVersion;         // Version of program
 
-    Byte_t    fNumObsLevel;       // Number of observation levels
-    Float_t   fObsLevel[10];      // Observation levels [cm]
+    Byte_t   fNumObsLevel;            // Number of observation levels
+    Float_t  fObsLevel[10];           // Observation levels [cm]
 
-    Float_t   fSlopeSpectrum;     // Slope of energy spectrum
-    Float_t   fEnergyMin;         // Lower limit of energy range
-    Float_t   fEnergyMax;         // Upper limit of energy range
+    Float_t  fImpactMax;              // [cm] Maximum simulated impact
 
-    Float_t  fZdMin;                     // [rad] Zenith distance
-    Float_t  fZdMax;                     // [rad] Zenith distance
-    Float_t  fAzMin;                     // [rad] Azimuth (north=0; west=90)
-    Float_t  fAzMax;                     // [rad] Azimuth (north=0; west=90)
+    Float_t  fSlopeSpectrum;          // Slope of energy spectrum
+    Float_t  fEnergyMin;              // Lower limit of energy range
+    Float_t  fEnergyMax;              // Upper limit of energy range
 
-    Float_t fWavelengthMin;      // [nm] Wavelength bandwidth lo edge
-    Float_t fWavelengthMax;      // [nm] Wavelength bandwidth up edge
+    Float_t  fZdMin;                  // [rad] Zenith distance
+    Float_t  fZdMax;                  // [rad] Zenith distance
+    Float_t  fAzMin;                  // [rad] Azimuth (north=0; west=90)
+    Float_t  fAzMax;                  // [rad] Azimuth (north=0; west=90)
 
-    //Float_t  fImpactMax;              // [cm] Maximum simulated impact
+    Float_t fWavelengthMin;           // [nm] Wavelength bandwidth lo edge
+    Float_t fWavelengthMax;           // [nm] Wavelength bandwidth up edge
 
     Float_t fViewConeInnerAngle;      // [deg]
@@ -48 +48 @@
     Bool_t HasViewCone() const { return fViewConeOuterAngle>0; }
 
+    UInt_t GetParticleID() const { return fParticleID; }
+
     Float_t GetZdMin() const { return fZdMin; }
     Float_t GetZdMax() const { return fZdMax; }
@@ -57 +59 @@
     Float_t GetWavelengthMax() const { return fWavelengthMax; }
 
-    UInt_t GetParticleID() const { return fParticleID; }
+    Float_t GetSlopeSpectrum() const { return fSlopeSpectrum; }
+    Float_t GetEnergyMin() const { return fEnergyMin; }
+    Float_t GetEnergyMax() const { return fEnergyMax; }
 
-    //Float_t GetImpactMax() const { return fImpactMax; }
+    Float_t GetImpactMax() const { return fImpactMax; }
 
     Float_t GetViewConeOuterAngle() const { return fViewConeOuterAngle; }