Changeset 7971 for trunk

Timestamp:

09/26/06 11:45:32 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MMath.h (modified) (1 diff)
• mhist/MHRate.cc (modified) (2 diffs)
• mhist/MHWeather.cc (modified) (1 diff)
• mhvstime/MHPixVsTime.cc (modified) (1 diff)
• mhvstime/MHSectorVsTime.cc (modified) (1 diff)
• mhvstime/MHVsTime.cc (modified) (4 diffs)
• mpointing/MHPointing.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2006/09/26 Thomas Bretz
+
+   * mbase/MMath.h:
+     - added new function ModF
+
+   * mhist/MHRate.cc, mhist/MHWeather.cc, mhvstime/MHPixVsTime.cc,
+     mhvstime/MHSectorVsTime.cc, mhvstime/MHVsTime.cc,
+     mpointing/MHPointing.cc:
+     - made the update of the axis ranges work again
+
+
+
  2006/09/26 Daniela Dorner
 

trunk/MagicSoft/Mars/mbase/MMath.h

@@ -52 +52 @@
     TArrayD LeastSqFitPowerLaw(Int_t n, Double_t *x, Double_t *y);
 
+    inline Int_t ModF(Double_t dbl, Double_t &frac) { Double_t rc; frac = modf(dbl, &rc); return TMath::Nint(rc); }
+
     inline Double_t Sgn(Double_t d) { return d<0 ? -1 : 1; }
 }

trunk/MagicSoft/Mars/mhist/MHRate.cc

@@ -182 +182 @@
 void MHRate::DrawGraph(TGraph &g, const char *y) const
 {
+    // If this is set to early the plot remains empty in root 5.12/00
+    if (g.GetN()>0)
+        g.SetMinimum(0);
+
+    // 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 = g.GetHistogram();
     if (h)
     {
+        delete h;
+        g.SetHistogram(0);
+        h = g.GetHistogram();
+    }
+
+    if (h)
+    {
+        cout << "Y";
         TAxis *axe = h->GetXaxis();
         axe->SetLabelSize(0.033);
@@ -287 +301 @@
 void MHRate::Paint(Option_t *o)
 {
-    // If this is set to early the plot remains empty in root 5.12/00
-    if (fRateTime.GetN()>0)
-        fRateTime.SetMinimum(0);
-
     DrawGraph(fRateTime, "f [Hz]");
     /*

trunk/MagicSoft/Mars/mhist/MHWeather.cc

@@ -160 +160 @@
     if (h)
     {
+        delete h;
+        g.SetHistogram(0);
+        h = g.GetHistogram();
+    }
+    if (h)
+    {
         TAxis *axe = h->GetXaxis();
         axe->SetLabelSize(0.033);

trunk/MagicSoft/Mars/mhvstime/MHPixVsTime.cc

@@ -224 +224 @@
     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");

trunk/MagicSoft/Mars/mhvstime/MHSectorVsTime.cc

@@ -291 +291 @@
     }
 
+    // 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");

trunk/MagicSoft/Mars/mhvstime/MHVsTime.cc

@@ -264 +264 @@
      while ((obj=Next())) *fLog << obj << " " << obj->GetName() << " " << obj->ClassName() << " " << Next.GetOption() << endl;
      */
-
     if (!fGraph)
         return;
@@ -284 +283 @@
     }
 
-    // SetPoint deletes the histogram!
-    if (fUseEventNumber)
-        fGraph->GetHistogram()->SetXTitle("Event Number");
-    else
-    {
-        fGraph->GetHistogram()->SetXTitle("Time");
-        fGraph->GetHistogram()->GetXaxis()->SetLabelSize(0.033);
-        fGraph->GetHistogram()->GetXaxis()->SetTimeFormat("%H:%M %F1995-01-01 00:00:00 GMT");
-        fGraph->GetHistogram()->GetXaxis()->SetTimeDisplay(1);
+    // 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)
+    {
+        TAxis *axe = h->GetXaxis();
+        // SetPoint deletes the histogram!
+        if (fUseEventNumber)
+            axe->SetTitle("Event Number");
+        else
+        {
+            axe->SetTitle("Time");
+            axe->SetLabelSize(0.033);
+            axe->SetTimeFormat("%H:%M %F1995-01-01 00:00:00 GMT");
+            axe->SetTimeDisplay(1);
+        }
     }
 
@@ -300 +312 @@
     // 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());
+//    gPad->GetListOfPrimitives()->Remove(fGraph);
+//    fGraph->Draw(fGraph->GetN()<2 ? "A" : str.Data());
     //gPad->GetListOfPrimitives()->Add(fGraph, fGraph->GetN()<2 ? "A" : opt);
     //    AppendPad(str);
@@ -319 +331 @@
     pad->SetBorderMode(0);
     AppendPad(opt);
+
+    fGraph->Draw("A");
 }
 

trunk/MagicSoft/Mars/mpointing/MHPointing.cc

@@ -214 +214 @@
 void MHPointing::DrawGraph(TGraph &g, const char *y) const
 {
+    // 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 = g.GetHistogram();
+    if (h)
+    {
+        delete h;
+        g.SetHistogram(0);
+        h = g.GetHistogram();
+    }
     if (h)
     {