Changeset 12880

Timestamp:

02/09/12 11:04:57 (13 years ago)

Author:

tbretz

Message:

Removed some old workarounds hopefully not necessary anymor with newer root version -- tested with 5.32.00 so far.

Location:

trunk/Mars/mhvstime

Files:

• MHPixVsTime.cc (modified) (4 diffs)
• MHPixVsTime.h (modified) (1 diff)
• MHSectorVsTime.cc (modified) (3 diffs)
• MHSectorVsTime.h (modified) (1 diff)
• MHVsTime.cc (modified) (6 diffs)
• MHVsTime.h (modified) (1 diff)

trunk/Mars/mhvstime/MHPixVsTime.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz, 12/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
-!
-!   Copyright: MAGIC Software Development, 2000-2004
+!   Author(s): Thomas Bretz, 12/2002 <mailto:thomas.bretz@epfl.ch>
+!
+!   Copyright: MAGIC Software Development, 2000-2012
 !
 !
@@ -214 +214 @@
 void MHPixVsTime::Draw(Option_t *opt)
 {
-
-    if (fGraph->GetN()==0)
-        return;
-
     TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(this);
     pad->SetBorderMode(0);
+    pad->SetGrid();
 
     AppendPad("");
-
-    TString str(opt);
 
     // This is not done automatically anymore since root 5.12/00
     // and it is necessary to force a proper update of the axis.
     TH1 *h = fGraph->GetHistogram();
-    if (h)
-    {
-        delete h;
-        fGraph->SetHistogram(0);
-        h = fGraph->GetHistogram();
-    }
 
     h->SetXTitle("Time");
+
     if (!fNameTime.IsNull())
     {
@@ -244 +234 @@
     }
 
-
+    TString str(opt);
     if (!str.Contains("A"))
         str += "A";
@@ -257 +247 @@
 
     fGraph->Draw(str);
-
-    pad->Modified();
-    pad->Update();
-}
+}

trunk/Mars/mhvstime/MHPixVsTime.h

@@ -61 +61 @@
 
 #endif
-
-
-

trunk/Mars/mhvstime/MHSectorVsTime.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz, 3/2004 <mailto:tbretz@astro.uni-wuerzburg.de>
-!
-!   Copyright: MAGIC Software Development, 2000-2006
+!   Author(s): Thomas Bretz, 3/2004 <mailto:thomas.bretz@epfl.ch>
+!
+!   Copyright: MAGIC Software Development, 2000-2012
 !
 !
@@ -282 +282 @@
 }
 
-void MHSectorVsTime::Paint(Option_t *opt)
-{
-    if (!fGraph)
-        return;
-
-    if (fGraph->GetN()==0)
-        return;
+// --------------------------------------------------------------------------
+//
+// This displays the TGraph like you expect it to be (eg. time on the axis)
+// It should also make sure, that the displayed time always is UTC and
+// not local time...
+//
+void MHSectorVsTime::Draw(Option_t *opt)
+{
+    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(fGraph);
+    pad->SetBorderMode(0);
+    pad->SetGrid();
+
+    AppendPad("");
+
+    // This is not done automatically anymore since root 5.12/00
+    // and it is necessary to force a proper update of the axis.
+    TH1 *h = fGraph->GetHistogram();
+
+    h->SetXTitle("Time");
+
+    if (!fNameTime.IsNull())
+    {
+        TAxis *axe = h->GetXaxis();
+        axe->SetTimeFormat("%H:%M %F1995-01-01 00:00:00 GMT");
+        axe->SetTimeDisplay(1);
+        axe->SetLabelSize(0.033);
+        h->GetYaxis()->SetTitleOffset(1.15);
+    }
+
+    // If this is set to early the plot remains empty in root 5.12/00
+    if (fMinimum!=-1111)
+        fGraph->SetMinimum(fMinimum);
+    if (fMaximum!=-1111)
+        fGraph->SetMaximum(fMaximum);
 
     TString str(opt);
@@ -301 +328 @@
     }
 
-    // This is not done automatically anymore since root 5.12/00
-    // and it is necessary to force a proper update of the axis.
-    TH1 *h = fGraph->GetHistogram();
-    if (h)
-    {
-        delete h;
-        fGraph->SetHistogram(0);
-        h = fGraph->GetHistogram();
-    }
-
-    h->SetXTitle("Time");
-
-    if (!fNameTime.IsNull())
-    {
-        TAxis *axe = h->GetXaxis();
-        axe->SetTimeFormat("%H:%M %F1995-01-01 00:00:00 GMT");
-        axe->SetTimeDisplay(1);
-        axe->SetLabelSize(0.033);
-        h->GetYaxis()->SetTitleOffset(1.15);
-    }
-
-    // If this is set to early the plot remains empty in root 5.12/00
-    if (fMinimum!=-1111)
-        fGraph->SetMinimum(fMinimum);
-    if (fMaximum!=-1111)
-        fGraph->SetMaximum(fMaximum);
-
-    // This is a workaround if the TGraph has only one point.
-    // Otherwise MStatusDisplay::Update hangs.
-    gPad->GetListOfPrimitives()->Remove(fGraph);
-    fGraph->Draw(fGraph->GetN()<2 ? "A" : str.Data());
-}
-
-// --------------------------------------------------------------------------
-//
-// This displays the TGraph like you expect it to be (eg. time on the axis)
-// It should also make sure, that the displayed time always is UTC and
-// not local time...
-//
-void MHSectorVsTime::Draw(Option_t *opt)
-{
-    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(fGraph);
-    pad->SetBorderMode(0);
-    pad->SetGridx();
-    pad->SetGridy();
-    AppendPad(opt);
+    fGraph->Draw(str.Data());
 }
 

