Changeset 9378 for trunk

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• ceres.rc (modified) (10 diffs)
• mcorsika/MCorsikaRunHeader.cc (modified) (7 diffs)
• mcorsika/MCorsikaRunHeader.h (modified) (2 diffs)
• msim/MSimAtmosphere.cc (modified) (5 diffs)
• msim/MSimAtmosphere.h (modified) (2 diffs)
• msimcamera/MSimCalibrationSignal.cc (modified) (1 diff)
• resmc (added)
• resmc/atmosphere-aerosols.txt (added)
• resmc/atmosphere-ozone.txt (added)
• resmc/ct1-pde.txt (added)
• resmc/dwarf-apdmap.txt (added)
• resmc/dwarf-cones.txt (added)
• resmc/dwarf-pde-gapd.txt (added)
• resmc/dwarf-reflectivity.txt (added)
• resmc/dwarf-reflector.txt (added)
• resmc/magic-cones-inner.txt (added)
• resmc/magic-pde.txt (added)
• resmc/magic-reflectivity.txt (added)
• resmc/magic-reflector-chessboard.txt (added)
• resmc/magic-reflector.txt (added)
• resmc/magic-trigger-1NN.txt (added)
• resmc/magic-trigger-2NN.txt (added)
• resmc/magic-trigger-3NN.txt (added)
• resmc/magic-trigger-4NN.txt (added)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2009/03/03 Thomas Bretz
+
+   * ceres.rc:
+     - added some more infomation
+     - updated paths
+
+   * mcorsika/MCorsikaRunHeader.[h,cc]:
+     - added atmospheric layers
+     - added interpretation of new XSCATT/YSCATT in newer corsikas
+
+   * msim/MSimAtmosphere.[h,cc]:
+     - changed path
+     - MAtmosphere doesn't search for any files per default anymore
+     - changed atmopsheric layers to the ones fitted by Corsika
+     - added possibility to change input files to ReadEnv
+
+   * msimcamera/MSimCalibrationSignal.cc:
+     - don't create a camera geometry yourself
+     
+   * resmc/atmosphere-aerosols.txt, resmc/atmosphere-ozone.txt,
+     resmc/ct1-pde.txt, resmc/dwarf-apdmap.txt, resmc/dwarf-cones.txt,
+     resmc/dwarf-pde-gapd.txt, resmc/dwarf-reflectivity.txt,
+     resmc/dwarf-reflector.txt, resmc/magic-cones-inner.txt,
+     resmc/magic-pde.txt, resmc/magic-reflectivity.txt,
+     resmc/magic-reflector-chessboard.txt, resmc/magic-reflector.txt,
+     resmc/magic-trigger-1NN.txt, resmc/magic-trigger-2NN.txt,
+     resmc/magic-trigger-3NN.txt, resmc/magic-trigger-4NN.txt:
+     - added
+
+
+
  2009/03/02 Daniela Dorner
 

trunk/MagicSoft/Mars/ceres.rc

@@ -52 +52 @@
 # BinningDist.Raw:        100      0       2.5
 # BinningDistC.Raw:       100      0       2.5
+# BinningThreshold.Raw:    35    0.9     90000  log
+# BinningEnergyEst.Raw:   100    0.9     90000  log
 
 
@@ -73 +75 @@
 
 # -------------------------------------------------------------------------
-# Here you can control the poiting of the telescope.
-# To switch on off-target observations set a value for the distance >0.
-# Whether they are randomly disributed (<0) or at a fixed phi can also 
-# be decided. Note, that this is options are ignored in the case
-# a view-cone was used. (All valued given in degree)
-# -------------------------------------------------------------------------
-
+# Some setup for the atmosphere. The default should be well suited.
+# -------------------------------------------------------------------------
+#MSimAtmosphere.FileAerosols: resmc/atmopshere-aerosols.txt
+#MSimAtmosphere.FileOzone:    resmc/atmopshere-ozone.txt
+
+
+# -------------------------------------------------------------------------
+# Here you can control the poiting of the telescope. To switch on
+# off-target observations set a value for the distance !=0 [deg].
+# For details see MSimPointingPos
+# -------------------------------------------------------------------------
 #MSimPointingPos.OffTargetDistance: 0.4
 #MSimPointingPos.OffTargetPhi: -1
@@ -91 +97 @@
 # For the file definition see MReflector::ReadFile
 
