Changeset 9308 for trunk/MagicSoft/Mars/mcorsika

Timestamp:

02/09/09 11:30:54 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcorsika

Files:

• MCorsikaEvtHeader.cc (modified) (4 diffs)
• MCorsikaEvtHeader.h (modified) (2 diffs)
• MCorsikaRunHeader.cc (modified) (6 diffs)
• MCorsikaRunHeader.h (modified) (4 diffs)

trunk/MagicSoft/Mars/mcorsika/MCorsikaEvtHeader.cc

@@ -26 +26 @@
 //
 // MCorsikaEvtHeader 
-//    
+//
+// Class Version 2:
+// ----------------
+//  - UInt_t fParticleID
+//
+//
 /////////////////////////////////////////////////////////////////////////////
 #include "MCorsikaEvtHeader.h"
@@ -38 +43 @@
 #include "MLogManip.h"
 
-#include "MMcEvt.hxx"
+//#include "MMcEvt.hxx"
 
 ClassImp(MCorsikaEvtHeader);
@@ -71 +76 @@
     *fLog << all;
     *fLog << "Event Number:              " << dec << fEvtNumber << endl;
-    *fLog << "Particle ID:               " << MMcEvt::GetParticleName(fParticleID) << endl;
+//    *fLog << "Particle ID:               " << MMcEvt::GetParticleName(fParticleID) << endl;
     *fLog << "Energy:                    " << fTotalEnergy << "GeV" << endl;
     *fLog << "Starting Altitude:         " << fStartAltitude << "g/cm²" << endl;
@@ -102 +107 @@
 
     fEvtNumber  = TMath::Nint(f[0]);
-    fParticleID = TMath::Nint(f[1]);
+//    fParticleID = TMath::Nint(f[1]);
 
     fTotalEnergy            = f[2];

trunk/MagicSoft/Mars/mcorsika/MCorsikaEvtHeader.h

@@ -18 +18 @@
 private:
     UInt_t   fEvtNumber;              // Event number
-    UInt_t   fParticleID;             // Particle ID (see MMcEvtBasic or CORSIKA manual)
+//    UInt_t   fParticleID;             // Particle ID (see MMcEvtBasic or CORSIKA manual)
     Float_t  fTotalEnergy;            // [GeV] 
 
@@ -44 +44 @@
 
     UInt_t GetEvtNumber() const { return fEvtNumber; }
-    UInt_t GetParticleID() const { return fParticleID; }
+//    UInt_t GetParticleID() const { return fParticleID; }
 
     TVector3 GetMomentum() const { return TVector3(fMomentumX, fMomentumY, fMomentumZ); }

trunk/MagicSoft/Mars/mcorsika/MCorsikaRunHeader.cc

@@ -30 +30 @@
 // Root storage container for the RUN HEADER information
 //
+// Class Version 2:
+// ----------------
+//  + UInt_t fParticleID
+//
 ////////////////////////////////////////////////////////////////////////////
 
@@ -39 +43 @@
 #include "MLog.h"
 #include "MLogManip.h"
+
+#include "MMcEvt.hxx"
 
 ClassImp(MCorsikaRunHeader);
@@ -81 +87 @@
     fProgramVersion = f[2];          //FIXME: INT???
     fNumObsLevel    = TMath::Nint(f[3]);
+
+    if (fNumObsLevel!=1)
+    {
+        *fLog << err << "ERROR - Currently only one observation level is allowed." << endl;
+        return kFALSE;
+    }
 
     memset(fObsLevel, 0, 10*4);
@@ -127 +139 @@
     fin.seekg(-274*4, ios::cur);
 
-    const Int_t n = TMath::Nint(g[96]);  // Numbr i of uses of each cherenkov event
+    const Int_t n = TMath::Nint(g[96]);  // Number i of uses of each cherenkov event
     if (n!=1)
     {
@@ -133 +145 @@
         return kFALSE;
     }
+
+    fParticleID = TMath::Nint(g[1]);
 
     //fImpactMax = g[86];
@@ -208 +222 @@
     *fLog << all << 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;

trunk/MagicSoft/Mars/mcorsika/MCorsikaRunHeader.h

@@ -17 +17 @@
 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)
@@ -22 +23 @@
 
     Byte_t    fNumObsLevel;       // Number of observation levels
-    Float_t   fObsLevel[10];      //[fNumObsLevel] Observation levels [cm]
+    Float_t   fObsLevel[10];      // Observation levels [cm]
 
     Float_t   fSlopeSpectrum;     // Slope of energy spectrum
@@ -56 +57 @@
     Float_t GetWavelengthMax() const { return fWavelengthMax; }
 
+    UInt_t GetParticleID() const { return fParticleID; }
+
     //Float_t GetImpactMax() const { return fImpactMax; }
 
@@ -68 +71 @@
     Bool_t SeekEvtEnd(istream &fin);
 
-    ClassDef(MCorsikaRunHeader, 1)      // storage container for general info
+    ClassDef(MCorsikaRunHeader, 2)      // storage container for general info
 };
 #endif