Changeset 9378 for trunk/MagicSoft/Mars/mcorsika

Timestamp:

03/03/09 11:19:46 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcorsika

Files:

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

trunk/MagicSoft/Mars/mcorsika/MCorsikaRunHeader.cc

@@ -37 +37 @@
 //  + Float_t fMagneticFieldZ
 //  + Float_t fMagneticFieldAz
+//  + Float_t fAtmosphericLayers[5]
 //  + Float_t fAtmosphericCoeffA[5]
 //  + Float_t fAtmosphericCoeffB[5]
@@ -111 +112 @@
     fEnergyMax      = f[16];
 
-    // 0/10 not supported?
+    // Implemented in CORSIKA Version >= 6.822
+    fImpactMax = -1;
+
+    // CORSIKA scattering in a disc on the ground
+    if (f[246]>0 && f[247]==0)
+    {
+        *fLog << warn << "WARNING - Events scattered in a disc on the ground." << endl;
+        fImpactMax = f[246];
+    }
+
+    // MMCS scattering in a disc perpendicular to the shower axis
+    if (f[246]==0 && f[247]>0)
+        fImpactMax = f[247];
+
+    // CORSIKA scattering in a rectangle on the ground
+    if (f[246]>0 && f[247]>0)
+        *fLog << warn << "WARNING - Events scattered in a rectangle on the ground." << endl;
+
+    // Implemented in CORSIKA Version >= 6.822
+    memcpy(fAtmosphericLayers, f+248, 5*4);
 
     memcpy(fAtmosphericCoeffA, f+253, 5*4);
@@ -136 +156 @@
     // f[93]  flag for additinal muon information of particle output file
     // f[145] Muon multiple scattering flag
-    // f[156] altitude of horizontal shower axis
 
     char evth[4];
@@ -176 +195 @@
     // 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
+    if (TMath::Nint(g[83])!=1)
+        *fLog << warn << "WARNING - Cherenkov bunch size not 1, but " << g[83] << endl;
+
+    // g[84] Number of cherenkov detectors in x
+    // g[85] Number of cherenkov detectors in y
+    // g[86] Grid spacing x
+    // g[87] Grid spacing y
+    // g[88] Length of detectors in x
+    // g[89] Length of detectors in y
 
     fImpactMax = -1;
@@ -267 +289 @@
 
     *fLog << "MagneticField:  X/Z=(" << fMagneticFieldX << "/";
-    *fLog << fMagneticFieldZ << ")" << UTF8::kMu << "T  Az=" << fMagneticFieldAz*TMath::RadToDeg() << "deg  (magnetic North w.r.t. North)" << endl;
+    *fLog << fMagneticFieldZ << ")" << UTF8::kMu << "T  Az=" << fMagneticFieldAz*TMath::RadToDeg() << UTF8::kDeg << "  (magnetic North w.r.t. North)" << endl;
 
     *fLog << "Spectrum:       Slope=" << fSlopeSpectrum << "  (" << fEnergyMin << "GeV-" << fEnergyMax << "GeV)" <<  endl;
     *fLog << "Wavelength:     " << fWavelengthMin << "nm - " << fWavelengthMax << "nm" << endl;
 
+    if (fImpactMax>0)
+        *fLog << "ImpactMax:      " << fImpactMax << "cm" << endl;
     if (fViewConeOuterAngle>0)
         *fLog << "ViewCone:       " << fViewConeInnerAngle << UTF8::kDeg << " - " << fViewConeOuterAngle << UTF8::kDeg << endl;
@@ -303 +327 @@
         *fLog << " ATMEXT" << GetNumAtmosphericModel();
     if (Has(kRefraction))
-        *fLog << " AtmRefraction";
+        *fLog << " +Refraction";
     if (Has(kVolumedet))
         *fLog << " VOLUMEDET";
@@ -312 +336 @@
     *fLog << endl;
 
+    if (HasLayers())
+    {
+        *fLog << "Atm.Layers:    ";
+        for (int i=0; i<5; i++)
+            *fLog << " " << fAtmosphericLayers[i];
+    }
     *fLog << "Atm.Coeff A:   ";
     for (int i=0; i<5; i++)

trunk/MagicSoft/Mars/mcorsika/MCorsikaRunHeader.h

@@ -60 +60 @@
     Float_t fViewConeOuterAngle;      // [deg]
 
-    Float_t fAtmosphericCoeffA[5];    // [g/cm²] AATM (see Corsika Manual for details)
-    Float_t fAtmosphericCoeffB[5];    // [g/cm²] BATM (see Corsika Manual for details)
-    Float_t fAtmosphericCoeffC[5];    // [cm]    CATM (see Corsika Manual for details)
+    Float_t fAtmosphericLayers[5];    // [cm]    ATMLAY (see Corsika Manual for details)
+    Float_t fAtmosphericCoeffA[5];    // [g/cm²] AATM   (see Corsika Manual for details)
+    Float_t fAtmosphericCoeffB[5];    // [g/cm²] BATM   (see Corsika Manual for details)
+    Float_t fAtmosphericCoeffC[5];    // [cm]    CATM   (see Corsika Manual for details)
 
     UInt_t fCerenkovFlag;
@@ -107 +108 @@
 
     // Preliminary!
+    Bool_t HasLayers() const { return fAtmosphericLayers[4]>0; }
+
+    const Float_t *GetAtmosphericLayers() const { return fAtmosphericLayers; }
     const Float_t *GetAtmosphericCoeffA() const { return fAtmosphericCoeffA; }
     const Float_t *GetAtmosphericCoeffB() const { return fAtmosphericCoeffB; }