Changeset 2237 for trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc

Timestamp:

06/26/03 17:00:06 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc

@@ -39 +39 @@
 #include "MHillasCalc.h"         // MHillasCalc
 #include "MHillasSrcCalc.h"      // MHillasSrcCalc
+#include "MPedestalPix.h"        // MPedestalPix
 #include "MPedestalCam.h"        // MPedestalCam
-#include "MCerPhotCalc.h"        // MCerPhotCalc
+#include "MCerPhotEvt.h"         // MCerPhotEvt::GetPixById
+#include "MCerPhotCalc.h"       // MCerPhotCalc
 #include "MMcPedestalCopy.h"     // MMcPedestalCopy
 #include "MMcPedestalNSBAdd.h"   // MMcPedestalNSBAdd
@@ -166 +168 @@
 
     fCanvas2[0] = fCanvas;
-    fCanvas2[1] = AddTab("Errors");
-    fCanvas2[2] = AddTab("Phot/Err");
+    fCanvas2[1] = AddTab("PedRMS");
+    fCanvas2[2] = AddTab("Phot/PedRMS");
     fCanvas2[3] = AddTab("Levels");
     fCanvas2[4] = AddTab("Pedestals");
@@ -184 +186 @@
     }
 
-    fDisplay[0]->SetNameTitle("photons",   "Number of Photons");
-    fDisplay[1]->SetNameTitle("errors",    "Error of Photons");
-    fDisplay[2]->SetNameTitle("photerr",   "Number of Photons / Error");
-    fDisplay[3]->SetNameTitle("levels",    "Cleaning Levels");
-    fDisplay[4]->SetNameTitle("pedestals", "Pedestals");
+    fDisplay[0]->SetNameTitle("photons",    "Number of Photons");
+    fDisplay[1]->SetNameTitle("pedrms",     "Pedestal RMS");
+    fDisplay[2]->SetNameTitle("photpedrms", "Number of Photons / Pedestal RMS");
+    fDisplay[3]->SetNameTitle("levels",     "Cleaning Levels");
+    fDisplay[4]->SetNameTitle("pedestals",  "Pedestals");
 
     ReadFirstEvent();
@@ -247 +249 @@
     const MPedestalCam *ped   = (MPedestalCam*)plist->FindObject("MPedestalCam");
 
-    fDisplay[0]->SetCamContent((MCamEvent&)*evt, 0);
-    fDisplay[1]->SetCamContent((MCamEvent&)*evt, 1);
-    fDisplay[2]->SetCamContent((MCamEvent&)*evt, 2);
+    // FIXME: Make this publicly available
+    TArrayD val(577);
+    TArrayC use(577);
+    for (int i=0; i<577;i++)
+    {
+        // FIXME: photon event first!
+        MCerPhotPix *pix = evt->GetPixById(i);
+        if (!pix)
+            continue;
+        MPedestalPix &ppix = (*ped)[i];
+        if (ppix.GetPedestalRms()<0)
+            continue;
+        val[i] = pix->GetNumPhotons()/ppix.GetPedestalRms();
+        use[i] = 1;
+    }
+
+    fDisplay[0]->SetCamContent(*evt, 0);
+    fDisplay[1]->SetCamContent(*ped, 1);
+    fDisplay[2]->SetCamContent(val, &use);
     fDisplay[3]->FillLevels(*evt, *clean);
-    fDisplay[4]->SetCamContent((MCamEvent&)*ped);
+    fDisplay[4]->SetCamContent(*ped, 0);
 
     if (fDisplayHillas)