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

Timestamp:

08/24/04 14:51:17 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -91 +91 @@
 MJPedestal::MJPedestal(const char *name, const char *title) 
     : fEnv(0), fRuns(0), fSequence(0), fExtractor(NULL), fDisplayType(kNormalDisplay),
-      fDataCheck(kFALSE), fUseData(kFALSE), fMaxEvents(0)
+      fDataCheck(kFALSE), fUseData(kFALSE), fOverwrite(kFALSE), fMaxEvents(0)
 {
     fName  = name  ? name  : "MJPedestal";
@@ -451 +451 @@
     *fLog << inf << "Writing to file: " << oname << endl;
 
-    TFile file(oname, "RECREATE");
+    TFile file(oname, fOverwrite?"RECREATE":"NEW", "File created by MJPedestal", 9);
+    if (!file.IsOpen())
+    {
+        *fLog << err << "ERROR - Couldn't open file " << oname << " for writing..." << endl;
+        return kFALSE;
+    }
 
     if (fDisplay && fDisplay->Write()<=0)
@@ -481 +486 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Set the path from which the sequence files are read
+// 
+void MJPedestal::SetInputPath(const char *path)
+{
+    fInputPath = path;
+    if (fInputPath.EndsWith("/"))
+        fInputPath = fInputPath(0, fInputPath.Length()-1);
+}
+
 void MJPedestal::SetEnv(const char *env)
 {
@@ -496 +512 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// MJPedestsl allows to setup several option by a resource file:
+//   MJPedestal.OutputPath: path
+//   MJPedestal.MaxEvents: 1000
+//   MJPedestal.AllowOverwrite: yes, no
+//   MJPedestal.UseData: yes, no (use DatRuns from sequence instead of PedRuns)
+//
+// For more details see the class description and the corresponding Getters
+// 
 void MJPedestal::CheckEnv()
 {
@@ -508 +534 @@
     }
 
-    fMaxEvents = fEnv->GetValue("MJPedestal.MaxEvents", fMaxEvents);
-    fUseData   = fEnv->GetValue("MJPedestal.UseData",   fUseData);
+    SetMaxEvents(fEnv->GetValue("MJPedestal.MaxEvents", fMaxEvents));
+    SetOverwrite(fEnv->GetValue("MJPedestal.AllowOverwrite", fOverwrite));
+
+    fUseData = fEnv->GetValue("MJPedestal.UseData", fUseData);
 }
 
@@ -548 +576 @@
     MDirIter iter;
     if (fSequence)
-        fUseData ? fSequence->SetupDatRuns(iter) : fSequence->SetupPedRuns(iter);
+    {
+        const Int_t n = fUseData ? fSequence->SetupDatRuns(iter, fInputPath) : fSequence->SetupPedRuns(iter, fInputPath);
+        if (n==0)
+        {
+            *fLog << err << "ERROR - No input files of sequence found!" << endl;
+            return kFALSE;
+        }
+    }
 
     if (fDataCheck)