Changeset 6078 for trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

Timestamp:

01/28/05 11:18:44 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJPedestal.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -141 +141 @@
 const char* MJPedestal::GetOutputFile() const
 {
+    const TString name(GetOutputFileName());
+    if (name.IsNull())
+        return "";
+
+    return Form("%s/%s", fPathOut.Data(), name.Data());
+}
+
+const char* MJPedestal::GetOutputFileName() const
+{
     if (fSequence.IsValid())
-        return Form("%s/pedest%08d.root", (const char*)fPathOut, fSequence.GetSequence());
+        return Form("pedest%08d.root", fSequence.GetSequence());
 
     if (!fRuns)
         return "";
 
-    return Form("%s/%s-F0.root", (const char*)fPathOut, (const char*)fRuns->GetRunsAsFileName());
+    return Form("%s-F0.root", (const char*)fRuns->GetRunsAsFileName());
 }
 
@@ -785 +794 @@
         return kTRUE;
 
-    if (fPathOut.IsNull())
-    {
-        *fLog << inf << "No output path specified via SetPathOut - no output written." << endl;
-        return kTRUE;
-    }
-
-    const TString oname(GetOutputFile());
-
-    *fLog << inf << "Writing to file: " << oname << endl;
-
-    TFile file(oname, "UPDATE", "File created by MJPedestal", 9);
-    if (!file.IsOpen())
-    {
-        *fLog << err << "ERROR - Couldn't open file " << oname << " for writing..." << endl;
-        return kFALSE;
-    }
-
     TObjArray cont;
-
-    if (fDisplay)
-        cont.Add(fDisplay);
 
     cont.Add(&fPedestalCamOut);
     cont.Add(&fBadPixels);
 
-    return WriteContainer(cont);
+    return WriteContainer(cont, GetOutputFileName(), fOverwrite?"RECREATE":"NEW");
 }