Changeset 9212 for trunk/MagicSoft/Mars/mcorsika

Timestamp:

01/06/09 13:07:00 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcorsika

Files:

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

trunk/MagicSoft/Mars/mcorsika/MCorsikaEvtHeader.cc

@@ -140 +140 @@
     fin.seekg(1088-273*4, ios::cur);
 
-    // f[76] Cherenkov flag:
-    //        bit(1) : CERENKOV option compiled in
-    //        bit(2) : IACT option compiled in
-    //        bit(3) : CEFFIC option compiled in
-    //        bit(4) : ATMEXT option compiled in
-    //        bit(5) : ATMEXT option used with refaction 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[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
-
     return !fin.eof();
 }

trunk/MagicSoft/Mars/mcorsika/MCorsikaRead.cc

@@ -452 +452 @@
             return rc;
     }
-    return kTRUE; 
+    return kTRUE;
 }
 

trunk/MagicSoft/Mars/mcorsika/MCorsikaRunHeader.cc

@@ -172 +172 @@
     // -------------------- Read first event header -------------------
 
+    // f[76] Cherenkov flag:
+    //        bit(1) : CERENKOV option compiled in
+    //        bit(2) : IACT option compiled in
+    //        bit(3) : CEFFIC option compiled in
+    //        bit(4) : ATMEXT option compiled in
+    //        bit(5) : ATMEXT option used with refaction 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[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
+
     char evth[4];
     fin.read(evth, 4);
@@ -200 +229 @@
     fAzMin = 180-g[81];
     fAzMax = 180-g[82];
+
+    fWavelengthMin = g[95];
+    fWavelengthMax = g[96];
 
     fViewConeInnerAngle = g[151];

trunk/MagicSoft/Mars/mcorsika/MCorsikaRunHeader.h

@@ -33 +33 @@
     Float_t  fAzMax;                     // [rad] Azimuth (north=0; west=90)
 
+    Float_t fWavelengthMin;      // [nm] Wavelength bandwidth lo edge
+    Float_t fWavelengthMax;      // [nm] Wavelength bandwidth up edge
+
     //Float_t  fImpactMax;              // [cm] Maximum simulated impact
 
@@ -50 +53 @@
     Float_t GetAzMax() const { return fAzMax; }
 
+    Float_t GetWavelengthMin() const { return fWavelengthMin; }
+    Float_t GetWavelengthMax() const { return fWavelengthMax; }
+
     //Float_t GetImpactMax() const { return fImpactMax; }