Changeset 2036 for trunk/MagicSoft/Mars/mmontecarlo

Timestamp:

04/29/03 09:18:03 (22 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmontecarlo

Files:

• MMcCollectionAreaCalc.cc (modified) (6 diffs)
• MMcCollectionAreaCalc.h (modified) (1 diff)

trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.cc

@@ -28 +28 @@
 //  MHMcCollectionAreaCalc
 //
-//  Remark: The initialization is maily done in the ReInit function.
+//  Remark: The initialization is mainly done in the ReInit function.
 //          Please make sure, that you don't use MReadTree when processing
 //          a file. Use a 'ReInit'-calling task like MReadMarsFile
@@ -44 +44 @@
 #include "MMcTrig.hxx"
 #include "MMcRunHeader.hxx"
+#include "MMcCorsikaRunHeader.h"
 
 #include "MHMcCollectionArea.h"
@@ -77 +78 @@
         return kFALSE;
 
-    fTheta                    = -1;
+    fTheta                    =  -1;
+    fEmin                     =  -1;
+    fEmax                     =  -1;
+    fSlope                    =   0;
     fTotalNumSimulatedShowers =  0;
     fCorsikaVersion           =  0;
@@ -91 +95 @@
     {
         *fLog << err << dbginf << "Error - MMcRunHeader not found... exit." << endl;
+        return kFALSE;
+    }
+
+    MMcCorsikaRunHeader *corrunheader  = (MMcCorsikaRunHeader*)plist->FindObject("MMcCorsikaRunHeader");
+    if (!corrunheader)
+    {
+        *fLog << err << dbginf << "Error - MMcCorsikaRunHeader not found... exit." << endl;
         return kFALSE;
     }
@@ -110 +121 @@
 
     fCorsikaVersion = runheader->GetCorsikaVersion();
+
+    if ( fEmin > 0 &&
+         (fEmin  != corrunheader->GetELowLim() ||
+          fEmax  != corrunheader->GetEUppLim() ||
+          fSlope != corrunheader->GetSlopeSpec()) )
+      *fLog << warn << dbginf << "Warning - Read files have different energy distribution..." << endl;
+
+    fEmin  = corrunheader->GetELowLim();
+    fEmax  = corrunheader->GetEUppLim();
+    fSlope = corrunheader->GetSlopeSpec();
 
     fAllEvtsTriggered |= runheader->GetAllEvtsTriggered();
@@ -167 +188 @@
     {
         *fLog << inf << "Total number of showers: " << fTotalNumSimulatedShowers << endl;
-        fCollArea->CalcEfficiency(fTotalNumSimulatedShowers,
-                                  fCorsikaVersion == 5200 ? fTheta : 0);
+        fCollArea->CalcEfficiency(fTotalNumSimulatedShowers, fEmin, fEmax, fSlope);
     }
 

trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.h

@@ -24 +24 @@
     UInt_t fCorsikaVersion;
     Float_t fTheta;
+    Float_t fEmin;
+    Float_t fEmax;
+    Float_t fSlope;
 
     Bool_t fAllEvtsTriggered;