Changeset 2446 for trunk/MagicSoft/Mars/manalysis/MMcTriggerLvl2Calc.cc

Timestamp:

10/30/03 18:12:46 (21 years ago)

Author:

stamerra

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/manalysis/MMcTriggerLvl2Calc.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/manalysis/MMcTriggerLvl2Calc.cc

@@ -95 +95 @@
         return kFALSE;
     }
-
+    // Check if fCam is a Magic geometry: only MGeomCamMagic geometry and 
+    // geometries with 577 pixels are now accepted by MMcTriggerLvl2
+    if (fCam->GetNumPixels()!= 577)
+      {
+        *fLog << dbginf << "MGeomCam has a wrong geometry; only MAGIC geometry (577 pixels) is accepted by now... aborting" <<endl;
+        return kFALSE;
+      }
     fMMcTriggerLvl2 = (MMcTriggerLvl2*)pList->FindObject("MMcTriggerLvl2");
     if (!fMMcTriggerLvl2)
@@ -132 +138 @@
 Int_t MMcTriggerLvl2Calc::Process()
 {
-  fMMcTriggerLvl2->CalcEnergy(fMcEvt);
+  fMMcTriggerLvl2->GetEnergy(fMcEvt);
 
   fMMcTriggerLvl2->SetLv1(fMcTrig);
@@ -139 +145 @@
 
   fMMcTriggerLvl2->Calc();
+
+  fMMcTriggerLvl2->CalcTriggerPattern(fCam);
 
   return kTRUE;