Changeset 9336 for trunk/MagicSoft/Mars/mcorsika

Timestamp:

02/15/09 13:24:59 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcorsika

Files:

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

trunk/MagicSoft/Mars/mcorsika/MCorsikaEvtHeader.cc

@@ -121 +121 @@
     // Pointing along particle direction
     // (x=east, y=north, z=upwards)
-    fMomentumX = -f[7];
-    fMomentumY =  f[6];
+    fMomentumX =  f[7];
+    fMomentumY = -f[6];
     fMomentumZ = -f[8];
 
@@ -136 +136 @@
     }
 
-    //fX = f[97];
-    //fY = f[117];
-
-    fX =  f[117];
-    fY = -f[97];
+    fX =  f[117];   //fX = f[97];
+    fY = -f[97];    //fY = f[117];
 
     fin.seekg(1088-273*4, ios::cur);

trunk/MagicSoft/Mars/mcorsika/MCorsikaRunHeader.cc

@@ -34 +34 @@
 //  + UInt_t fParticleID
 //  + Float_t fImpactMax
+//  + Float_t fMagneticFieldX
+//  + Float_t fMagneticFieldZ
+//  + Float_t fMagneticFieldAz
 //
 ////////////////////////////////////////////////////////////////////////////
@@ -86 +89 @@
     fRunStart.SetCorsikaTime(f[1]);
 
-    fProgramVersion = f[2];          //FIXME: INT???
+    fProgramVersion = f[2];
     fNumObsLevel    = TMath::Nint(f[3]);
 
@@ -149 +152 @@
     fParticleID = TMath::Nint(g[1]);
 
-    fImpactMax = g[86];
+    // MAGNETIC FIELD: x/z-component of earth magnetic field in muT
+    fMagneticFieldX  =  g[69];  // x-component ( BX)
+    fMagneticFieldZ  = -g[70];  // z-component (-BZ)
+    fMagneticFieldAz =  g[91];  // Azimuth angle of magnetic north expressed in telescope coordinates
 
     fZdMin = g[79];                // lower edge of theta in °
@@ -157 +163 @@
     // FIXME: Correct for direction of magnetic field!
 
+    // Number of cherenkov detectors in x
+    // Number of cherenkov detectors in y
+    // Grid spacing x
+    // Grid spacing y
+
+    // g[93] angle between array x-direction and magnetic north
+
+
+    fImpactMax = g[86];
+
     fWavelengthMin = g[95];        // Cherenkov bandwidth lower end in nm
     fWavelengthMax = g[96];        // Cherenkov bandwidth upper end in nm
@@ -222 +238 @@
 {
     *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 << "Spectrum:    Slope=" << fSlopeSpectrum << "  (" << fEnergyMin << "GeV-" << fEnergyMax << "GeV)" <<  endl;
+
+    *fLog << "MagneticField: X/Z=(" << fMagneticFieldX << "/";
+    *fLog << fMagneticFieldZ << ")  Az=" << fMagneticFieldAz*TMath::RadToDeg() << "deg" << endl;
+
+    *fLog << "Spectrum:      Slope=" << fSlopeSpectrum << "  (" << fEnergyMin << "GeV-" << fEnergyMax << "GeV)" <<  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)";

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  fImpactMax;              // [cm] Maximum simulated impact
+    Float_t fImpactMax;               // [cm] Maximum simulated impact
 
-    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 fSlopeSpectrum;           // Slope of energy spectrum
+    Float_t fEnergyMin;               // Lower limit of energy range
+    Float_t fEnergyMax;               // Upper limit of energy range
 
-    Float_t  fZdMin;                  // [rad] Zenith distance
-    Float_t  fZdMax;                  // [rad] Zenith distance
-    Float_t  fAzMin;                  // [rad] Azimuth (north=0; east=90)
-    Float_t  fAzMax;                  // [rad] Azimuth (north=0; east=90) (north denotes the magnet north which is defined to be in the geografic north!)
+    Float_t fZdMin;                   // [rad] Zenith distance
+    Float_t fZdMax;                   // [rad] Zenith distance
+    Float_t fAzMin;                   // [rad] Azimuth (north=0; east=90)
+    Float_t fAzMax;                   // [rad] Azimuth (north=0; east=90) (north denotes the magnet north which is defined to be in the geografic north!)
+
+    Float_t fMagneticFieldX;          // [muT] x-component of earth magnetic field (ceres coordinate system)
+    Float_t fMagneticFieldZ;          // [muT] z-component of earth magnetic field (ceres coordinate system)
+    Float_t fMagneticFieldAz;         // [rad] Azimuth angle of magnetic north expressed in telescope coordinates
 
     Float_t fWavelengthMin;           // [nm] Wavelength bandwidth lo edge
@@ -50 +54 @@
     UInt_t GetNumEvents() const { return fNumEvents; }
 
-    UInt_t GetFormatVersion() const { return (UInt_t)fProgramVersion; }
+    const MTime &GetRunStart() const { return fRunStart; }
+
+    Float_t GetProgramVersion() const { return fProgramVersion; }
 
     Float_t GetZdMin() const { return fZdMin; }
@@ -67 +73 @@
     Float_t GetImpactMax() const { return fImpactMax; }
 
+    Float_t GetMagneticFieldX() const  { return fMagneticFieldX; }
+    Float_t GetMagneticFieldZ() const  { return fMagneticFieldZ; }
+    Float_t GetMagneticFieldAz() const { return fMagneticFieldAz; }
+
     Float_t GetViewConeOuterAngle() const { return fViewConeOuterAngle; }
     Bool_t HasViewCone() const { return fViewConeOuterAngle>0; }