Changeset 8291 for trunk/MagicSoft/Mars

Timestamp:

02/03/07 12:49:36 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHCamEvent.cc (modified) (5 diffs)
• MHCamEvent.h (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), fErrorSpread(kTRUE), fThreshold(0), fUseThreshold(0)
+: fSum(NULL), fEvt(NULL), fType(0), fErrorSpread(kTRUE), fErrorRelative(kFALSE),
+fThreshold(0), fUseThreshold(0)
 {
     Init(name, title);
@@ -100 +101 @@
 //
 MHCamEvent::MHCamEvent(Int_t type, const char *name, const char *title)
-    : fSum(NULL), fEvt(NULL), fType(type), fErrorSpread(kTRUE), fThreshold(0), fUseThreshold(0)
+: fSum(NULL), fEvt(NULL), fType(type), fErrorSpread(kTRUE), fErrorRelative(kFALSE),
+fThreshold(0), fUseThreshold(0)
 {
     Init(name, title);
@@ -159 +161 @@
         fSum->SetBit(MHCamera::kErrorMean);
 
-    fSum->SetXTitle("Pixel Idx");
-
     return kTRUE;
 }
@@ -250 +250 @@
     MHCamera *cam = (MHCamera*)gPad->FindObject(Form("%s;err", fName.Data()));
     if (cam)
-        cam->SetCamContent(*fSum, 1);
+        cam->SetCamContent(*fSum, fErrorRelative ? 1 : 2);
 }
 
@@ -294 +294 @@
     p->cd();
 
+    TString e = "Sqrt(Variance)";
+    if (fSum->TestBit(MHCamera::kErrorMean))
+        e += "/Sqrt(n_{i})";
+    if (fErrorRelative)
+        e += "/v_{i}";
+
     MHCamera *cam = new MHCamera(*fSum->GetGeometry());
     cam->SetName(Form("%s;err", fName.Data()));
-    cam->SetTitle(fErrorSpread?"Sqrt(Variance)":"Sqrt(Variance)/Sqrt(n_{i})");
+    cam->SetTitle(e);
     cam->SetYTitle(fSum->GetYaxis()->GetTitle());
-    cam->SetCamContent(*fSum, 1);
+    cam->SetCamContent(*fSum, fErrorRelative ? 1 : 2);
     cam->SetBit(kCanDelete);
     cam->Draw();

trunk/MagicSoft/Mars/mhist/MHCamEvent.h

@@ -24 +24 @@
     Int_t fType;           // Type to used for calling GetPixelContent
     Bool_t fErrorSpread;   // kFALSE==mean, kTRUE==spread
+    Bool_t fErrorRelative; // Display relative error?
 
     Float_t fThreshold;    // Count pixel above/below this threshold
@@ -45 +46 @@
 
     void SetHist(const MHCamera &cam);
+    MHCamera *GetHist() { return fSum; }
+    const MHCamera *GetHist() const { return fSum; }
 
     TH1 *GetHistByName(const TString name="") const;
 
     void Paint(Option_t *o="");
-    void Draw(Option_t *o="");
+    void Draw(Option_t *o="");  //*MENU*
 
     void PrintOutliers(Float_t s) const;
@@ -55 +58 @@
     void SetThreshold(Float_t f=0, Char_t direction=kIsLowerBound) { fThreshold = f; fUseThreshold=direction; }
     void SetErrorSpread(Bool_t b=kTRUE) { fErrorSpread = b; }
+    void SetErrorRelative(Bool_t b=kTRUE) { fErrorRelative = b; }
 
     ClassDef(MHCamEvent, 2) // Histogram to sum camera events