Changeset 7533 for trunk/MagicSoft/Mars

Timestamp:

02/27/06 11:17:27 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• macros/optim/optimwobble.C (modified) (1 diff)
• mhflux/MHEffectiveOnTime.cc (modified) (4 diffs)
• mhflux/MHEffectiveOnTime.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -24 +24 @@
        standard Disp-parametrization
 
+   * mhflux/MHEffectiveOnTime.[h,cc]:
+     - added showing the axis range of the time evolution histogram
+
 
 

trunk/MagicSoft/Mars/NEWS

@@ -5 +5 @@
    - macros: fixed a typo optimwoble.C (SetThetaCut instead SetAlphaCut)
      and added the standard Disp-parametrization
+
+   - star: The time-evolution shown in the effective on-time plot now displays
+     the axis range (if there are no holes it should be similar to the
+     effective on-time)
 
    - showplot: path inflation for ganymed files was broken

trunk/MagicSoft/Mars/macros/optim/optimwobble.C

@@ -6 +6 @@
 
     // ------------------- Xi -----------------------
-    opt.SetParameter(0, 0.6);
-    opt.FixParameter(6, 0.137);
-
+    opt.FixParameter(0, 1.221);
+    opt.FixParameter(6, 13.425);
+    opt.FixParameter(7, 1.04343);
+                  
     // --------------- Theta Sq ---------------------
     opt.SetParameter(1, 0.23);

trunk/MagicSoft/Mars/mhflux/MHEffectiveOnTime.cc

@@ -759 +759 @@
 //  Paint the integral and the error on top of the histogram
 //
-void MHEffectiveOnTime::PaintText(Double_t val, Double_t error) const
-{
-    TLatex text(0.45, 0.94, Form("T_{eff} = %.1fs \\pm %.1fs", val, error));
+void MHEffectiveOnTime::PaintText(Double_t val, Double_t error, Double_range) const
+{
+    TLatex text;
     text.SetBit(TLatex::kTextNDC);
     text.SetTextSize(0.04);
-    text.Paint();
+    text.PaintLatex(0.45, 0.94, Form("T_{eff} = %.1fs \\pm %.1fs", val, error));
+
+    if (range>=0)
+        text.PaintLatex(0.66, 0.94, Form("T_{axe} = %.1fs", range));
 }
 
@@ -891 +894 @@
 
     h=0;
+
+    Double_t range=-1;
     if (o==(TString)"theta")
     {
@@ -900 +905 @@
         h = &fHTimeEffOn;
         UpdateRightAxis(fHTimeLambda);
+        range = h->GetXaxis()->GetXmax()->h->GetXaxis()->GetXmin();
     }
 
@@ -909 +915 @@
         error += h->GetBinError(i);
 
-    PaintText(h->Integral(), error);
+    PaintText(h->Integral(), error, range);
 }
 

trunk/MagicSoft/Mars/mhflux/MHEffectiveOnTime.h

@@ -57 +57 @@
     void FitTimeBin();
     void PaintProb(TH1 &h) const;
-    void PaintText(Double_t val, Double_t error) const;
+    void PaintText(Double_t val, Double_t error, Double_t range=-1) const;
     void PaintText(Double_t *res) const;
     void DrawRightAxis(const char *title);