Changeset 3795 for trunk/MagicSoft/Mars/mmain

Timestamp:

04/22/04 15:45:20 (21 years ago)

Author:

stamerra

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mmain/MEventDisplay.cc (modified) (12 diffs)

trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

@@ -75 +75 @@
 #include "MMcCalibrationUpdate.h" // MMcCalibrationUpdate
 #include "MCalibrate.h"           // MCalibrate
+#include "MMcTriggerLvl2Calc.h"   // MMcTriggerLvl2Calc
 
 //
@@ -90 +91 @@
 #include "MPedPhotCam.h"           // MPedPhotCam
 #include "MCalibrationChargeCam.h" // MCalibrationChargeCam
+#include "MMcTriggerLvl2.h"        // MMcTriggerLvl2
 
 ClassImp(MEventDisplay);
@@ -221 +223 @@
     MHEvent *evt7 = new MHEvent(MHEvent::kEvtIdxMax);
     MHEvent *evt8 = new MHEvent(MHEvent::kEvtArrTime);
+    MHEvent *evt9 = new MHEvent(MHEvent::kEvtTrigPix);
 
     evt1->SetName("Signal");
@@ -230 +233 @@
     evt7->SetName("Max Slice Idx");
     evt8->SetName("Arrival Time");
+    evt9->SetName("Trigger");
 
     // This makes sure, that the containers are deleted...
@@ -240 +244 @@
     plist->AddToList(evt7);
     plist->AddToList(evt8);
+    plist->AddToList(evt9);
 
     MCerPhotAnal2     *nanal = new MCerPhotAnal2;
@@ -252 +257 @@
     MHillasCalc       *hcalc = new MHillasCalc;
     MHillasSrcCalc    *scalc = new MHillasSrcCalc;
+    MMcTriggerLvl2Calc *trcal = new MMcTriggerLvl2Calc;
+    MFillH            *fill9 = new MFillH(evt9, "MMcTriggerLvl2", "MFillH9");
 
     // If no pedestal or no calibration file is availble
@@ -265 +272 @@
 
         MExtractSignal* extra = new MExtractSignal();
-        extra->SetRange(5, 10, 5, 10);
+        extra->SetRange(0, 6, 2, 7);
         extra->SetSaturationLimit(240);
 
@@ -278 +285 @@
         mcupd->SetFilter(f1);
         mccal->SetFilter(f1);
+        trcal->SetFilter(f1);
 
         // Data
@@ -292 +300 @@
         tlist->AddToList(mccal);
 
-        tlist->AddToList(nanal);
+  
+        tlist->AddToList(nanal);
     }
     else
@@ -310 +319 @@
     tlist->AddToList(hcalc);
     tlist->AddToList(scalc);
+
     if (!pcam || !ccam)
     {
@@ -318 +328 @@
         tlist->AddToList(fill7);
         tlist->AddToList(fill8);
+
+        tlist->AddToList(trcal);
+        tlist->AddToList(fill9);
     }
 
@@ -518 +531 @@
     ((MHillasSrc*)  plist->FindObject("MHillasSrc"))->Print(*geom);
     ((MNewImagePar*)plist->FindObject("MNewImagePar"))->Print(*geom);
-
+    
     //
     // UpdateDisplay