Changeset 8978 for trunk/MagicSoft/Mars/mjobs

Timestamp:

06/18/08 21:39:50 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -48 +48 @@
 #include "MLogManip.h"
 
+#include "MMath.h"
 #include "MDirIter.h"
 
@@ -292 +293 @@
 
     const Double_t ufl = vstime->GetBinContent(0);
+    const Double_t ofl = vstime->GetBinContent(vstime->GetNbinsX()+1);
+    const Double_t eff = vstime->Integral()+ufl+ofl;
     if (ufl>0)
     {
@@ -301 +304 @@
         *fLog << warn << "WARNING - " << Form("%.1f%% (%.0fs)", 100*ufl/eff, ufl) << " of the eff. observation time is in the underflow bin." << endl;
     }
-
-    const Double_t ofl = vstime->GetBinContent(vstime->GetNbinsX()+1);
-    const Double_t eff = vstime->Integral()+ufl+ofl;
     if (ofl>0)
         *fLog << warn << "WARNING - " << Form("%.1f%% (%.0fs)", 100*ofl/eff, ofl) << " of the eff. observation time is in the overflow bin." << endl;
@@ -872 +872 @@
 TString MJSpectrum::FormString(const TF1 &f, Byte_t type)
 {
-    const Double_t p0 = f.GetParameter(0);
-    const Double_t p1 = f.GetParameter(1);
-
-    const Double_t e0 = f.GetParError(0);
-    const Double_t e1 = f.GetParError(1);
-
-    const Int_t    np  = TMath::Nint(TMath::Floor(TMath::Log10(p1)));
-    const Double_t exp = TMath::Power(10, np);
-
-    const Float_t fe0 = TMath::Log10(e0);
-    const Float_t fe1 = TMath::Log10(e1);
-
-    // calc number of (gueltige ziffern) digits to be displayed
-    const char *f0  = fe0-TMath::Floor(fe0)>0.3 ? "3.1" : "1.0";
-    const char *f1  = fe1-TMath::Floor(fe1)>0.3 ? "3.1" : "1.0";
+    Double_t p0 = f.GetParameter(0);
+    Double_t p1 = f.GetParameter(1);
+
+    Double_t e0 = f.GetParError(0);
+    Double_t e1 = f.GetParError(1);
+
+    MMath::Format(p0, e0);
+    MMath::Format(p1, e1);
 
     TString str;
@@ -893 +886 @@
     case 0:
         {
-            const TString fmt0 = Form("(%%%sf#pm%%%sf)\\bullet10^{%%d}",  f1, f1);
-            const TString fmt1 = Form("(\\frac{E}{500GeV})^{%%%sf#pm%%%sf}", f0, f0);
-
-            str  = Form(fmt0.Data(), p1/exp, e1/exp, np);
-            str += Form(fmt1.Data(), p0, e0);
+            const Int_t    i   = TMath::FloorNint(TMath::Log10(p1));
+            const Double_t exp = TMath::Power(10, i);
+
+            str  = Form("(%f#pm%f)\\bullet10^{%d}",      p1/exp, e1/exp, i);
+            str += Form("(\\frac{E}{500GeV})^{%f#pm%f}", p0, e0);
             str += "\\frac{ph}{TeVm^{2}s}";
         }