Changeset 2698

Timestamp:

12/17/03 17:40:35 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhist/MHCamera.cc (modified) (3 diffs)
• mhist/MHCamera.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -42 +42 @@
      - tried to make fUseOrigDistrib-stuff working again
 
+   * mhist/MHCamera.[h,cc]:
+     - implemented kVariance
 
 

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -33 +33 @@
 // To change the scale to a logarithmic scale SetLogy() of the Pad.
 //
+// Be carefull: Entries in this context means Entries/bin or Events
+//
 ////////////////////////////////////////////////////////////////////////////
 #include "MHCamera.h"
@@ -288 +290 @@
     sq  /= n;
 
-    return Profile(sqrt(sq-sum*sum));
+    return Profile(TMath::Sqrt(sq-sum*sum));
 }
 
@@ -758 +760 @@
 }
 
-
+Stat_t MHCamera::GetBinError(Int_t bin) const
+{
+    Double_t rc = 0;
+    if (TestBit(kVariance) && GetEntries()>0) // error on the mean
+    {
+        const Double_t error = fSumw2.fArray[bin]/GetEntries();
+        const Double_t val   = fArray[bin]/GetEntries();
+        rc = TMath::Sqrt(error - val*val);
+    }
+    else
+        rc = TH1D::GetBinError(bin);
+
+    return Profile(rc);
+}
 
 // ------------------------------------------------------------------------

trunk/MagicSoft/Mars/mhist/MHCamera.h

@@ -32 +32 @@
         kProfile  = BIT(18), // FIXME: When changing change max/min!
         kFreezed  = BIT(19),
-        kNoLegend = BIT(20)
+        kNoLegend = BIT(20),
+        kVariance = BIT(21)
     };
 private:
@@ -133 +134 @@
     Stat_t   GetBinContent(Int_t binx, Int_t biny) const { return GetBinContent(binx); }
     Stat_t   GetBinContent(Int_t binx, Int_t biny, Int_t binz) const { return GetBinContent(binx); }
-    Stat_t   GetBinError(Int_t bin) const { return Profile(TH1D::GetBinError(bin)); }
+    Stat_t   GetBinError(Int_t bin) const;
     Stat_t   GetBinError(Int_t binx, Int_t biny) const { return GetBinError(binx); }
     Stat_t   GetBinError(Int_t binx, Int_t biny, Int_t binz) const { return GetBinError(binx); }