Changeset 8279 for trunk/MagicSoft/Mars/mhist

Timestamp:

01/30/07 14:16:45 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHCamEvent.cc (modified) (4 diffs)
• MHCamEvent.h (modified) (2 diffs)
• MHCamera.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mhist/MHCamEvent.cc

@@ -90 +90 @@
 //
 MHCamEvent::MHCamEvent(const char *name, const char *title)
-    : fSum(NULL), fEvt(NULL), fType(0), fThreshold(0), fUseThreshold(0)
+    : fSum(NULL), fEvt(NULL), fType(0), fErrorSpread(kTRUE), fThreshold(0), fUseThreshold(0)
 {
     Init(name, title);
@@ -100 +100 @@
 //
 MHCamEvent::MHCamEvent(Int_t type, const char *name, const char *title)
-    : fSum(NULL), fEvt(NULL), fType(type), fThreshold(0), fUseThreshold(0)
+    : fSum(NULL), fEvt(NULL), fType(type), fErrorSpread(kTRUE), fThreshold(0), fUseThreshold(0)
 {
     Init(name, title);
@@ -156 +156 @@
         fSum->SetYTitle("a.u.");
     fSum->SetBit(MHCamera::kProfile);
+    if (!fErrorSpread)
+        fSum->SetBit(MHCamera::kErrorMean);
 
     fSum->SetXTitle("Pixel Idx");
@@ -282 +284 @@
     MHCamera *cam = new MHCamera(*fSum->GetGeometry());
     cam->SetName(Form("%s;err", fName.Data()));
-    cam->SetTitle("Sqrt(Variance)");
+    cam->SetTitle(fErrorSpread?"Sqrt(Variance)":"Sqrt(Variance)/Sqrt(n_{i})");
     cam->SetYTitle(fSum->GetYaxis()->GetTitle());
     cam->SetCamContent(*fSum, 1);

trunk/MagicSoft/Mars/mhist/MHCamEvent.h

@@ -23 +23 @@
 
     Int_t fType;           // Type to used for calling GetPixelContent
+    Bool_t fErrorSpread;   // kFALSE==mean, kTRUE==spread
 
     Float_t fThreshold;    // Count pixel above/below this threshold
@@ -51 +52 @@
 
     void SetThreshold(Float_t f=0, Char_t direction=kIsLowerBound) { fThreshold = f; fUseThreshold=direction; }
+    void SetErrorSpread(Bool_t b=kTRUE) { fErrorSpread = b; }
 
-    ClassDef(MHCamEvent, 1) // Histogram to sum camera events
+    ClassDef(MHCamEvent, 2) // Histogram to sum camera events
 };
 

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.95 2006-10-17 17:16:00 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.96 2007-01-30 14:16:45 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -1333 +1333 @@
 }
 
+// ------------------------------------------------------------------------
+//
+// In the case the kProfile flag is set the spread of the bin is returned.
+// If you want to have the mean error instead set the kErrorMean bit via
+//  SetBit(kErrorMean) first.
+//
 Stat_t MHCamera::GetBinError(Int_t bin) const
 {
@@ -1346 +1352 @@
     const Double_t val = fArray[bin]        / n;
 
-    return sqr>val*val ? TMath::Sqrt(sqr - val*val) / n : 0;
+    const Double_t spread = sqr>val*val ? TMath::Sqrt(sqr - val*val);
+
+    return TestBit(kErrorMean) ? spread/TMath::Sqrt(n) : spread;
 
     /*