Changeset 4702 for trunk/MagicSoft/Mars/mmain

Timestamp:

08/23/04 11:41:30 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

@@ -215 +215 @@
     fEvtLoop->SetParList(plist);
 
-    MHEvent *evt1 = new MHEvent(MHEvent::kEvtSignalRaw);
-    MHEvent *evt2 = new MHEvent(MHEvent::kEvtSignalRaw);
-    MHEvent *evt3 = new MHEvent(MHEvent::kEvtPedestal);
-    MHEvent *evt4 = new MHEvent(MHEvent::kEvtPedestalRMS);
-    MHEvent *evt5 = new MHEvent(MHEvent::kEvtRelativeSignal);
-    MHEvent *evt6 = new MHEvent(MHEvent::kEvtCleaningLevels);
-    MHEvent *evt7 = new MHEvent(MHEvent::kEvtIdxMax);
-    MHEvent *evt8 = new MHEvent(MHEvent::kEvtArrTime);
-    MHEvent *evt9 = new MHEvent(MHEvent::kEvtTrigPix);
-
-    evt1->SetName("Signal");
-    evt2->SetName("Cleaned");
-    evt3->SetName("Pedestal");
-    evt4->SetName("PedRMS");
-    evt5->SetName("Signal/PedRMS");
-    evt6->SetName("CleanLevels");
-    evt7->SetName("Max Slice Idx");
-    evt8->SetName("Arrival Time");
-    evt9->SetName("Trigger");
+    MHEvent *evt01 = new MHEvent(MHEvent::kEvtSignalRaw);
+    MHEvent *evt02 = new MHEvent(MHEvent::kEvtSignalRaw);
+    MHEvent *evt03 = new MHEvent(MHEvent::kEvtPedestal);
+    MHEvent *evt04 = new MHEvent(MHEvent::kEvtPedestalRMS);
+    MHEvent *evt05 = new MHEvent(MHEvent::kEvtRelativeSignal);
+    MHEvent *evt06 = new MHEvent(MHEvent::kEvtCleaningLevels);
+    MHEvent *evt07 = new MHEvent(MHEvent::kEvtIdxMax);
+    MHEvent *evt08 = new MHEvent(MHEvent::kEvtArrTime);
+    MHEvent *evt09 = new MHEvent(MHEvent::kEvtTrigPix);
+    MHEvent *evt10 = new MHEvent(MHEvent::kEvtIslandIndex);
+
+    evt01->SetName("Signal");
+    evt02->SetName("Cleaned");
+    evt03->SetName("Pedestal");
+    evt04->SetName("PedRMS");
+    evt05->SetName("Signal/PedRMS");
+    evt06->SetName("CleanLevels");
+    evt07->SetName("Max Slice Idx");
+    evt08->SetName("Arrival Time");
+    evt09->SetName("Trigger");
+    evt10->SetName("Islands");
 
     // This makes sure, that the containers are deleted...