trunk/Mars/mhvstime/MHSectorVsTime.h

@@ -85 +85 @@
 
     void Draw(Option_t *o=NULL);
-    void Paint(Option_t *o=NULL);
 
     void RecursiveRemove(TObject *obj);

trunk/Mars/mhvstime/MHVsTime.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz, 11/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
-!
-!   Copyright: MAGIC Software Development, 2000-2007
+!   Author(s): Thomas Bretz, 11/2003 <mailto:thomas.bretz@epfl.ch>
+!
+!   Copyright: MAGIC Software Development, 2000-2012
 !
 !
@@ -112 +112 @@
 
     fGraph = error ? new TGraphErrors : new TGraph;
-    fGraph->SetPoint(0, 0, 0); // Dummy point!
-    fGraph->SetEditable();     // Used as flag: First point? yes/no
     fGraph->SetMarkerStyle(kFullDotMedium);
 }
@@ -161 +159 @@
     if (fError && !fError->PreProcess(plist))
         return kFALSE;
-
-    fGraph->Set(1);
-    fGraph->SetPoint(0, 0, 0); // Dummy point!
-    fGraph->SetEditable();     // Used as flag: First point? yes/no
 
     TString title(fData ? GetRule() : (TString)"Graph");
@@ -245 +239 @@
     if (fN==fNumEvents)
     {
+        /*
         if ((fMaxPts>0 && fGraph->GetN()>fMaxPts) || fGraph->IsEditable())
         {
             fGraph->RemovePoint(0);
             fGraph->SetEditable(kFALSE);
-        }
+        }*/
 
         const Double_t val = fMean/fN*fScale;
@@ -284 +279 @@
 }
 
-void MHVsTime::Paint(Option_t *opt)
-{
-    if (!fGraph)
-        return;
-
-    if (fGraph->GetN()==0)
-        return;
-
-    TString str(opt);
-    if (!str.Contains("A"))
-        str += "A";
-    if (!str.Contains("P"))
-        str += "P";
-    if (str.Contains("same", TString::kIgnoreCase))
-    {
-        str.ReplaceAll("same", "");
-        str.ReplaceAll("A", "");
-    }
+// --------------------------------------------------------------------------
+//
+// This displays the TGraph like you expect it to be (eg. time on the axis)
+// It should also make sure, that the displayed time always is UTC and
+// not local time...
+//
+void MHVsTime::Draw(Option_t *opt)
+{
+    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(fGraph);
+    pad->SetBorderMode(0);
+    pad->SetGrid();
+
+    AppendPad("");
 
     // This is not done automatically anymore since root 5.12/00
     // and it is necessary to force a proper update of the axis.
     TH1 *h = fGraph->GetHistogram();
-    if (h)
-    {
-        delete h;
-        fGraph->SetHistogram(0);
-        h = fGraph->GetHistogram();
-    }
+
     if (h)
     {
@@ -336 +321 @@
         fGraph->SetMaximum(fMaximum);
 
-
-    // This is a workaround if the TGraph has only one point.
-    // Otherwise MStatusDisplay::Update hangs.
-    gPad->GetListOfPrimitives()->Remove(fGraph);
-    fGraph->Draw(fGraph->GetN()<2 ? "A" : str.Data());
-}
-
-// --------------------------------------------------------------------------
-//
-// This displays the TGraph like you expect it to be (eg. time on the axis)
-// It should also make sure, that the displayed time always is UTC and
-// not local time...
-//
-void MHVsTime::Draw(Option_t *opt)
-{
-    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(fGraph);
-    pad->SetBorderMode(0);
-    AppendPad(opt);
+    TString str(opt);
+    if (!str.Contains("A"))
+        str += "A";
+    if (!str.Contains("P"))
+        str += "P";
+    if (str.Contains("same", TString::kIgnoreCase))
+    {
+        str.ReplaceAll("same", "");
+        str.ReplaceAll("A", "");
+    }
+
+    fGraph->Draw(str.Data());
 }
 

trunk/Mars/mhvstime/MHVsTime.h

@@ -82 +82 @@
 
     void Draw(Option_t *opt=NULL);
-    void Paint(Option_t *opt=NULL);
 
     MParContainer *New() const;