Changeset 1611 for trunk/MagicSoft

Timestamp:

11/14/02 17:01:32 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mmontecarlo/MMcCollectionAreaCalc.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -13 +13 @@
    * mgeom/MGeomPMT.cc, mgeom/MGeomMirror.cc:
      - removed redefinition of a default argument
+
+   * mhist/MHMcIntRate.cc, mhist/MHMcCollectionArea.[h,cc]: 
+     - changed the error calculation according to a suggestion from Raquel
+
+   * mmontecarlo/MMcCollectionAreaCalc.cc: 
+     - for collection area: MMcTrig isn't needed if all showers are
+       triggered showers
+
+   * mmc/MMcConfigRunHeader.cc:
+     - made function definition identical to function declaration
+
+   * macros/star.C:
+     - removed anti source for the moment
+
+   * macros/multidimdist2.C:
+     - added
+
+   * macros/comprob.C, macros/multidimdist.C:
+     - changed to use MHillasSrc instead of HillasSource
+
+   * mhist/MHHadronness.cc:
+     - changed the output of Print a bit
 
 

trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.cc

@@ -69 +69 @@
     }
 
-    fMcTrig = (MMcTrig*)pList->FindObject(fObjName);
-    if (!fMcTrig)
-    {
-        *fLog << err << dbginf << fObjName << " [MMcTrig] not found... exit." << endl;
-        return kFALSE;
-    }
-
     fCollArea = (MHMcCollectionArea*)pList->FindCreateObj("MHMcCollectionArea");
     if (!fCollArea)
@@ -115 +108 @@
     *fLog << inf << "Only triggered events avail: " << (fAllEvtsTriggered?"yes":"no") << endl;
 
+    if (fAllEvtsTriggered)
+        return kTRUE;
+
+    fMcTrig = (MMcTrig*)plist->FindObject(fObjName);
+    if (!fMcTrig)
+    {
+        *fLog << err << dbginf << fObjName << " [MMcTrig] not found... exit." << endl;
+        return kFALSE;
+    }
+
     return kTRUE;
 }
 
 Bool_t MMcCollectionAreaCalc::Process()
-{ 
+{
     const Float_t energy = fMcEvt->GetEnergy();
     const Float_t impact = fMcEvt->GetImpact()/100.;
@@ -126 +129 @@
         fCollArea->FillAll(energy, impact);
 
-    if (fMcTrig->GetFirstLevel() <= 0)
+    if (!fAllEvtsTriggered && fMcTrig->GetFirstLevel() <= 0)
         return kTRUE;