-#Reflector.FileName: mreflector/reflector-magic.def
-#Reflector.FileName: mreflector/magic-chessboard.def
+#Reflector.FileName: resmc/magic-reflector.txt
+#Reflector.FileName: resmc/magic-reflector-chessboard.txt
 # Units mm: ~0.020°
 #Reflector.SetSigmaPSF: 6.0
@@ -98 +104 @@
 #Reflector.SetSigmaPSF: 7.5
 
-Reflector.FileName: mreflector/reflector-dwarf.def
+Reflector.FileName: resmc/dwarf-reflector.txt
 # Units mm: ~0.02° 
 #Reflector.SetSigmaPSF: 1.8
@@ -115 +121 @@
 MGeomCam.Constructor:   MGeomCamDwarf(209.5, 15,  4.8887);
 
-MSimBundlePhotons.FileName: mreflector/dwarf-apdmap.txt
+MSimBundlePhotons.FileName: resmc/dwarf-apdmap.txt
 
 # Set the APD type (1: 30x30 <default>, 2: 60x60)
@@ -127 +133 @@
 # Setup the absorption, conversion efficiency and angular acceptance
 # -------------------------------------------------------------------------
-MirrorReflectivity.FileName:           mreflector/pde-mirror.txt
-PhotonDetectionEfficiency.FileName:    mreflector/pde-apd.txt
-ConesAngularAcceptance.FileName:       mreflector/dwarf-cones.txt
+MirrorReflectivity.FileName:           resmc/dwarf-reflectivity.txt
+PhotonDetectionEfficiency.FileName:    resmc/dwarf-pde-gapd.txt
+ConesAngularAcceptance.FileName:       resmc/dwarf-cones.txt
 
 
@@ -145 +151 @@
 # evaluated for all pixels not just for the pixels which are
 # later "connected" in the trigger (used in the coincidence map)
-# MSimTrigger.FileNameRouteAC:         inner.txt
+# MSimTrigger.FileNameRouteAC:         resmc/magic-trigger-1NN.txt
 
 # HEGRA like single pixel above threshold trigger
@@ -154 +160 @@
 
 # Magic like 2NN trigger (inner 396 pixel)
-#MSimTrigger.FileNameCoincidenceMap:  2NN-lut-uniq.txt
+#MSimTrigger.FileNameCoincidenceMap:  resmc/magic-trigger-2NN.txt
 #MSimTrigger.DiscriminatorThreshold:  7.00
 #MSimTrigger.DigitalSignalLength:     8
@@ -160 +166 @@
 
 # Magic like 3NN trigger (inner 396 pixel)
-MSimTrigger.FileNameCoincidenceMap:  3NN-lut-uniq.txt
-MSimTrigger.DiscriminatorThreshold:  6.0
-MSimTrigger.DigitalSignalLength:     8
-MSimTrigger.CoincidenceTime:         0.5
+#MSimTrigger.FileNameCoincidenceMap:  resmc/magic-trigger-3NN.txt
+#MSimTrigger.DiscriminatorThreshold:  6.0
+#MSimTrigger.DigitalSignalLength:     8
+#MSimTrigger.CoincidenceTime:         0.5
 
 # Magic like 4NN trigger (inner 396 pixel)
-#MSimTrigger.FileNameCoincidenceMap:  4NN-lut-uniq.txt
+#MSimTrigger.FileNameCoincidenceMap:  resmc/magic-trigger-4NN.txt
 #MSimTrigger.DiscriminatorThreshold:  5.0
 #MSimTrigger.DigitalSignalLength:     8
 #MSimTrigger.CoincidenceTime:         0.5
+
+MSimTrigger.FileNameRouteAC:         resmc/magic-trigger-3NN.txt
+MSimTrigger.DiscriminatorThreshold:  11000
+MSimTrigger.DigitalSignalLength:     8
+MSimTrigger.CoincidenceTime:         0.5
 
 IntendedPulsePos.Val: 40
@@ -203 +214 @@
 #MPulseShape.Function.Xmin:   -5
 #MPulseShape.Function.Xmax:   45
+
+# -------------------------------------------------------------------------
+# Setup an image cleaning on the pure gamma signal (without noise)
+# -------------------------------------------------------------------------
+
+#MImgCleanStd.CleanLevel1:   6.0
+#MImgCleanStd.CleanLevel2:   6.0

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; }

trunk/MagicSoft/Mars/msim/MSimAtmosphere.cc

@@ -165 +165 @@
         // the observer
 
