Changeset 9609 for trunk/MagicSoft

Timestamp:

07/05/10 17:33:46 (14 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJSimulation.cc (modified) (4 diffs)
• mjobs/MJSimulation.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -31 +31 @@
        number to be 1.
 
+   * mjobs/MJSimulation.[h,cc]:
+     - added run-number to ceres.root filename
+
 
 

trunk/MagicSoft/Mars/mjobs/MJSimulation.cc

@@ -149 +149 @@
 */
 
-Bool_t MJSimulation::WriteResult(const MParList &plist, const MSequence &seq)
+Bool_t MJSimulation::WriteResult(const MParList &plist, const MSequence &seq, Int_t num)
 {
     if (fPathOut.IsNull())
@@ -184 +184 @@
     }
 
-    const TString name = seq.IsValid() ? Form("ceres%08d.root", seq.GetSequence()) : "ceres.root";
+    const TString name =  Form("ceres%08d.root", num);
     return WriteContainer(cont, name, "RECREATE");
 }
@@ -315 +315 @@
     case kModeData:
         header.SetRunType(MRawRunHeader::kRTMonteCarlo|MRawRunHeader::kRTData);
-         header.SetRunInfo(0, fRunNumber<0 ? 3 : fRunNumber);
+        header.SetRunInfo(0, fRunNumber<0 ? 3 : fRunNumber);
         break;
 
@@ -931 +931 @@
     //-------------------------------------------
 
-    if (!WriteResult(plist, seq))
+    if (!WriteResult(plist, seq, header.GetRunNumber()))
         return kFALSE;
 

trunk/MagicSoft/Mars/mjobs/MJSimulation.h

@@ -26 +26 @@
     Int_t  fRunNumber;      // 8 digits run number to be used for the file names
 
-    Bool_t WriteResult(const MParList &plist, const MSequence &seq);
+    Bool_t WriteResult(const MParList &plist, const MSequence &seq, Int_t run);
     Bool_t CheckEnvLocal();