Changeset 6150 for trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

Timestamp:

01/31/05 16:04:49 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -44 +44 @@
 
 #include "MDirIter.h"
+#include "MRunIter.h"
 #include "MParList.h"
 #include "MTaskList.h"
@@ -116 +117 @@
 //
 MJCalibrateSignal::MJCalibrateSignal(const char *name, const char *title)
-  : fDataFlag(0), fIsInterlaced(kTRUE), fIsRelTimesUpdate(kFALSE), fIsHiLoCalibration(kFALSE)
+  : fRuns(0), fIsInterlaced(kTRUE), fIsRelTimesUpdate(kFALSE), fIsHiLoCalibration(kFALSE)
 {
     fName  = name  ? name  : "MJCalibrateSignal";
@@ -213 +214 @@
     if (!fSequence.IsValid())
     {
-        *fLog << err << "ERROR - Sequence invalid!" << endl;
-        return kFALSE;
+        if (!fRuns)
+        {
+          *fLog << err << "ERROR - Sequence invalid and no runs chosen!" << endl;
+          return kFALSE;
+        }
+
+        if (fRuns->GetNumRuns() != fRuns->GetNumEntries())
+        {
+            *fLog << err << "Number of files found doesn't match number of runs... abort."
+                << fRuns->GetNumRuns() << " vs. " << fRuns->GetNumEntries() << endl;
+            return kFALSE;
+        }
+        *fLog << "Calibrate data from ";
+        *fLog << "Runs " << fRuns->GetRunsAsString() << endl;
+        *fLog << endl;
     }
 
@@ -339 +353 @@
     plist.AddToList(&tlist);
 
-    /*
-    TString name = iter.Next();
-    Byte_t filetype = MRawFileRead::IsFileValid(name);
-    if (!filetype)
-        filetype = MReadMarsFile::IsFileValid(name)+1;
-    if (filetype<1||filetype>3)
-    {
-        gLog << err << "ERROR - FileType #" << (int)filetype << " of first file " << name << " unknown..." << endl;
-        return kFALSE;
-    } */
-
     MReadReports readreal;
     readreal.AddTree("Events", "MTime.", kTRUE);
@@ -362 +365 @@
     MRawFileRead rawread(NULL);
     if (IsRawData())
-        rawread.AddFiles(iter);
+        rawread.AddFiles(fSequence.IsValid() ? iter : *fRuns);
     else
-        readreal.AddFiles(iter);
+        readreal.AddFiles(fSequence.IsValid() ? iter : *fRuns);
 
     MPointingPosInterpolate pextr;