Changeset 2147 for trunk

Timestamp:

06/02/03 09:51:18 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/readcurrents.C (added)
• manalysis/AnalysisLinkDef.h (modified) (1 diff)
• manalysis/MCerPhotEvt.cc (modified) (4 diffs)
• manalysis/MCerPhotEvt.h (modified) (1 diff)
• manalysis/MCurrents.cc (added)
• manalysis/MCurrents.h (added)
• manalysis/Makefile (modified) (1 diff)
• mfileio/FileIOLinkDef.h (modified) (1 diff)
• mfileio/MReadCurrents.cc (added)
• mfileio/Makefile (modified) (1 diff)
• mgui/MCamDisplay.cc (modified) (5 diffs)
• mgui/MCamDisplay.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+ 2003/06/02: Thomas Bretz
+
+   * manalysis/AnalysisLinkDef.h, manalysis/Makefile:
+     - added MCurrents
+     
+   * manalysis/MCerPhotEvt.[h,cc]:
+     - added MGeomCam argument to GetRatioMin/Max
+     
+   * mfileio/FileIOLinkDef.h, mfileio/Makefile:
+     - added MReadCurrents
+
+   * mfileio/MReadCurrents.[h,cc]:
+     - added
+     
+   * manalysis/MCurrents.[h,cc]:
+     - added
+     
+   * mgui/MCamDisplay.[h,cc]:
+     - added current support
+
+
+
  2003/05/30: Wolfgang Wittek
 

trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h

@@ -12 +12 @@
 #pragma link C++ class MBlindPixels+;
 #pragma link C++ class MBlindPixelCalc+;
+
+#pragma link C++ class MCurrents+;
 
 #pragma link C++ class MPedestalPix+;

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc

@@ -236 +236 @@
 // get the minimum ratio of photons/error
 //
