Changeset 4828 for trunk/MagicSoft/Mars/mmain

Timestamp:

09/02/04 14:32:50 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

@@ -73 +73 @@
 #include "MImgCleanStd.h"         // MImgCleanStd
 #include "MHillasCalc.h"          // MHillasCalc
-#include "MHillasSrcCalc.h"       // MHillasSrcCalc
+//#include "MHillasSrcCalc.h"       // MHillasSrcCalc
 //#include "MBlindPixelCalc.h"      // MBlindPixelCalc
 #include "MArrivalTimeCalc.h"     // MArrivalTimeCalc
@@ -88 +88 @@
 #include "MHillasExt.h"            // MHillasExt::Print(const MGeomCam&)
 #include "MHillasSrc.h"            // MHillasSrc::Print(const MGeomCam&)
+#include "MImagePar.h"             // MImagePar::Print(const MGeomCam&)
 #include "MNewImagePar.h"          // MNewImagePar::Print(const MGeomCam&)
 #include "MHEvent.h"               // MHEvent
@@ -292 +293 @@
     MFillH             *fill04 = new MFillH(evt04, "MPedPhotCam", "MFillH04");
     MFillH             *fill05 = new MFillH(evt05, "MCameraData", "MFillH05");
-    MFillH             *fill06a= new MFillH(evt06a, "MCameraData", "MFillH06");
-    MFillH             *fill06b= new MFillH(evt06b, "MCameraData", "MFillH06");
-//    MBlindPixelCalc   *blind = new MBlindPixelCalc;
+    MFillH             *fill06a= new MFillH(evt06a, "MCameraData", "MFillH06a");
+    MFillH             *fill06b= new MFillH(evt06b, "MCameraData", "MFillH06b");
+    //MBlindPixelCalc   *blind = new MBlindPixelCalc;
     MHillasCalc        *hcalc  = new MHillasCalc;
-    MHillasSrcCalc     *scalc  = new MHillasSrcCalc;
     MMcTriggerLvl2Calc *trcal  = new MMcTriggerLvl2Calc;
     MFillH             *fill09 = new MFillH(evt09, "MMcTriggerLvl2", "MFillH09");
@@ -362 +362 @@
     tlist->AddToList(fill06a);
     tlist->AddToList(fill06b);
-//    tlist->AddToList(blind);
+    //tlist->AddToList(blind);
+    tlist->AddToList(fill10);
     tlist->AddToList(hcalc);
-    tlist->AddToList(scalc);
-    tlist->AddToList(fill10);
-
     if ((!pcam || !ccam) && type==2)
     {
@@ -379 +377 @@
         tlist->AddToList(fill09);
     }
-
     if (type==1)
     {
@@ -588 +585 @@
     ((MHillasExt*)  plist->FindObject("MHillasExt"))->Print(*geom);
     ((MHillasSrc*)  plist->FindObject("MHillasSrc"))->Print(*geom);
+    plist->FindObject("MImagePar")->Print();
     ((MNewImagePar*)plist->FindObject("MNewImagePar"))->Print(*geom);
-    
+
     //
     // UpdateDisplay
@@ -635 +633 @@
     {
         TCanvas *c = GetCanvas(i);
-        c->GetPad(1)->cd(1);
+        c->cd(1);
         hillas->Draw();
     }