Changeset 2550 for trunk/MagicSoft/Mars/mhist

Timestamp:

11/21/03 17:01:15 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHCamEvent.cc (modified) (7 diffs)
• MHCamEvent.h (modified) (1 diff)
• MHCamera.cc (modified) (1 diff)
• MHTriggerLvl0.cc (modified) (2 diffs)
• MHTriggerLvl0.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhist/MHCamEvent.cc

@@ -54 +54 @@
 //
 MHCamEvent::MHCamEvent(const char *name, const char *title)
-    : fSum(NULL), fEvt(NULL), fType(0)
+    : fSum(NULL), fRms(NULL), fEvt(NULL), fType(0)
 {
     //
@@ -71 +71 @@
     if (fSum)
         delete fSum;
+    if (fRms)
+        delete fRms;
 }
 
@@ -99 +101 @@
     if (fSum)
         delete (fSum);
+    if (fRms)
+        delete (fRms);
 
     const TString name = fNameEvt.IsNull() ? fName : fNameEvt;
@@ -105 +109 @@
     fSum->SetYTitle("a.u.");
     fSum->SetBit(MHCamera::kProfile);
+
+    fRms = new MHCamera(*cam, name+";rms", fTitle);
+    fRms->SetYTitle("a.u.");
     return kTRUE;
 }
@@ -131 +138 @@
 Bool_t MHCamEvent::Finalize()
 {
-    fSum->ResetBit(MHCamera::kProfile);
-    if (fSum->GetEntries()>0)
-        fSum->Scale(1./fSum->GetEntries());
+    fRms->AddCamContent(*fSum, 1);
     return kTRUE;
 }
 
+// --------------------------------------------------------------------------
+//
+// Take the mean of the sum histogram and print all pixel indices
+// which are above sum+s*rms
+//
 void MHCamEvent::PrintOutliers(Float_t s) const
 {
@@ -156 +166 @@
 // --------------------------------------------------------------------------
 //
-// Return fSum.
+// Return fSum for "sum" and fRms for "rms"
 //
 TH1 *MHCamEvent::GetHistByName(const TString name)
 {
-    return fSum;
+//    name.ToLower();
+
+    if (name=="sum")
+        return fSum;
+    if (name=="rms")
+        return fRms;
+
+    return NULL;
 }
 
@@ -171 +188 @@
 
     pad->cd(1);
+    gPad->SetBorderMode(0);
+    fSum->Draw("EPhist");
+
+    pad->cd(2);
+    gPad->SetBorderMode(0);
+    gPad->Divide(2, 1);
+    pad = gPad;
+
+    pad->cd(1);
+    gPad->SetBorderMode(0);
     fSum->Draw();
 
     pad->cd(2);
     gPad->SetBorderMode(0);
-    fSum->Draw("EPhist");
-}
+    fRms->Draw();
+}

trunk/MagicSoft/Mars/mhist/MHCamEvent.h

@@ -13 +13 @@
 private:
     MHCamera  *fSum; // storing the sum
+    MHCamera  *fRms; // storing the rms
     MCamEvent *fEvt; //! the current event
 

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -1131 +1131 @@
     cout << "Software Pixel Index: " << idx << endl;
     cout << "Hardware Pixel Id:    " << idx+1 << endl;
-    cout << "Contents:             " << GetBinContent(idx+1) << "  <";
-    cout << (IsUsed(idx)?"on":"off");
-    cout << ">" << endl;
+    cout << "Contents:             " << GetBinContent(idx+1);
+    if (GetBinError(idx+1)>0)
+        cout << " +/- " << GetBinError(idx+1);
+    cout << "  <" << (IsUsed(idx)?"on":"off") << ">" << endl;
 
     if (fNotify && fNotify->GetSize()>0)

trunk/MagicSoft/Mars/mhist/MHTriggerLvl0.cc

@@ -111 +111 @@
 
     fSum = new MHCamera(*cam, name+";avg", fTitle);
-    fSum->SetYTitle("%");
+    fSum->SetBit(MHCamera::kProfile);
+    fSum->SetYTitle("% [1]");
 
     return kTRUE;
@@ -140 +141 @@
 Bool_t MHTriggerLvl0::Finalize()
 {
-    if (fSum->GetEntries()>0)
-        fSum->Scale(100./fSum->GetEntries());
+    //    if (fSum->GetEntries()>0)
+    //        fSum->Scale(100);
     return kTRUE;
 }
 
-void MHTriggerLvl0::PrintOutlayers(Float_t s) const
+void MHTriggerLvl0::PrintOutliers(Float_t s) const
 {
     const Double_t mean = fSum->GetMean();

trunk/MagicSoft/Mars/mhist/MHTriggerLvl0.h

@@ -36 +36 @@
     void Draw(Option_t * ="");
 
-    void PrintOutlayers(Float_t s) const;
+    void PrintOutliers(Float_t s) const;
 
     ClassDef(MHTriggerLvl0, 1) // Histogram to count how often a pixel is above threshold