Changeset 4891 for trunk/MagicSoft/Mars/mhbase

Timestamp:

09/09/04 10:51:39 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhbase

Files:

• MBinning.cc (modified) (1 diff)
• MBinning.h (modified) (2 diffs)
• MH3.cc (modified) (13 diffs)
• MH3.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhbase/MBinning.cc

@@ -44 +44 @@
 using namespace std;
 
-static const TString gsDefName  = "MBinning";
-static const TString gsDefTitle = "Container describing the binning of an axis";
+const TString MBinning::gsDefName  = "MBinning";
+const TString MBinning::gsDefTitle = "Container describing the binning of an axis";
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mhbase/MBinning.h

@@ -15 +15 @@
 class MBinning : public MParContainer
 {
+public:
+    static const TString gsDefName;
+    static const TString gsDefTitle;
+
 private:
+
     TArrayD fEdges;
 
@@ -80 +85 @@
     Bool_t IsUserArray() const { return fType==kIsUserArray; }
 
+    Bool_t HasTitle() const { return gsDefTitle!=fTitle; }
+
     void Apply(TH1 &) const;
 

trunk/MagicSoft/Mars/mhbase/MH3.cc

@@ -48 +48 @@
 // SetScaleY and SetScaleZ.
 //
+//
+// Axis titles
+// ===========
+//
+// 1) If no other title is given the rule for this axis is used.
+// 2) If the MBinning used for this axis has a non-default Title
+//    (MBinning::HasTitle) this title is used for the corresponding axis
+// 3) If the MH3 has a non-default title (MH3::SetTitle called)
+//    this title is set as the histogram title. It can be used to overwrite
+//    the axis titles. For more information see TH1::SetTitle, eg.
+//       SetTitle("MyHist;x[mm];y[cm];Counts");
+//
 // For example:
 //   MH3 myhist("MHillas.fLength");
@@ -83 +95 @@
 using namespace std;
 
-static const TString gsDefName  = "MH3";
-static const TString gsDefTitle = "Container for a %dD Mars Histogram";
+const TString MH3::gsDefName  = "MH3";
+const TString MH3::gsDefTitle = "Container for a n-D Mars Histogram";
 
 // --------------------------------------------------------------------------
@@ -113 +125 @@
 
     fName  = gsDefName;
-    fTitle = Form(gsDefTitle.Data(), fDimension);
+    fTitle = gsDefTitle;
 
     if (fHist)
@@ -141 +153 @@
 
     fName  = gsDefName;
-    fTitle = Form(gsDefTitle.Data(), 1);
+    fTitle = gsDefTitle;
 
     fHist->UseCurrentStyle();
@@ -168 +180 @@
 
     fName  = gsDefName;
-    fTitle = Form(gsDefTitle.Data(), 2);
+    fTitle = gsDefTitle;
 
     fHist->UseCurrentStyle();
@@ -195 +207 @@
 
     fName  = gsDefName;
-    fTitle = Form(gsDefTitle.Data(), 3);
+    fTitle = gsDefTitle;
 
     fHist->UseCurrentStyle();
@@ -266 +278 @@
             return kFALSE;
         }
+        if (fData[2] && !fData[2]->PreProcess(plist))
+            return kFALSE;
+        if (fData[2])
+            fHist->SetZTitle(fData[2]->GetTitle());
+        if (binsz->HasTitle())
+            fHist->SetZTitle(binsz->GetTitle());
         if (binsz->IsLogarithmic())
             fHist->SetBit(kIsLogz);
-        if (fData[2]) fHist->SetZTitle(fData[2]->GetTitle());
-        if (fData[2] && !fData[2]->PreProcess(plist))
-            return kFALSE;
     case 2:
         binsy = (MBinning*)plist->FindObject(bname+"Y", "MBinning");
@@ -278 +293 @@
             return kFALSE;
         }
+        if (fData[1] && !fData[1]->PreProcess(plist))
+            return kFALSE;
+        if (fData[1])
+            fHist->SetYTitle(fData[1]->GetTitle());
+        if (binsy->HasTitle())
+            fHist->SetYTitle(binsy->GetTitle());
         if (binsy->IsLogarithmic())
             fHist->SetBit(kIsLogy);
-        if (fData[1]) fHist->SetYTitle(fData[1]->GetTitle());
-        if (fData[1] && !fData[1]->PreProcess(plist))
-            return kFALSE;
     case 1:
         binsx = (MBinning*)plist->FindObject(bname+"X", "MBinning");
@@ -297 +315 @@
 
         }
+        if (fData[0] && !fData[0]->PreProcess(plist))
+            return kFALSE;
+        if (fData[0]!=NULL)
+            fHist->SetXTitle(fData[0]->GetTitle());
+        if (binsx->HasTitle())
+            fHist->SetXTitle(binsx->GetTitle());
         if (binsx->IsLogarithmic())
             fHist->SetBit(kIsLogx);
-
-      if (fData[0]!=NULL)  fHist->SetXTitle(fData[0]->GetTitle());
-        if (fData[0] && !fData[0]->PreProcess(plist))
-            return kFALSE;
     }
 
     fHist->SetName(fName);
+    fHist->SetDirectory(0);
+
+    if (fTitle!=gsDefTitle)
+    {
+        fHist->SetTitle(fTitle);
+        return kTRUE;
+    }
 
     TString title("Histogram for ");
@@ -325 +352 @@
         return kTRUE;
     }
-    cout << "Still alive...?" << endl;
-    return kTRUE;
+
+    *fLog << err << "ERROR - MH3 has " << fDimension << " dimensions!" << endl;
+    return kFALSE;
 }
 
@@ -335 +363 @@
 void MH3::SetName(const char *name)
 {
-    fHist->SetName(name);
+    if (fHist)
+    {
+        fHist->SetName(name);
+        fHist->SetDirectory(0);
+    }
     MParContainer::SetName(name);
 }
@@ -345 +377 @@
 void MH3::SetTitle(const char *title)
 {
-    fHist->SetTitle(title);
+    if (fHist)
+        fHist->SetTitle(title);
     MParContainer::SetTitle(title);
 }
@@ -644 +677 @@
         out << "   " << name << ".SetName(\"" << fName << "\");" << endl;
 
-    if (fTitle!=Form(gsDefTitle.Data(), fDimension))
+    if (fTitle!=gsDefTitle)
         out << "   " << name << ".SetTitle(\"" << fTitle << "\");" << endl;
 

trunk/MagicSoft/Mars/mhbase/MH3.h

@@ -15 +15 @@
 class MH3 : public MH
 {
+private:
+    static const TString gsDefName;
+    static const TString gsDefTitle;
+
 protected:
     // Could be const but root < 3.02/06 doesn't like this...