Changeset 9229 for trunk/MagicSoft/Mars/mcorsika

Timestamp:

01/18/09 14:45:10 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcorsika

Files:

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

trunk/MagicSoft/Mars/mcorsika/MCorsikaEvtHeader.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz 11/2008 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: Software Development, 2008
+!   Copyright: Software Development, 2000-2009
 !
 !
@@ -109 +109 @@
     fMomentumZ = -f[8];
 
+    // FIXME: Correct for direction of magnetic field!
     fZd        = f[9];
     fAz        = TMath::Pi()-f[10];
@@ -124 +125 @@
     fX =  f[117];
     fY = -f[97];
-/*
-    if (fEvtNumber==1)
-    {
-        header.fZdMin = f[79];
-        header.fZdMax = f[80];
-        header.fAzMin = 180-f[81];
-        header.fAzMax = 180-f[82];
 
-        header.fViewConeInnerAngle = f[151];
-        header.fViewConeOuterAngle = f[152];
-
-        header.Print();
-    }
- */
     fin.seekg(1088-273*4, ios::cur);
 

trunk/MagicSoft/Mars/mcorsika/MCorsikaEvtHeader.h

@@ -43 +43 @@
     void Print(Option_t * = NULL) const;
 
+    UInt_t GetEvtNumber() const { return fEvtNumber; }
+    UInt_t GetParticleID() const { return fParticleID; }
+
     TVector3 GetMomentum() const { return TVector3(fMomentumX, fMomentumY, fMomentumZ); }
     TVector2 GetImpactPos() const { return TVector2(fX, fY); }
@@ -55 +58 @@
     Float_t GetY() const { return fY; }
 
+    Double_t GetImpact() const { return TMath::Hypot(fX, fY); }
+
     Int_t  ReadEvt(istream& fin);    // read in event header block
     Bool_t ReadEvtEnd(istream& fin); // read in event end block

trunk/MagicSoft/Mars/mcorsika/MCorsikaRunHeader.cc

@@ -19 +19 @@
                Qi Zhe,      06/2007 <mailto:qizhe@astro.uni-wuerzburg.de>
 
-!   Copyright: MAGIC Software Development, 2000-2004
+!   Copyright: Software Development, 2000-2009
 !
 !
@@ -29 +29 @@
 //
 // Root storage container for the RUN HEADER information
-//
-//
-//  RAW DATA FORMAT VERSION
-//  =======================
-//
-//  Format Version 8:
-//  -----------------
-//   + fNumBytesPerSample;
-//   + fFreqSampling;
-//   + fNumSignificantBits;
-//   * changes in MRawCrateHeader
-//
-//  Format Version 7:
-//  -----------------
-//   - unused
-//
-//  Format Version 6:
-//  -----------------
-//   + added CameraVersion
-//   + added TelescopeNumber
-//   + added ObservationMode
-//   + added dummies for TelescopeRa/Dec
-//
-//  Format Version 5:
-//  -----------------
-//   - now the sub millisecond information of the time is valid and decoded
-//     which enhances the precision from 51.2us to 200ns
-//
-//  Format Version 4:
-//  -----------------
-//   - added support for pixels with negative IDs
-//
-//  Format Version 3:
-//  -----------------
-//   - ???
-//
-//  Format Version 2:
-//  -----------------
-//   - removed mjd from data
-//   - added start time
-//   - added stop  time
-//
-//
-//  MCorsikaRunHeader CLASS VERSION
-//  ===========================
-//
-//  Format Version 6:
-//  -----------------
-//   - added fNumBytesPerSample;
-//   - added fFreqSampling;
-//   - added fNumSignificantBits;
-//
-//  Class Version 5:
-//  -----------------
-//   - for compatibility with newer camera versions
-//
-//  Class Version 4:
-//  -----------------
-//   - added fCameraVersion
-//   - added fTelescopeNumber
-//   - changed length of fProjectName to 101
-//   - changed length of fSourceName  to 81
-//
-//  Class Version 3:
-//  ----------------
-//   - enhanced SourceName and ProjectName by one character, because
-//     without telling us the guranteed trailing \0-character has
-//     skipped
-//
-//  Class Version 2:
-//  ----------------
-//   - removed fMJD, fYear, fMonth, fDay
-//   - added fRunStart
-//   - added fRunStop
-// 
-//  Class Version 1:
-//  ----------------
-//   - first implementation
 //
 ////////////////////////////////////////////////////////////////////////////
