Changeset 1203 for trunk/MagicSoft/Mars/mgui

Timestamp:

01/21/02 20:52:12 (23 years ago)

Author:

rkb

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mgui

Files:

• MCamDisplay.cc (modified) (5 diffs)
• MCamDisplay.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mgui/MCamDisplay.cc

@@ -11 +11 @@
 
 #include "MHexagon.h"
+
+#include "MGeomPix.h"
 #include "MGeomCam.h"
 
@@ -27 +29 @@
     : fAutoScale(kTRUE), fMinPhe(-2), fMaxPhe(50), fW(0), fH(0), fDrawingPad(NULL)
 {
+    fGeomCam = geom; // FIXME: Clone doesn't work! (MGeomCam*)geom->Clone();
+
     //
     //  create the hexagons of the display
@@ -80 +84 @@
     delete fLegend;
     delete fLegText;
-}
-
-inline void MCamDisplay::SetPixColor(const MCerPhotPix &pix)
-{
-    (*this)[pix.GetPixId()].SetFillColor(GetColor(pix.GetNumPhotons()));
+
+    delete fGeomCam;
+}
+
+inline void MCamDisplay::SetPixColor(const MCerPhotPix &pix, const Int_t i)
+{
+    //
+    // Fixme: Divide pnum by the (real) area of the pixel
+    //
+
+    const Float_t ratio = (*fGeomCam)[0].GetA()/(*fGeomCam)[i].GetA();
+    const Float_t pnum  = ratio*pix.GetNumPhotons();
+
+    (*this)[pix.GetPixId()].SetFillColor(GetColor(pnum));
 }
 
@@ -221 +234 @@
     if (fAutoScale)
     {
-        fMinPhe = event->GetNumPhotonsMin();
-        fMaxPhe = event->GetNumPhotonsMax();
+        fMinPhe = event->GetNumPhotonsMin(fGeomCam);
+        fMaxPhe = event->GetNumPhotonsMax(fGeomCam);
 
         if (fMaxPhe < 20.)
@@ -242 +255 @@
             continue;
 
-        SetPixColor(pix);
+        SetPixColor(pix, i);
     }
 

trunk/MagicSoft/Mars/mgui/MCamDisplay.h

@@ -21 +21 @@
 {
 private:
+    MGeomCam      *fGeomCam;     // pointer to camera geometry
+
     Bool_t         fAutoScale;   // indicating the autoscale function
 
@@ -42 +44 @@
     MHexagon &operator[](int i) { return *((MHexagon*)fPixels->At(i)); }
 
-    void  SetPixColor(const MCerPhotPix &pix);
+    void  SetPixColor(const MCerPhotPix &pix, const Int_t i);
     Int_t GetColor(Float_t wert);