Changeset 8985 for trunk/MagicSoft/Mars/mjobs

Timestamp:

06/20/08 13:45:16 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJSpectrum.cc (modified) (2 diffs)
• MJSpectrum.h (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -870 +870 @@
 */
 
-TString MJSpectrum::FormString(const TF1 &f, Byte_t type)
+TString MJSpectrum::FormFloat(Double_t d)
+{
+    TString s;
+    s += d;
+    return s.Strip(TString::kLeading);
+}
+
+TString MJSpectrum::FormFlux(const TF1 &f, const char *unit)
 {
     Double_t p0 = f.GetParameter(0);
@@ -881 +888 @@
     MMath::Format(p1, e1);
 
-    TString str;
+    const Int_t    i   = TMath::FloorNint(TMath::Log10(p1));
+    const Double_t exp = TMath::Power(10, i);
+
+    TString str = Form("(%s #pm %s)·10^{%d} ",
+                       FormFloat(p1/exp).Data(), FormFloat(e1/exp).Data(), i);
+
+    str += Form("#left(#frac{E}{%s}#right)^{%s #pm %s}", unit,
+                FormFloat(p0).Data(), FormFloat(e0).Data());
+
+    str += " TeV^{-1} m^{-2} s^{-1}";
+
+    return str;
+}
+
+TString MJSpectrum::FormString(const TF1 &f, Byte_t type)
+{
     switch (type)
     {
     case 0:
-        {
-            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}";
-        }
-        break;
+        return FormFlux(f, "500GeV");
     case 1:
-        str = Form("\\chi^{2}/NDF=%.2f/%d", f.GetChisquare(),f.GetNDF());
-        break;
+        return Form("\\chi^{2}/NDF=%.2f/%d", f.GetChisquare(),f.GetNDF());
     case 2:
-        str = Form("P=%.0f%%", 100*TMath::Prob(f.GetChisquare(),  f.GetNDF()));
-        break;
-    }
-    return str;
+        return Form("P=%.0f%%", 100*TMath::Prob(f.GetChisquare(),  f.GetNDF()));
+    }
+    return "";
 }
 

trunk/MagicSoft/Mars/mjobs/MJSpectrum.h

@@ -78 +78 @@
     void SetEnergyEstimator(const MTask *task);
 
+    static TString FormFloat(Double_t d);
+    static TString FormFlux(const TF1 &f, const char *unit);
     static TString FormString(const TF1 &f, Byte_t type=0);