Changeset 5156 for trunk/MagicSoft/Mars/mhist

Timestamp:

10/01/04 16:41:51 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHCamEvent.cc (modified) (9 diffs)
• MHCamEvent.h (modified) (3 diffs)
• MHCamEventRot.cc (modified) (2 diffs)
• MHCamEventRot.h (modified) (3 diffs)
• MHCamera.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mhist/MHCamEvent.cc

@@ -30 +30 @@
 // currents or enything else derived from MCamEvent
 //
+// Setup
+// =====
+//
 // To plot the variance instead of the rms use:
 //    MHCamEvent::SetBit(MHCamera::kVariance);
+//  or
+//    MHCamEvent::EnableVariance()
+//
+// To count how often a certain pixel is above or below a threshold do:
+//    MHCamEvent::SetThreshold(5.5);  // Default=LowerBound
+//    MHCamEvent::SetThreshold(5.5, MHCamEvent::kIsUpperBound);
+//
 //
 // Axis titles
@@ -47 +57 @@
 //   MHCamEvent myhist("Titele;;y [cm]");
 //
-//
 /////////////////////////////////////////////////////////////////////////////
 #include "MHCamEvent.h"
@@ -88 +97 @@
 //
 MHCamEvent::MHCamEvent(const char *name, const char *title)
-    : fSum(NULL), fEvt(NULL), fType(0)
+    : fSum(NULL), fEvt(NULL), fType(0), fThreshold(0), fUseThreshold(0)
 {
     Init(name, title);
@@ -98 +107 @@
 //
 MHCamEvent::MHCamEvent(Int_t type, const char *name, const char *title)
-    : fSum(NULL), fEvt(NULL), fType(type)
+    : fSum(NULL), fEvt(NULL), fType(type), fThreshold(0), fUseThreshold(0)
 {
     Init(name, title);
@@ -111 +120 @@
     if (fSum)
         delete fSum;
+}
+
+// --------------------------------------------------------------------------
+//
+// use this to display the variance instead of the rms.
+//
+void MHCamEvent::EnableVariance(Bool_t b)
+{
+    b ? SetBit(MHCamera::kVariance) : ResetBit(MHCamera::kVariance);
 }
 
@@ -140 +158 @@
     }
 
+    // Delete a posible old histogram from a previous loop
     if (fSum)
         delete (fSum);
 
+    // combine name
     const TString name = fNameEvt.IsNull() ? fName : fNameEvt;
 
+    // create and setup MHCamera
     fSum = new MHCamera(*cam, name+";avg");
     if (fTitle!=gsDefTitle)
@@ -169 +190 @@
         return kFALSE;
     }
-    fSum->AddCamContent(*evt, fType);
+    if (fUseThreshold)
+        fSum->CntCamContent(*evt, fThreshold, fType, fUseThreshold>0);
+    else
+        fSum->AddCamContent(*evt, fType);
     return kTRUE;
 }
@@ -274 +298 @@
     MHCamera *cam = new MHCamera(*fSum->GetGeometry());
     cam->SetName(Form("Err_%p", this));
-    cam->SetTitle(TestBit(MHCamera::kVariance)?"Variance":"Root Mean Squared (rms)");
+    cam->SetTitle(fSum->TestBit(MHCamera::kVariance)?"Variance":"Root Mean Squared (rms)");
     cam->SetYTitle(fSum->GetYaxis()->GetTitle());
     cam->SetCamContent(*fSum, 1);
@@ -292 +316 @@
     h->Draw();
 }
+

trunk/MagicSoft/Mars/mhist/MHCamEvent.h

@@ -15 +15 @@
     static const TString gsDefTitle;
 
-    MHCamera  *fSum; // storing the sum
-    MCamEvent *fEvt; //! the current event
+    MHCamera  *fSum;       // storing the sum
+    MCamEvent *fEvt;       //! the current event
 
-    TString fNameEvt;
+    TString fNameEvt;      // Nameof MCamEvent to fill into histogram
 
-    Int_t fType;
+    Int_t fType;           // Type to used for calling GetPixelContent
+
+    Float_t fThreshold;    // Count pixel above/below this threshold
+    Char_t fUseThreshold;  // Use a threshold? Which direction has it?
 
     void Init(const char *name, const char *title);
@@ -28 +31 @@
 
 public:
+    enum { kIsLowerBound=1, kIsUpperBound=-1, kNoBound=0 };
+
     MHCamEvent(const char *name=NULL, const char *title=NULL);
     MHCamEvent(Int_t type, const char *name=NULL, const char *title=NULL);
