Changeset 5307 for trunk/MagicSoft/Mars/mjobs

Timestamp:

10/22/04 15:59:02 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -94 +94 @@
 // Sets fRuns to 0, fExtractor to NULL, fDataCheck to kFALSE
 //
-MJCalibrateSignal::MJCalibrateSignal(const char *name, const char *title) 
+MJCalibrateSignal::MJCalibrateSignal(const char *name, const char *title)
+    : fIsDataCheck(kFALSE)
 {
     fName  = name  ? name  : "MJCalibrateSignal";
@@ -170 +171 @@
     cont.Add(&cam);
     return ReadContainer(cont);
+}
+
+// --------------------------------------------------------------------------
+//
+// MJCalibration allows to setup several option by a resource file:
+//   MJCalibration.Display: full, datacheck, normal
+//   MJCalibration.RelTimeCalibration: yes,no
+//   MJCalibration.DataCheck: yes,no
+//   MJCalibration.Debug: yes,no
+//   MJCalibration.Intensity: yes,no
+//   MJCalibration.UseBlindPixel: yes,no
+//   MJCalibration.UsePINDiode: yes,no
+//   MJCalibration.Geometry: MGeomCamMagic, MGeomCamECO1000
+//
+// For more details see the class description and the corresponding Getters
+// 
+Bool_t MJCalibrateSignal::CheckEnvLocal()
+{
+    SetDataCheck(GetEnv("DataCheck", IsDataCheck()));
+    return kTRUE;
 }
 
@@ -196 +217 @@
 
     MDirIter iter;
-    const Int_t n0 = fSequence.SetupDatRuns(iter, fPathData);
+    const Int_t n0 = fSequence.SetupDatRuns(iter, fPathData, "D", IsDataCheck());
     const Int_t n1 = fSequence.GetNumDatRuns();
     if (n0==0)
@@ -300 +321 @@
     readreal.AddFiles(iter);
 
-    MReadMarsFile readmc("Events");
-    readmc.DisableAutoScheme();
-    readmc.AddFiles(iter);
-
-    MRawFileRead readraw(NULL);
-    readraw.AddFiles(iter);
+    MReadMarsFile read("Events");
+    read.DisableAutoScheme();
+    MRawFileRead rawread(NULL);
+    if (IsDataCheck())
+        rawread.AddFiles(iter);
+    else
+        read.AddFiles(iter);
 
     MGeomApply             apply; // Only necessary to create geometry
@@ -413 +435 @@
 
     // Now setup main tasklist
-    switch (filetype)
-    {
-    case 1: tlist.AddToList(&readraw);  break;
-    case 2: tlist.AddToList(&readreal); break;
-    case 3: tlist.AddToList(&readmc);   break;
-    }
-
-    tlist.AddToList(&tlist2, "Events");
-    tlist.AddToList(&pcalc,  "Drive");
+    tlist.AddToList(IsDataCheck() ? (MTask*)&rawread : (MTask*)&read);
+    tlist.AddToList(&tlist2, IsDataCheck()?"All":"Events");
+    if (!IsDataCheck())
+        tlist.AddToList(&pcalc, "Drive");
     tlist.AddToList(&write);