Changeset 9261 for trunk/MagicSoft/Mars/mjobs

Timestamp:

01/25/09 14:32:11 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJSpectrum.cc (modified) (4 diffs)
• MJStar.cc (modified) (2 diffs)
• MJob.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -49 +49 @@
 
 #include "MMath.h"
+#include "MString.h"
 #include "MDirIter.h"
 
@@ -891 +892 @@
     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());
+    TString str = MString::Format("(%s #pm %s)·10^{%d} ",
+                                  FormFloat(p1/exp).Data(), FormFloat(e1/exp).Data(), i);
+
+    str += MString::Format("#left(#frac{E}{%s}#right)^{-%s #pm %s}", unit,
+                           FormFloat(p0).Data(), FormFloat(e0).Data());
 
     str += " TeV^{-1} m^{-2} s^{-1}";
@@ -909 +910 @@
         return FormFlux(f, "500GeV");
     case 1:
-        return Form("\\chi^{2}/NDF=%.2f/%d", f.GetChisquare(),f.GetNDF());
+        return MString::Format("\\chi^{2}/NDF=%.2f/%d", f.GetChisquare(),f.GetNDF());
     case 2:
-        return Form("P=%.0f%%", 100*TMath::Prob(f.GetChisquare(),  f.GetNDF()));
+        return MString::Format("P=%.0f%%", 100*TMath::Prob(f.GetChisquare(),  f.GetNDF()));
     }
     return "";
@@ -1492 +1493 @@
         return kFALSE;
 
-    CheckEnv();
+    if (!CheckEnv())
+        return kFALSE;
 
     // --------------------------------------------------------------------------------

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -140 +140 @@
     }
 
-    //if (!CheckEnv())
-    //    return kFALSE;
-
-    CheckEnv();
-
     // --------------------------------------------------------------------------------
 
@@ -152 +147 @@
     *fLog << fSequence.GetFileName() << endl;
     *fLog << endl;
+
+    if (!CheckEnv())
+        return kFALSE;
  
     // --------------------------------------------------------------------------------

trunk/MagicSoft/Mars/mjobs/MJob.cc

@@ -277 +277 @@
 // For exmaple:
 //    RandomNumberGenerator: TRandom3
-//    RandomNumberSeeValue:  0
+//    RandomNumberSeedValue:  0
 //
 Bool_t MJob::InitRandomNumberGenerator() const
@@ -301 +301 @@
 
     // Nothing: Keep seed value, 0 set time as seed value, val set seed
-    const TString seed = GetEnv("RandomNumberSeedNumber", "");
+    const TString seed = GetEnv("RandomNumberSeedValue", "");
     if (!seed.IsNull())
     {