Changeset 1611 for trunk/MagicSoft/Mars/mmontecarlo

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.cc (modified) (3 diffs)

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;