-    plist->AddToList(evt1);
-    plist->AddToList(evt2);
-    plist->AddToList(evt3);
-    plist->AddToList(evt4);
-    plist->AddToList(evt5);
-    plist->AddToList(evt6);
-    plist->AddToList(evt7);
-    plist->AddToList(evt8);
-    plist->AddToList(evt9);
-
-    MCerPhotAnal2     *nanal = new MCerPhotAnal2;
-    MFillH            *fill1 = new MFillH(evt1, "MCerPhotEvt", "MFillH1");
-    MImgCleanStd      *clean = new MImgCleanStd;
-    MFillH            *fill2 = new MFillH(evt2, "MCerPhotEvt", "MFillH2");
-    MFillH            *fill3 = new MFillH(evt3, "MPedPhotCam", "MFillH3");
-    MFillH            *fill4 = new MFillH(evt4, "MPedPhotCam", "MFillH4");
-    MFillH            *fill5 = new MFillH(evt5, "MCameraData", "MFillH5");
-    MFillH            *fill6 = new MFillH(evt6, "MCameraData", "MFillH6");
+    plist->AddToList(evt01);
+    plist->AddToList(evt02);
+    plist->AddToList(evt03);
+    plist->AddToList(evt04);
+    plist->AddToList(evt05);
+    plist->AddToList(evt06);
+    plist->AddToList(evt07);
+    plist->AddToList(evt08);
+    plist->AddToList(evt09);
+    plist->AddToList(evt10);
+
+    MCerPhotAnal2      *nanal  = new MCerPhotAnal2;
+    MFillH             *fill01 = new MFillH(evt01, "MCerPhotEvt", "MFillH01");
+    MImgCleanStd       *clean  = new MImgCleanStd;
+    MFillH             *fill02 = new MFillH(evt02, "MCerPhotEvt", "MFillH02");
+    MFillH             *fill03 = new MFillH(evt03, "MPedPhotCam", "MFillH03");
+    MFillH             *fill04 = new MFillH(evt04, "MPedPhotCam", "MFillH04");
+    MFillH             *fill05 = new MFillH(evt05, "MCameraData", "MFillH05");
+    MFillH             *fill06 = new MFillH(evt06, "MCameraData", "MFillH06");
 //    MBlindPixelCalc   *blind = new MBlindPixelCalc;
-    MHillasCalc       *hcalc = new MHillasCalc;
-    MHillasSrcCalc    *scalc = new MHillasSrcCalc;
-    MMcTriggerLvl2Calc *trcal = new MMcTriggerLvl2Calc;
-    MFillH            *fill9 = new MFillH(evt9, "MMcTriggerLvl2", "MFillH9");
+    MHillasCalc        *hcalc  = new MHillasCalc;
+    MHillasSrcCalc     *scalc  = new MHillasSrcCalc;
+    MMcTriggerLvl2Calc *trcal  = new MMcTriggerLvl2Calc;
+    MFillH             *fill09 = new MFillH(evt09, "MMcTriggerLvl2", "MFillH09");
+    MFillH             *fill10 = new MFillH(evt10, "MCerPhotEvt",    "MFillH10");
 
     // If no pedestal or no calibration file is availble
@@ -285 +289 @@
         mcupd->SetFilter(f1);
         mccal->SetFilter(f1);
-        trcal->SetFilter(f1);
+        trcal->SetFilter(f1);
+        //fill09->SetFilter(f1);
 
         // Data
@@ -309 +314 @@
     }
 
-    tlist->AddToList(fill1);
+    tlist->AddToList(fill01);
     tlist->AddToList(clean);
-    tlist->AddToList(fill2);
-    tlist->AddToList(fill3);
-    tlist->AddToList(fill4);
-    tlist->AddToList(fill5);
-    tlist->AddToList(fill6);
+    tlist->AddToList(fill02);
+    tlist->AddToList(fill03);
+    tlist->AddToList(fill04);
+    tlist->AddToList(fill05);
+    tlist->AddToList(fill06);
 //    tlist->AddToList(blind);
     tlist->AddToList(hcalc);
     tlist->AddToList(scalc);
+    tlist->AddToList(fill10);
 
     if (!pcam || !ccam)
     {
         MArrivalTimeCalc  *tcalc = new MArrivalTimeCalc;
-        MFillH            *fill7 = new MFillH(evt7, "MRawEvtData",     "MFillH7");
-        MFillH            *fill8 = new MFillH(evt8, "MArrivalTimeCam", "MFillH8");
+        MFillH            *fill07 = new MFillH(evt07, "MRawEvtData",     "MFillH7");
+        MFillH            *fill08 = new MFillH(evt08, "MArrivalTimeCam", "MFillH8");
         tlist->AddToList(tcalc);
-        tlist->AddToList(fill7);
-        tlist->AddToList(fill8);
+        tlist->AddToList(fill07);
+        tlist->AddToList(fill08);
 
         tlist->AddToList(trcal);
-        tlist->AddToList(fill9);
+        tlist->AddToList(fill09);
     }