Changeset 9829 for trunk/Mars

Timestamp:

08/11/10 11:56:20 (14 years ago)

Author:

tbretz

Message:

Added a possibility to change thetype of error used in a TProfile in
MH3.

Location:

trunk/Mars

Files:

• Changelog (modified) (1 diff)
• mhbase/MH3.cc (modified) (11 diffs)
• mhbase/MH3.h (modified) (4 diffs)

trunk/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2010/08/11 Thomas Bretz
+
+   * mhbase/MH3.[h,cc]:
+     - added another type to be able to setup a standard profile and
+       one which display the spread as error
+     - improved/fixed error calculation/display
+
+
+
  2010/08/10 Thomas Bretz
 

trunk/Mars/mhbase/MH3.cc

@@ -231 +231 @@
         break;
     case kProfile:
+    case kProfileSpread:
         fDimension = -TMath::Abs(fDimension);
         if (fDimension<-2)
@@ -246 +247 @@
         fHist = new TProfile;
         fHist->SetYTitle("Average");
-        static_cast<TProfile*>(fHist)->SetErrorOption("s");
+        if (type==kProfileSpread)
+            static_cast<TProfile*>(fHist)->SetErrorOption("s");
         break;
     case 2:
@@ -255 +257 @@
         fHist = new TProfile2D;
         fHist->SetZTitle("Average");
-        static_cast<TProfile2D*>(fHist)->SetErrorOption("s");
+        if (type==kProfileSpread)
+            static_cast<TProfile2D*>(fHist)->SetErrorOption("s");
         break;
     case 3:
@@ -330 +333 @@
 //
 MH3::MH3(const char *memberx, const char *membery, Type_t type)
-    : fDimension(type&kProfile?-1:2)
+    : fDimension(type==kHistogram?2:-1)
 {
 
@@ -340 +343 @@
     case -1:
         fHist = static_cast<TH1*>(new TProfile);
-        static_cast<TProfile*>(fHist)->SetErrorOption("s");
+        if (type==kProfileSpread)
+            static_cast<TProfile*>(fHist)->SetErrorOption("s");
 
         break;
@@ -363 +367 @@
     : fDimension(type==kHistogram?3:-2)
 {
-    if (type&kProfile)
-    {
+    switch (fDimension)
+    {
+    case 3:
+        fHist = static_cast<TH1*>(new TH3D);
+        break;
+    case -2:
         fHist = static_cast<TH1*>(new TProfile2D);
-        static_cast<TProfile2D*>(fHist)->SetErrorOption("s");
-    }
-    else
-        fHist = static_cast<TH1*>(new TH3D);
-
+        if (type==kProfileSpread)
+            static_cast<TProfile2D*>(fHist)->SetErrorOption("s");
+    }
 
     fData[0] = new MDataPhrase(memberx);
@@ -902 +908 @@
 // store the result in h.
 //
+// In the case of a TProfile we keep it a TProfile to keep the mean and
+// rms in y displayed. To get the error correctly we have to reverse
+// the calculation done in TProfile::GetBinError of course.
+//
 void MH3::Convert(TH1 &h) const
 {
+    const Bool_t prof = h.InheritsFrom(TProfile::Class()) || h.InheritsFrom(TProfile2D::Class());
+
     for (Int_t z=0; z<=h.GetNbinsZ()+1; z++)
         for (Int_t y=0; y<=h.GetNbinsY()+1; y++)
@@ -909 +921 @@
             {
                 h.SetBinContent(x, y, z, fConversion->Eval(fHist->GetBinContent(x, y, z)));
-                h.SetBinError(  x, y, z, fConversion->Eval(fHist->GetBinError(  x, y, z)));
+
+                if (prof)
+                    h.SetBinError(x, y, z, TMath::Hypot(fConversion->Eval(fHist->GetBinContent(x, y, z)),
+                                                        fConversion->Eval(fHist->GetBinError(  x, y, z))));
+                else
+                    h.SetBinError(x, y, z, fConversion->Eval(fHist->GetBinError(x, y, z)));
             }
 
-    if (h.InheritsFrom(TProfile::Class()))
-        for (Int_t x=0; x<=h.GetNbinsX()+1; x++)
-            static_cast<TProfile&>(h).SetBinEntries(x, 1);
-
-    if (h.InheritsFrom(TProfile2D::Class()))
-        for (Int_t x=0; x<=h.GetNbinsX()+1; x++)
-            static_cast<TProfile2D&>(h).SetBinEntries(x, 1);
+    TProfile *p1 = dynamic_cast<TProfile*>(fHist);
+    if (p1)
+        for (Int_t i=0; i<p1->GetSize(); i++)
+            static_cast<TProfile&>(h).SetBinEntries(i, p1->GetBinEntries(i)>0 ? 1 : 0);
+
+    TProfile *p2 = dynamic_cast<TProfile*>(fHist);
+    if (p2)
+        for (Int_t i=0; i<p2->GetSize(); i++)
+            static_cast<TProfile2D&>(h).SetBinEntries(i, p2->GetBinEntries(i)>0 ? 1 : 0);
 }
 
@@ -1054 +1073 @@
     {
         h = static_cast<TH1*>(fHist->Clone());
+
         h->SetDirectory(0);
         h->SetBit(kCanDelete);
@@ -1147 +1167 @@
 }
 
+MH3::Type_t MH3::GetType() const
+{
+    switch (fDimension)
+    {
+    case -1:
+        return TString(static_cast<TProfile*>(fHist)->GetErrorOption())=="s" ? kProfileSpread : kProfile;
+    case -2:
+        return TString(static_cast<TProfile2D*>(fHist)->GetErrorOption())=="s" ? kProfileSpread : kProfile;
+    }
+    return kHistogram;
+}
+
 // --------------------------------------------------------------------------
 //
@@ -1167 +1199 @@
             break;
         case 2:
-            h=new MH3(fData[0]->GetRule(), fData[1]->GetRule());
-            break;
         case -1:
-            h=new MH3(fData[0]->GetRule(), fData[1]->GetRule(), MH3::kProfile);
+            h=new MH3(fData[0]->GetRule(), fData[1]->GetRule(), GetType());
             break;
         case 3:
-            h=new MH3(fData[0]->GetRule(), fData[1]->GetRule(), fData[2]->GetRule());
-            break;
         case -2:
-            h=new MH3(fData[0]->GetRule(), fData[1]->GetRule(), fData[2]->GetRule(), MH3::kProfile);
+            h=new MH3(fData[0]->GetRule(), fData[1]->GetRule(), fData[2]->GetRule(), GetType());
             break;
         }

trunk/Mars/mhbase/MH3.h

@@ -31 +31 @@
     };
 
+    enum Type_t {
+        kHistogram     = 0,
+        kProfile       = 1,
+        kProfileSpread = kProfile | 2,
+    };
+
 private:
     static const TString gsDefName;
@@ -44 +50 @@
     Labels_t    GetLabels() const;
     const char *GetLabel(Int_t axe, Double_t val) const;
+
+    // Get type
+    Type_t GetType() const;
+
+    // Helper for conversion
+    void Convert(TH1 &h) const;
 
     MObjLookup fLabels[3];       //! Lookup table to conflate and name labels
@@ -59 +71 @@
 
     void HandleLogAxis(TAxis &axe) const;
-    void Convert(TH1 &h) const;
 
     void StreamPrimitive(ostream &out) const;
@@ -71 +82 @@
 
 public:
-    enum Type_t {
-        kHistogram,
-        kProfile,
-    };
-
     MH3(const Int_t dim=0, Type_t type=MH3::kHistogram);
     MH3(const TH1 &h1);