@@ -42 +47 @@
     void PrintOutliers(Float_t s) const;
 
+    void SetThreshold(Float_t f, Char_t direction=kIsLowerBound) { fThreshold = f; fUseThreshold=direction; }
+    void EnableVariance(Bool_t b=kTRUE);
+
     ClassDef(MHCamEvent, 1) // Histogram to sum camera events
 };

trunk/MagicSoft/Mars/mhist/MHCamEventRot.cc

@@ -71 +71 @@
 //
 MHCamEventRot::MHCamEventRot(const char *name, const char *title)
-    : fTime(0), fPointPos(0), fObservatory(0), fType(0), fNameTime("MTime")
+    : fTime(0), fPointPos(0), fObservatory(0), fType(0), fNameTime("MTime"),
+    fThreshold(0), fUseThreshold(kNoBound)
 {
     //
@@ -192 +193 @@
 
             // Fill histogram
-            fHist.Fill(cx[ix], cy[iy], val);
+            if (fUseThreshold!=kNoBound)
+            {
+                if (val>fThreshold && fUseThreshold==kIsLowerBound ||
+                    val<fThreshold && fUseThreshold==kIsUpperBound)
+                    fHist.Fill(cx[ix], cy[iy]);
+            }
+            else
+                fHist.Fill(cx[ix], cy[iy], val);
         }
     }

trunk/MagicSoft/Mars/mhist/MHCamEventRot.h

@@ -28 +28 @@
     TH2D    fHist;               // Alpha vs. x and y
 
-    Int_t fType;
+    Int_t fType;                 // Type to used for calling GetPixelContent
 
     Double_t fRa;
@@ -35 +35 @@
     TString fNameTime;
 
+    Float_t fThreshold;          // Count pixel above/below this threshold
+    Char_t fUseThreshold;        // Use a threshold? Which direction has it?
+
     TObject *GetCatalog();
 
 public:
+    enum { kIsLowerBound=1, kIsUpperBound=-1, kNoBound=0 };
+
     MHCamEventRot(const char *name=NULL, const char *title=NULL);
 
@@ -49 +54 @@
     void Draw(Option_t *option="");
 
+    void SetThreshold(Float_t f, Char_t direction=kIsLowerBound) { fThreshold = f; fUseThreshold=direction; }
+
     ClassDef(MHCamEventRot, 1) //2D-histogram in MCamEvent data (derotated)
 };

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -1257 +1257 @@
 // 1 is added to each pixel if the contents of MCamEvent<threshold (in case isabove is set to kFALSE)
 //
+// in unused pixel is not counted if it didn't fullfill the condition.
+//
 void MHCamera::CntCamContent(const MCamEvent &event, Double_t threshold, Int_t type, Bool_t isabove)
 {
@@ -1267 +1269 @@
         Double_t val=threshold;
         if (event.GetPixelContent(val, idx, *fGeomCam, type)/* && !IsUsed(idx)*/)
+        {
             SetUsed(idx);
 
-        if (val>threshold && isabove)
-            Fill(idx);
-        if (val<threshold && !isabove)
-            Fill(idx);
+            if (isabove && val>threshold)
+                Fill(idx);
+            if (!isabove && val<threshold)
+                Fill(idx);
+        }
     }
     fEntries++;
@@ -1283 +1287 @@
 // 1 is added to each pixel if the contents of MCamEvent<threshold (in case isabove is set to kFALSE)
 //
+// in unused pixel is not counted if it didn't fullfill the condition.
+//
 void MHCamera::CntCamContent(const MCamEvent &event, TArrayD threshold, Int_t type, Bool_t isabove)
 {
@@ -1293 +1299 @@
         Double_t val=threshold[idx];
         if (event.GetPixelContent(val, idx, *fGeomCam, type)/* && !IsUsed(idx)*/)
+        {
             SetUsed(idx);
 
-        if (val>threshold[idx] && isabove)
-            Fill(idx);
-        if (val<threshold[idx] && !isabove)
-            Fill(idx);
+            if (val>threshold[idx] && isabove)
+                Fill(idx);
+            if (val<threshold[idx] && !isabove)
+                Fill(idx);
+        }
     }
     fEntries++;
@@ -1315 +1323 @@
     for (Int_t idx=0; idx<fNcells-2; idx++)
     {
-        if (const_cast<TArrayD&>(event)[idx]>threshold)
+        if (event[idx]>threshold)
             Fill(idx);