Changeset 2178 for trunk/MagicSoft/Mars/meventdisp

Timestamp:

06/16/03 13:45:01 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc

@@ -46 +46 @@
 #include "MImgCleanStd.h"        // MImgCleanStd
 #include "MGeomCamMagic.h"       // MGeomMagicCam
+#include "MRawEvtData.h"         // MRawEvtData
 
 ClassImp(MGCamDisplay);
@@ -137 +138 @@
     MGeomCamMagic *geom   = new MGeomCamMagic;
     MPedestalCam  *pedest = new MPedestalCam;
+    MRawEvtData   *event  = new MRawEvtData;
 
     plist->AddToList(geom);
     plist->AddToList(pedest);
+    plist->AddToList(event);
 
     return geom;
@@ -176 +179 @@
         fDisplay[i]  = new MCamDisplay(geom);
         fDisplay[i]->Draw();
+        fDisplay[i]->AddNotify(*(MCamEvent*)GetParList()->FindObject("MRawEvtData"));
         fCanvas2[i]->Update();
         fList->Add(fDisplay[i]);
@@ -245 +249 @@
     const MPedestalCam *ped   = (MPedestalCam*)plist->FindObject("MPedestalCam");
 
-    fDisplay[0]->FillPhotNum(*evt);
-    fDisplay[1]->FillErrorPhot(*evt);
-    fDisplay[2]->FillRatio(*evt);
+    fDisplay[0]->Fill((MCamEvent&)*evt, 0);
+    fDisplay[1]->Fill((MCamEvent&)*evt, 1);
+    fDisplay[2]->Fill((MCamEvent&)*evt, 2);
     fDisplay[3]->FillLevels(*evt, *clean);
-    fDisplay[4]->FillPedestals(*ped);
+    fDisplay[4]->Fill((MCamEvent&)*ped);
 
     for (int i=0; i<5; i++)