@@ -128 +50 @@
 //
 MCorsikaRunHeader::MCorsikaRunHeader(const char *name, const char *title)
-    : fNumObsLevel(0),
-    fZdMin(0), fZdMax(-1), fAzMin(0), fAzMax(0),
-fViewConeInnerAngle(0), fViewConeOuterAngle(-1)
+    : fNumObsLevel(0), fZdMin(0), fZdMax(-1), fAzMin(0), fAzMax(0),
+    fViewConeInnerAngle(0), fViewConeOuterAngle(-1)
 {
     fName  = name  ? name  : "MCorsikaRunHeader";
@@ -171 +92 @@
 
     // -------------------- Read first event header -------------------
+
+    // FIXME: Add sanity checks!
 
     // f[76] Cherenkov flag:
@@ -177 +100 @@
     //        bit(3) : CEFFIC option compiled in
     //        bit(4) : ATMEXT option compiled in
-    //        bit(5) : ATMEXT option used with refaction enabled
+    //        bit(5) : ATMEXT option used with refraction enabled
     //        bit(6) : VOLUMEDET option compiled in
     //        bit(7) : CURVED option compiled in
     //        bit(9) : SLATN option compiled in
     //        11-21  : table number for externam athmosphere (but<1024)
-    // f[78] Curved athmosphere? (0=flat, 1=curved)
-
-    // f[80] lower edge of theta in °
-    // f[81] upper edge of theta in °
-    // f[82] lower edge of phi   in °
-    // f[83] upper edge of phi   in °
-    // f[84] cherenkov bunch size
-
-    // f[93] flag for additinal muon information of particle output file
-
-    // f[95] Cherenkov bandwidth lower end in nm
-    // f[96] Cherenkov bandwidth upper end in nm
-
-    // f[97] Numbr i of uses of each cherenkov event
+    //
+    // f[78]  Curved athmosphere? (0=flat, 1=curved)
+    // f[84]  cherenkov bunch size
+    // f[93]  flag for additinal muon information of particle output file
     // f[145] Muon multiple scattering flag
-    // f[152] !! inner angle of view cone (°)
-    // f[153] !! outer angle of view cone (°)
     // f[156] altitude of horizontal shower axis
 
@@ -216 +127 @@
     fin.seekg(-274*4, ios::cur);
 
-    const Int_t n = TMath::Nint(g[96]);
+    const Int_t n = TMath::Nint(g[96]);  // Numbr i of uses of each cherenkov event
     if (n!=1)
     {
@@ -225 +136 @@
     //fImpactMax = g[86];
 
-    fZdMin = g[79];
-    fZdMax = g[80];
-    fAzMin = 180-g[81];
-    fAzMax = 180-g[82];
-
-    fWavelengthMin = g[95];
-    fWavelengthMax = g[96];
-
-    fViewConeInnerAngle = g[151];
-    fViewConeOuterAngle = g[152];
+    fZdMin = g[79];                // lower edge of theta in °
+    fZdMax = g[80];                // upper edge of theta in °
+    fAzMin = 180-g[81];            // lower edge of phi   in °
+    fAzMax = 180-g[82];            // upper edge of phi   in °
+    // FIXME: Correct for direction of magnetic field!
+
+    fWavelengthMin = g[95];        // Cherenkov bandwidth lower end in nm
+    fWavelengthMax = g[96];        // Cherenkov bandwidth upper end in nm
+
+    fViewConeInnerAngle = g[151];  // inner angle of view cone (°)
+    fViewConeOuterAngle = g[152];  // outer angle of view cone (°)
 
     return kTRUE;