+        // FIXME: Could be replaced by 0, AtmLay[0]-fAtmLay[3]
+
         const Double_t h[5] =
         {
-            fObsLevel,                       //   0km
-            TMath::Max(fObsLevel, 4e5),      //   4km
-            1.0e6,                           //  10km
-            4.0e6,                           //  40km
-            1.0e7                            // 100km
+            fObsLevel,                     // fObsLevel,                   //   0km
+            TMath::Max(fObsLevel, 7.75e5), // TMath::Max(fObsLevel, 4e5),  //   4km
+             16.5e5,                       //  10e5,                       //  10km
+             50.0e5,                       //  40e5,                       //  40km
+            105.0e5,                       // 100e5                        // 100km
         };
 
@@ -418 +420 @@
     MAtmosphere(const MCorsikaRunHeader &h) : fAbsCoeffOzone(0), fAbsCoeffAerosols(0)
     {
-        Init(h, "ozone.txt", "aerosols.txt");
-    }
-
-    MAtmosphere(const char *name1="ozone.txt", const char *name2="aerosols.txt") : fAbsCoeffOzone(0), fAbsCoeffAerosols(0)
-    {
-        InitOzone(name1);
-        InitAerosols(name2);
+        Init(h);//, "ozone.txt", "aerosols.txt");
+    }
+
+    MAtmosphere(const char *name1=0, const char *name2=0) : fAbsCoeffOzone(0), fAbsCoeffAerosols(0)
+    {
+        if (name1)
+            InitOzone(name1);
+        if (name2)
+            InitAerosols(name2);
     }
 
@@ -694 +698 @@
 //
 MSimAtmosphere::MSimAtmosphere(const char* name, const char *title)
-    : fEvt(0), fAtmosphere(0)
+    : fEvt(0), fAtmosphere(0),
+    fFileAerosols("resmc/atmosphere-aerosols.txt"),
+    fFileOzone("resmc/atmosphere-ozone.txt")
 {
     fName  = name  ? name  : "MSimAtmosphere";
@@ -753 +759 @@
     */
 
-    fAtmosphere->Init(*h);
+    fAtmosphere->Init(*h, fFileOzone, fFileAerosols);
 
     if (!fAtmosphere->IsAllValid())
@@ -847 +853 @@
 // --------------------------------------------------------------------------
 //
-// FileName: reflectivity.txt
-// UseTheta: No
+// FileAerosols: resmc/atmosphere-aerosols.txt
+// FileOzone:    resmc/atmosphere-ozone.txt
 //
 Int_t MSimAtmosphere::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
     Bool_t rc = kFALSE;
-/*
-    if (IsEnvDefined(env, prefix, "FileName", print))
+
+    if (IsEnvDefined(env, prefix, "FileAerosols", print))
     {
         rc = kTRUE;
-        SetFileName(GetEnvValue(env, prefix, "FileName", fFileName));
-    }
-
-    if (IsEnvDefined(env, prefix, "UseTheta", print))
+        fFileAerosols = GetEnvValue(env, prefix, "FileAerosols", fFileAerosols);
+    }
+
+    if (IsEnvDefined(env, prefix, "FileOzone", print))
     {
         rc = kTRUE;
-        SetUseTheta(GetEnvValue(env, prefix, "UseTheta", fUseTheta));
-    }
-*/
+        fFileOzone = GetEnvValue(env, prefix, "FileOzone", fFileOzone);
+    }
+
     return rc;
 }

trunk/MagicSoft/Mars/msim/MSimAtmosphere.h

@@ -17 +17 @@
     MAtmosphere  *fAtmosphere; //! Instance of class describing atmosphere
 
+    TString fFileAerosols;     // Name of file with aersole absorption
+    TString fFileOzone;        // Name of file with ozone absorption
+
     // MParContainer
     Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
@@ -29 +32 @@
     ~MSimAtmosphere();
 
-    // MSimAtmosphere
-
-    // TObject
-
     ClassDef(MSimAtmosphere, 0) // Simulate the wavelength and height-dependant atmpsheric absorption
 };

trunk/MagicSoft/Mars/msimcamera/MSimCalibrationSignal.cc

@@ -98 +98 @@
         *fLog << inf << fNameGeomCam << " [MGeomCam] not found..." << endl;
 
-        fGeom = (MGeomCam*)pList->FindCreateObj(fNameGeomCam);
+        fGeom = (MGeomCam*)pList->FindObject("MGeomCam");
         if (!fGeom)
+        {
+            *fLog << err << "MGeomCam not found... aborting." << endl;
             return kFALSE;
+        }
     }