-Float_t MCerPhotEvt::GetRatioMin() const
+Float_t MCerPhotEvt::GetRatioMin(const MGeomCam *geom) const
 {
     if (fNumPixels <= 0)
@@ -250 +250 @@
 
         Float_t testval = pix.GetNumPhotons()/pix.GetErrorPhot();
+        if (geom)
+            testval *= TMath::Sqrt(geom->GetPixRatio(pix.GetPixId()));
+
         if (testval < minval)
             minval = testval;
@@ -261 +264 @@
 // get the maximum ratio of photons/error
 //
-Float_t MCerPhotEvt::GetRatioMax() const
+Float_t MCerPhotEvt::GetRatioMax(const MGeomCam *geom) const
 {
     if (fNumPixels <= 0)
@@ -275 +278 @@
 
         Float_t testval = pix.GetNumPhotons()/pix.GetErrorPhot();
+        if (geom)
+            testval *= TMath::Sqrt(geom->GetPixRatio(pix.GetPixId()));
+
         if (testval > maxval)
             maxval = testval;

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h

@@ -41 +41 @@
     Float_t GetNumPhotonsMax(const MGeomCam *geom=NULL) const;
 
-    Float_t GetRatioMin() const;
-    Float_t GetRatioMax() const;
+    Float_t GetRatioMin(const MGeomCam *geom=NULL) const;
+    Float_t GetRatioMax(const MGeomCam *geom=NULL) const;
 
     Float_t GetErrorPhotMin(const MGeomCam *geom=NULL) const;

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -33 +33 @@
            MMcPedestalCopy.cc \
            MMcPedestalNSBAdd.cc \
+           MCurrents.cc \
            MEnergyEst.cc \
            MEnergyEstimate.cc \

trunk/MagicSoft/Mars/mfileio/FileIOLinkDef.h

@@ -9 +9 @@
 #pragma link C++ class MReadTree+;
 #pragma link C++ class MReadMarsFile+;
+#pragma link C++ class MReadCurrents+;
 #pragma link C++ class MReadRflFile+;
 

trunk/MagicSoft/Mars/mfileio/Makefile

@@ -35 +35 @@
            MChain.cc \
            MReadTree.cc \
+           MReadCurrents.cc \
            MReadMarsFile.cc \
            MReadRflFile.cc \

trunk/MagicSoft/Mars/mgui/MCamDisplay.cc

@@ -59 +59 @@
 #include "MPedestalCam.h"
 
+#include "MCurrents.h"
+
 #include "MImgCleanStd.h"
 
@@ -249 +251 @@
     // Fixme: Use absolute value per mm^2. Needs another scaling algorithm.
     //
-    const Float_t pnum  = pix.GetNumPhotons()/pix.GetErrorPhot();
-    (*this)[pix.GetPixId()].SetFillColor(GetColor(pnum, min, max));
+    // *OLD* const Float_t r = pix.GetNumPhotons()/pix.GetErrorPhot();
+    //    if (entry * ratio <= fCleanLvl1 * noise)
+
+    const Float_t  entry = pix.GetNumPhotons();
+    const Float_t  noise = pix.GetErrorPhot();
+    const Double_t ratio = TMath::Sqrt(fGeomCam->GetPixRatio(pix.GetPixId()));
+
+    const Float_t r = entry*ratio/noise;
+    //const Float_t pnum  = pix.GetNumPhotons()/pix.GetErrorPhot();
+
+    (*this)[pix.GetPixId()].SetFillColor(GetColor(r, min, max));
 }
 
@@ -259 +270 @@
     MHexagon &hex = (*this)[pix.GetPixId()];
 
-    const Float_t r = pix.GetNumPhotons()/pix.GetErrorPhot();
+    // *OLD* const Float_t r = pix.GetNumPhotons()/pix.GetErrorPhot();
+    //    if (entry * ratio <= fCleanLvl1 * noise)
+
+    const Float_t  entry = pix.GetNumPhotons();
+    const Float_t  noise = pix.GetErrorPhot();
+    const Double_t ratio = TMath::Sqrt(fGeomCam->GetPixRatio(pix.GetPixId()));
+
+    const Float_t r = entry*ratio/noise;
 
     if (r>lvl1)
@@ -618 +636 @@
     if (fAutoScale)
     {
-        min = event.GetRatioMin();
-        max = event.GetRatioMax();
+        min = event.GetRatioMin(fGeomCam);
+        max = event.GetRatioMax(fGeomCam);
 
         UpdateLegend(min, max);
@@ -637 +655 @@
 
         SetPixColorRatio(pix, min, max);
+    }
+}
+
+// ------------------------------------------------------------------------
+//
+// Call this function to fill the currents
+//
+void MCamDisplay::FillCurrents(const MCurrents &event)
+{
+    //
+    // Reset pixel colors to default value
+    //
+    Reset();
+
+    //
+    //  if the autoscale is true, set the values for the range for
+    //  each event
+    //
+    Float_t min = 0;
+    Float_t max = 20;
+    if (fAutoScale)
+    {
+        min = event.GetMin();
+        max = event.GetMax();
+
+        UpdateLegend(min, max);
+    }
+
+    //
+    //   update the colors in the picture
+    //
+    // FIXME: Security check missing!
+    for (UInt_t i=0; i<fNumPixels; i++)
+    {
+        //const Float_t pnum  = pix.GetNumPhotons()/pix.GetErrorPhot();
+        (*this)[i].SetFillColor(GetColor(event[i], min, max));
     }
 }

trunk/MagicSoft/Mars/mgui/MCamDisplay.h

@@ -19 +19 @@
 class MHexagon;
 class MRflEvtData;
+class MCurrents;
 class MCerPhotEvt;
 class MCerPhotPix;
@@ -80 +81 @@
     void FillPedestals(const MPedestalCam &event);
     void FillRflEvent(const MRflEvtData &event);
+    void FillCurrents(const MCurrents &event);
     void ShowRflEvent(const MRflEvtData *event=NULL, EMarkerStyle m=kFullDotMedium);