Changeset 6955 for trunk/MagicSoft/Mars

Timestamp:

04/19/05 09:43:01 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJCut.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/04/19 Thomas Bretz
+
+   * mjobs/MJCut.cc:
+     - fixed a problem when not enabling "--res"
+
+
 
  2005/04/18 Thomas Bretz

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -231 +231 @@
     const Bool_t rc = WriteContainer(cont);
 
-    if (!fNameResult.IsNull())
+    if (!(fNameResult.IsNull() && fStoreResult))
         delete file;
 
@@ -252 +252 @@
             arr.Add(o);
 
-    return WriteContainer(arr, GetOutputFile(num), "UPDATE");
+    const TString fname(GetOutputFile(num));
+
+    if (fNameResult.IsNull() && fStoreResult)
+    {
+        TFile *file = (TFile*)gROOT->GetListOfFiles()->FindObject(fname);
+        if (file)
+        {
+            file->cd();
+            return WriteContainer(arr);
+        }
+    }
+
+    return WriteContainer(arr, fname, "UPDATE");
 }