Changeset 9345 for trunk/MagicSoft/Mars/mjobs

Timestamp:

02/16/09 10:19:21 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJSpectrum.cc (modified) (3 diffs)
• MJob.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -58 +58 @@
 #include "MH3.h"
 #include "MHn.h"
+#include "MEnv.h"
 #include "MBinning.h"
 #include "MParameters.h"
@@ -1539 +1540 @@
     MBinning binsa("BinningAsym");
     MBinning binsb("BinningConc1");
+
+    MEnv env("", "ganymed.rc");
 
     MAlphaFitter fit;
@@ -1963 +1966 @@
         // Write the output
         TObjArray cont;
-        cont.Add((TObject*)GetEnv()); // const_cast
-        cont.Add((TObject*)&set);     // const_cast
+        cont.Add(&env);                           // ganymed.rc
+        cont.Add(const_cast<TEnv*>(GetEnv()));    // sponde.rc
+        cont.Add(const_cast<MDataSet*>(&set));    // Dataset
         cont.Add(plist.FindObject("MAlphaFitter"));
         cont.Add(&area0);

trunk/MagicSoft/Mars/mjobs/MJob.cc

@@ -460 +460 @@
     }
 
-    MIter Next(&list);
-    MParContainer *o=0;
+    TIter Next(&list);
+    TObject *o=0;
     while ((o=Next()))
     {
-        *fLog << inf << " - Reading " << o->GetDescriptor() << "..." << flush;
+        *fLog << inf << " - Reading " << MParContainer::GetDescriptor(*o) << "..." << flush;
         if (o->Read(o->GetName())<=0)
         {
-            *fLog << err << dbginf << "ERROR - Reading " << o->GetDescriptor() << " from file " << gFile->GetName() << endl;
+            *fLog << err << dbginf << "ERROR - Reading " << MParContainer::GetDescriptor(*o) << " from file " << gFile->GetName() << endl;
             return kFALSE;
         }