Changeset 2178 for trunk/MagicSoft/Mars/mhist

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MFillH.cc (modified) (1 diff)
• MHCerPhotEvt.cc (modified) (3 diffs)
• MHCurrents.cc (modified) (9 diffs)
• MHCurrents.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mhist/MFillH.cc

@@ -501 +501 @@
 
     //
-    // Check whether fDisplay has previously been used (fCanvas)
-    // and fDisplay is still open.
-    //
-    if (fCanvas && fDisplay)
+    // Check whether fDisplay has previously been used (fCanvas),
+    // fDisplay is still open and the corresponding Canvas/Tab is
+    // still existing.
+    //
+    if (fDisplay && fDisplay->HasCanvas(fCanvas))
     {
         fCanvas->cd();

trunk/MagicSoft/Mars/mhist/MHCerPhotEvt.cc

@@ -127 +127 @@
     const UInt_t n = evt->GetNumPixels();
 
-    for (UInt_t i=0; i<n; i++)
+    for (UInt_t idx=0; idx<n; idx++)
     {
-        const MCerPhotPix &pix = (*evt)[i];
+        Float_t val;
+        if (!evt->GetPixelContent(val, idx))
+            continue;
 
-        const Int_t id = pix.GetPixId();
-
-        fSum[id].SetPixelUsed();
-        fSum[id].AddNumPhotons(pix.GetNumPhotons());
+        fSum[idx].SetPixelUsed();
+        fSum[idx].AddNumPhotons(val);
     }
 
@@ -148 +148 @@
 Bool_t MHCerPhotEvt::Finalize()
 {
-    fSum.Scale(fEntries);
+    if (fEntries<1)
+        *fLog << warn << "WARNING - " << GetDescriptor() << " doesn't contain entries." << endl;
+    else
+        fSum.Scale(fEntries);
     return kTRUE;
 }
@@ -185 +188 @@
         fDispl = new MCamDisplay(fCam);
 
-    fDispl->FillPhotNum(fSum);
+    fDispl->Fill(fSum);
     fDispl->Paint();
 }

trunk/MagicSoft/Mars/mhist/MHCurrents.cc

@@ -36 +36 @@
 
 #include "MParList.h"
+#include "MBinning.h"
 #include "MCurrents.h"
 #include "MCamDisplay.h"
@@ -54 +55 @@
     // FIXME: Implement a clear function with setmem
     for (int i=0; i<577; i++)
+    {
         fSum[i] = 0;
+        fRms[i] = 0;
+    }
 
     fEntries = 0;
@@ -65 +69 @@
 //
 MHCurrents::MHCurrents(const char *name, const char *title)
-    : fSum(577), fCam(NULL), fEvt(NULL), fDispl(NULL)
+    : fSum(577), fRms(577), fCam(NULL), fEvt(NULL), fDispl(NULL)
 {
     //
@@ -74 +78 @@
 
     Clear();
+
+    fHist.SetName("currents");
+    fHist.SetTitle("Avg.Currents [nA]");
+    fHist.SetDirectory(NULL);
+    fHist.Sumw2();
 }
 
@@ -105 +114 @@
     Clear();
 
+    MBinning bins;
+    bins.SetEdges(577, -0.5, 576.5);
+    bins.Apply(fHist);
+
     return kTRUE;
 }
@@ -121 +134 @@
     }
 
+    for (UInt_t idx=0; idx<577; idx++)
+    {
+        Float_t val;
+        if (!evt->GetPixelContent(val, idx))
+            continue;
+
+        fSum[idx] += val;
+        fRms[idx] += val*val;
+    }
+
+    fEntries++;
+
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// Scale the sum container with the number of entries
+//
+Bool_t MHCurrents::Finalize()
+{
+    if (fEntries<2)
+    {
+        *fLog << warn << "WARNING - " << GetDescriptor() << " doesn't contain enough entries." << endl;
+        return kTRUE;
+    }
+
     for (UInt_t i=0; i<577; i++)
-        fSum[i] += (*evt)[i];
-
-    fEntries++;
-
+    {
+        // calc sdev^2 for pixel index i
+        // var^2 = (sum[xi^2] - sum[xi]^2/n) / (n-1);
+        fRms[i] -= fSum[i]*fSum[i]/fEntries;
+        fRms[i] /= fEntries-1;
+        fRms[i]  = TMath::Sqrt(fRms[i]);
+
+        // calc mean value for pixel index i
+        fSum[i] /= fEntries;
+
+        fHist.SetBinContent(i+1, fSum[i]);
+        fHist.SetBinError(  i+1, fRms[i]);
+    }
     return kTRUE;
 }
@@ -131 +180 @@
 // --------------------------------------------------------------------------
 //
-// Scale the sum container with the number of entries
-//
-Bool_t MHCurrents::Finalize()
-{
-    for (UInt_t i=0; i<577; i++)
-        fSum[i] /= fEntries;
-
-    return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
 // Draw the present 'fill status'
 //
-void MHCurrents::Draw(Option_t *)
+void MHCurrents::Draw(Option_t *o)
 {
     if (!fCam)
@@ -156 +193 @@
     pad->SetBorderMode(0);
 
+    SetDrawOption(o);
     AppendPad("");
 }
@@ -174 +212 @@
         fDispl = new MCamDisplay(fCam);
 
-    fDispl->FillCurrents(fSum);
+    TString opt(GetDrawOption());
+
+    fDispl->Fill(opt.Contains("rms", TString::kIgnoreCase) ? fRms : fSum);
     fDispl->Paint();
 }

trunk/MagicSoft/Mars/mhist/MHCurrents.h

@@ -6 +6 @@
 #endif
 
-#ifndef MARS_MCurrents
-#include "MCurrents.h"
+#ifndef ROOT_TH1
+#include <TH1.h>
 #endif
 
-class TH1D;
+#ifndef ROOT_TArrayF
+#include <TArrayF.h>
+#endif
+
+class MCurrents;
 class MGeomCam;
 class MCamDisplay;
@@ -17 +21 @@
 {
 private:
-    MCurrents    fSum;      // storing the sum
+    TArrayF      fSum;      // storing the sum
+    TArrayF      fRms;      // storing the rms
     Int_t        fEntries;  // number of entries in the histogram
     MGeomCam    *fCam;      // the present geometry
     MCurrents   *fEvt;      //! the current event
     MCamDisplay *fDispl;    //! the camera display
+
+    TH1F         fHist;
 
 public:
@@ -35 +42 @@
     TH1 *GetHistByName(const TString name) { return NULL; }
 
-    const MCurrents &GetSum() const { return fSum; }
+    const TArrayF &GetSum() const { return fSum; }
+    const TArrayF &GetRms() const { return fRms; }
+
+    const TH1F    &GetHist() const { return fHist; }
 
     void Draw(Option_t *opt="");