Changeset 5340 for trunk/MagicSoft/Mars

Timestamp:

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

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mfileio/MReadMarsFile.cc (modified) (1 diff)
• mmontecarlo/MMcCollectionAreaCalc.cc (modified) (2 diffs)
• mmontecarlo/MMcCollectionAreaCalc.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -25 +25 @@
      - Added member fMirrorFraction to keep the active fraction of the
        mirror dish set in the camera simulation. Added Getter & Setter.
+       Added some comments. Update class version to 4.
+
+   * mmc/MMcRunHeader.[hxx,cxx]
+     - Removed member fTelesTheta, fTelesPhi. They make no sense since
+       telescope orientation can change from event to event in MC too.
+       Added getter and setter for fShowerThetaMin and fShowerThetaMax.
+
+   * mmontecarlo/MMcCollectionAreaCalc.[h,cc]
+     - Changed consistency check on MMcRunHeader.fTelesTheta to check
+       on fShowerThetaMin and fShowerThetaMax
+
+   * mfileio/MReadMarsFile.cc
+     - Removed obsolete check of old MC files, which needed the removed
+       data member MMcRunHeader.fTelesTheta.
 
  2004/11/04: Nepomuk Otte

trunk/MagicSoft/Mars/mfileio/MReadMarsFile.cc

@@ -208 +208 @@
     if (mcheader)
     {
-        if (mcheader->GetReflVersion()<=40 && mcheader->GetTelesTheta()>15)
-        {
-            *fLog << warn << "Warning - You may use Monte Carlo data produced with a version" << endl;
-            *fLog << "of the reflector program < 0.4 and a zenith angle > 15," << endl;
-            *fLog << "in this case you may get less photons than you would expect." << endl;
-        }
         if (mcheader->GetCamVersion()==50)
         {

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