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

Timestamp:

08/25/04 13:20:16 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -90 +90 @@
 //
 MJPedestal::MJPedestal(const char *name, const char *title) 
-    : fEnv(0), fRuns(0), fSequence(0), fExtractor(NULL), fDisplayType(kNormalDisplay),
-      fDataCheck(kFALSE), fUseData(kFALSE), fOverwrite(kFALSE), fMaxEvents(0)
+    : fRuns(0), fExtractor(NULL), fDisplayType(kNormalDisplay),
+      fDataCheck(kFALSE), fUseData(kFALSE)
 {
     fName  = name  ? name  : "MJPedestal";
@@ -97 +97 @@
 }
 
-MJPedestal::~MJPedestal()
-{
-    if (fEnv)
-        delete fEnv;
-}
-
 const char* MJPedestal::GetOutputFile() const
 {
-    if (fSequence)
-        return Form("%s/calped%06d.root", (const char*)fOutputPath, fSequence->GetSequence());
+    if (fSequence.IsValid())
+        return Form("%s/calped%06d.root", (const char*)fPathOut, fSequence.GetSequence());
 
     if (!fRuns)
         return "";
 
-    return Form("%s/%s-F0.root", (const char*)fOutputPath, (const char*)fRuns->GetRunsAsFileName());
+    return Form("%s/%s-F0.root", (const char*)fPathOut, (const char*)fRuns->GetRunsAsFileName());
 }
 
@@ -160 +154 @@
     TString title = fDisplay->GetTitle();
     title += "--  Pedestal ";
-    if (fSequence)
-        title += fSequence->GetName();
+    if (fSequence.IsValid())
+        title += fSequence.GetName();
     else
         if (fRuns)  // FIXME: What to do if an environmentfile was used?
@@ -468 +462 @@
 Bool_t MJPedestal::WriteResult()
 {
-    if (fOutputPath.IsNull())
+    if (fPathOut.IsNull())
         return kTRUE;
 
@@ -503 +497 @@
 }
 
-void MJPedestal::SetOutputPath(const char *path)
-{
-    fOutputPath = path;
-    if (fOutputPath.EndsWith("/"))
-        fOutputPath = fOutputPath(0, fOutputPath.Length()-1);
-}
-
-// --------------------------------------------------------------------------
-//
-// 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)
-{
-    if (fEnv)
-        delete fEnv;
-    fEnv = new TEnv(env);
-}
-
 Bool_t MJPedestal::Process()
 {
@@ -536 +505 @@
 }
 
-// --------------------------------------------------------------------------
-//
-// 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()
-{
-    if (!fEnv)
-        return;
-
-    TString e1 = fEnv->GetValue(Form("%s.OutputPath", fName.Data()), "");
-    if (!e1.IsNull())
-    {
-        e1.ReplaceAll("\015", "");
-        SetOutputPath(e1);
-    }
-
-    SetMaxEvents(fEnv->GetValue(Form("%s.MaxEvents", fName.Data()), fMaxEvents));
-    SetOverwrite(fEnv->GetValue(Form("%s.AllowOverwrite", fName.Data()), fOverwrite));
-
-    fUseData = fEnv->GetValue(Form("%s.UseData", fName.Data()), fUseData);
-}
-
 Bool_t MJPedestal::ProcessFile()
 {
-    if (!fRuns && !fEnv && !fSequence)
-    {
-        *fLog << err << "Neither AddRuns nor SetSequence nor SetEnv was called... abort." << endl;
-        return kFALSE;
-    }
-    if (!fSequence && fRuns && fRuns->GetNumRuns() != fRuns->GetNumEntries())
-    {
-        *fLog << err << "Number of files found doesn't match number of runs... abort." << endl;
-        return kFALSE;
-    }
+    if (!fSequence.IsValid())
+    {
+        if (!fRuns)
+        {
+            *fLog << err << "Neither AddRuns nor SetSequence nor SetEnv was called... abort." << endl;
+            return kFALSE;
+        }
+        if (fRuns && fRuns->GetNumRuns() != fRuns->GetNumEntries())
+        {
+            *fLog << err << "Number of files found doesn't match number of runs... abort." << endl;
+            return kFALSE;
+        }
+    }
+
+    //if (!CheckEnv())
+    //    return kFALSE;
+
+    CheckEnv();
+
+    // --------------------------------------------------------------------------------
 
     *fLog << inf;
     fLog->Separator(GetDescriptor());
     *fLog << "Calculate MPedestalCam from Runs ";
-    if (fSequence)
-        *fLog << fSequence->GetName() << endl;
+    if (fSequence.IsValid())
+        *fLog << fSequence.GetName() << endl;
     else
         if (fRuns)
             *fLog << fRuns->GetRunsAsString() << endl;
         else
-            *fLog << "in " << fEnv->GetName() << endl;
+            *fLog << "in Resource File." << endl;
     *fLog << endl;
 
-    CheckEnv();
+    // --------------------------------------------------------------------------------
 
     MParList  plist;
@@ -600 +551 @@
 
     MDirIter iter;
-    if (fSequence)
-    {
-        const Int_t n = fUseData ? fSequence->SetupDatRuns(iter, fInputPath) : fSequence->SetupPedRuns(iter, fInputPath);
-        if (n==0)
+    if (fSequence.IsValid())
+    {
+        const Int_t n0 = fUseData ? fSequence.SetupDatRuns(iter, fPathData) : fSequence.SetupPedRuns(iter, fPathData);
+        const Int_t n1 = fUseData ? fSequence.GetNumDatRuns() : fSequence.GetNumPedRuns();
+        if (n0==0)
         {
             *fLog << err << "ERROR - No input files of sequence found!" << endl;
             return kFALSE;
         }
+        if (n0!=n1)
+        {
+            *fLog << err << "ERROR - Number of files found (" << n0 << ") doesn't match number of files in sequence (" << n1 << ")" << endl;
+            return kFALSE;
+        }
     }
 
     if (fDataCheck)
     {
-        if (fRuns || fSequence)
-            rawread.AddFiles(fSequence ? iter : *fRuns);
+        if (fRuns || fSequence.IsValid())
+            rawread.AddFiles(fSequence.IsValid() ? iter : *fRuns);
         tlist.AddToList(&rawread);
     }
@@ -619 +576 @@
     {
         read.DisableAutoScheme();
-        if (fRuns || fSequence)
-            read.AddFiles(fSequence ? iter : *fRuns);
+        if (fRuns || fSequence.IsValid())
+            read.AddFiles(fSequence.IsValid() ? iter : *fRuns);
         tlist.AddToList(&read);
     }
-    // Enable logging to file
-    //*fLog.SetOutputFile(lname, kTRUE);
 
     // Setup Tasklist
@@ -662 +617 @@
     evtloop.SetDisplay(fDisplay);
     evtloop.SetLogStream(fLog);
-    if (fEnv)
-        evtloop.ReadEnv(*fEnv);
+    if (GetEnv())
+        evtloop.ReadEnv(*GetEnv());
 
     //    if (!WriteEventloop(evtloop))