Changeset 10045 for trunk

Timestamp:

10/28/10 18:18:38 (14 years ago)

Author:

tbretz

Message:

Fixed a problem in ganymed which made the use of the tilde in pathnames in --out= impossible.

Location:

trunk/Mars

Files:

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

trunk/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2010/10/28 Thomas Bretz
+
+   * mjobs/MJCuts.cc:
+     - improved debug output in WriteResults
+
+   * mjobs/MJob.cc:
+     - imporved searching for an open file in WriteContainer
+
+
 
  2010/10/28 Daniela Dorner

trunk/Mars/mjobs/MJCut.cc

@@ -330 +330 @@
     if (fNameResult.IsNull() && fStoreResult)
     {
+        *fLog << inf2 << "Searching for open file " << fname << "... " << flush;
+
         TFile *file = (TFile*)gROOT->GetListOfFiles()->FindObject(fname);
         if (file)
         {
+            *fLog << "found." << endl;
             file->cd();
             return WriteContainer(arr);
         }
+        *fLog << "not found." << endl;
     }
 

trunk/Mars/mjobs/MJob.cc

@@ -523 +523 @@
     }
 
-    const TString oname = CombinePath(fPathOut, name);
-
-    *fLog << inf << "Writing to file: " << oname << endl;
-
-    TString title("File written by ");
-    title += fName;
+    TString oname = CombinePath(fPathOut, name);
 
     // In case the update-option is selected check whether
@@ -535 +530 @@
     {
         TFile *file = dynamic_cast<TFile*>(gROOT->GetListOfFiles()->FindObject(oname));
+        if (!file || !file->IsOpen() || file->IsZombie())
+        {
+            gSystem->ExpandPathName(oname);
+            file = dynamic_cast<TFile*>(gROOT->GetListOfFiles()->FindObject(oname));
+        }
+
         if (file && file->IsOpen() && !file->IsZombie())
         {
-            *fLog << inf << "Open file found." << endl;
+            *fLog << inf << "Updating open file " << oname << "." << endl;
             file->cd();
             return WriteContainer(cont);
         }
     }
+
+    *fLog << inf << "Writing to file " << oname << "." << endl;
+
+    TString title("File written by ");
+    title += fName;
 
     // Open a new file with the defined option for writing