Changeset 1265 for trunk/MagicSoft

Timestamp:

03/21/02 16:25:12 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhist/MH.cc (modified) (4 diffs)
• mhist/MHEffOnTimeTheta.cc (modified) (1 diff)
• mhist/MHEffOnTimeTime.cc (modified) (2 diffs)
• mhist/MHTimeDiffTime.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2002/03/21: Thomas Bretz
+
+   * mhists/MH.cc:
+     - TAxis::Set resets the axis title so I implemented a workaround
+       in SetBinning so that the axis title survives.
+
+   * mhists/MHEffOnTimeTheta.cc, MHEffOnTimeTime.cc:
+     - replaced Get*axis()->SetTitle() by Set*Title()
+     - corrected the Name in MakeDefCanvas
+
+
+
  2002/03/20: Thomas Bretz
 

trunk/MagicSoft/Mars/mhist/MH.cc

@@ -117 +117 @@
 {
     //
+    // Another strange behaviour: TAxis::Set deletes the axis title!
+    //
+    TAxis &x = *h->GetXaxis();
+
+    TString xtitle = x.GetTitle();
+
+    //
     // This is a necessary workaround if one wants to set
     // non-equidistant bins after the initialization
@@ -127 +134 @@
     // in one of the two given histograms
     //
-    h->GetXaxis()->Set(binsx->GetNumBins(), binsx->GetEdges());
+    x.Set(binsx->GetNumBins(), binsx->GetEdges());
+    x.SetTitle(xtitle);
 }
 
 void MH::SetBinning(TH1 *h, const MBinning *binsx, const MBinning *binsy)
 {
+    TAxis &x = *h->GetXaxis();
+    TAxis &y = *h->GetYaxis();
+
+    //
+    // Another strange behaviour: TAxis::Set deletes the axis title!
+    //
+    TString xtitle = x.GetTitle();
+    TString ytitle = y.GetTitle();
+
     //
     // This is a necessary workaround if one wants to set
@@ -144 +161 @@
     // in one of the two given histograms
     //
-    h->GetXaxis()->Set(binsx->GetNumBins(), binsx->GetEdges());
-    h->GetYaxis()->Set(binsy->GetNumBins(), binsy->GetEdges());
+    x.Set(binsx->GetNumBins(), binsx->GetEdges());
+    y.Set(binsy->GetNumBins(), binsy->GetEdges());
+    x.SetTitle(xtitle);
+    y.SetTitle(ytitle);
 }
 
 void MH::SetBinning(TH1 *h, const MBinning *binsx, const MBinning *binsy, const MBinning *binsz)
 {
+    //
+    // Another strange behaviour: TAxis::Set deletes the axis title!
+    //
+    TAxis &x = *h->GetXaxis();
+    TAxis &y = *h->GetYaxis();
+    TAxis &z = *h->GetZaxis();
+
+    TString xtitle = x.GetTitle();
+    TString ytitle = y.GetTitle();
+    TString ztitle = z.GetTitle();
+
     //
     // This is a necessary workaround if one wants to set
@@ -163 +193 @@
     // in one of the two given histograms
     //
-    h->GetXaxis()->Set(binsx->GetNumBins(), binsx->GetEdges());
-    h->GetYaxis()->Set(binsy->GetNumBins(), binsy->GetEdges());
-    h->GetZaxis()->Set(binsz->GetNumBins(), binsz->GetEdges());
+    x.Set(binsx->GetNumBins(), binsx->GetEdges());
+    y.Set(binsy->GetNumBins(), binsy->GetEdges());
+    z.Set(binsz->GetNumBins(), binsz->GetEdges());
+    x.SetTitle(xtitle);
+    y.SetTitle(ytitle);
+    z.SetTitle(ztitle);
 }
 

trunk/MagicSoft/Mars/mhist/MHEffOnTimeTheta.cc

@@ -67 +67 @@
     fHist.SetDirectory(NULL);
 
-    fHist.GetXaxis()->SetTitle("t_{eff} [s]");
-    fHist.GetYaxis()->SetTitle("\\Theta [\\circ]");
+    fHist.SetXTitle("t_{eff} [s]");
+    fHist.SetYTitle("\\Theta [\\circ]");
 }
 

trunk/MagicSoft/Mars/mhist/MHEffOnTimeTime.cc

@@ -68 +68 @@
     fHist.SetDirectory(NULL);
 
-    fHist.GetXaxis()->SetTitle("t_{eff} [s]");
-    fHist.GetYaxis()->SetTitle("t [s]");
+    fHist.SetXTitle("t_{eff} [s]");
+    fHist.SetYTitle("t [s]");
 }
 
 TObject *MHEffOnTimeTime::DrawClone(Option_t *opt) const
 {
-    TCanvas *c = MakeDefCanvas("EffOnTimeTheta", "t_eff vs. t");
+    TCanvas *c = MakeDefCanvas("EffOnTimeTime", "t_eff vs. t");
 
     gROOT->SetSelectedPad(NULL);
@@ -89 +89 @@
 {
     if (!gPad)
-        MakeDefCanvas("EffOnTimeTheta", "t_eff vs. t");
+        MakeDefCanvas("EffOnTimeTime", "t_eff vs. t");
 
     fHist.Draw(opt);

trunk/MagicSoft/Mars/mhist/MHTimeDiffTime.cc

@@ -90 +90 @@
 TObject *MHTimeDiffTime::DrawClone(Option_t *opt) const
 {
-    TCanvas *c = MakeDefCanvas("DiffTimeTime", "Distrib of \\Delta t, t");
+    TCanvas *c = MakeDefCanvas("DiffTimeTime", "Distrib of dt, t");
     c->Divide(2, 2);
 
@@ -123 +123 @@
 {
     if (!gPad)
-        MakeDefCanvas("DiffTimeTime", "Distrib of \\Delta t, t");
+        MakeDefCanvas("DiffTimeTime", "Distrib of dt, t");
 
     gPad->Divide(2,2);