Changeset 5340 for trunk/MagicSoft/Mars/mmontecarlo

Timestamp:

11/04/04 21:52:46 (20 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmontecarlo

Files:

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

trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.cc

@@ -67 +67 @@
     fAllEvtsTriggered         =  kFALSE;
     fTotalNumSimulatedShowers =  0;
-    fTheta                    = -1.;
+    fThetaMin                 = -1.;
+    fThetaMax                 = -1.;
 
 } 
@@ -100 +101 @@
 
 
-    if (fTheta>=0 && fTheta!=runheader->GetTelesTheta())
-    {
-        *fLog << warn << "Warning - Read files have different TelesTheta (";
-        *fLog << fTheta << ", " << runheader->GetTelesTheta() << ")..." << endl;
-    }
-    fTheta = runheader->GetTelesTheta();
+    if ( (fThetaMin >= 0 && fThetaMin != runheader->GetShowerThetaMin()) ||
+         (fThetaMax >= 0 && fThetaMax != runheader->GetShowerThetaMax()) )
+    {
+        *fLog << warn << "Warning - Read files have different Theta ranges (";
+        *fLog << "(" << fThetaMin << ", " << fThetaMax << ")   vs   (" << 
+          runheader->GetShowerThetaMin() << ", " << 
+          runheader->GetShowerThetaMax() << ")..." << endl;
+    }
+    fThetaMin = runheader->GetShowerThetaMin();
+    fThetaMax = runheader->GetShowerThetaMax();
 
 

trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.h

@@ -26 +26 @@
     UInt_t fCorsikaVersion;
     Bool_t fAllEvtsTriggered;
-    Float_t fTheta;
+    Float_t fThetaMin;
+    Float_t fThetaMax;
 
     Bool_t ReInit(MParList *plist);