Changeset 9519 for trunk/MagicSoft/Mars/mjobs

Timestamp:

10/26/09 15:13:28 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibrateSignal.cc (modified) (6 diffs)
• MJCalibrateSignal.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -126 +126 @@
 //
 MJCalibrateSignal::MJCalibrateSignal(const char *name, const char *title)
-    : fExtractor(0), fIsInterlaced(kTRUE), fIsRelTimesUpdate(kTRUE), fIsMovieMode(kFALSE)
+    : fExtractor(0), fIsInterlaced(kTRUE), fIsRelTimesUpdate(kTRUE), fIsMovieMode(kFALSE), fIsTestMode(kFALSE)
 {
     fName  = name  ? name  : "MJCalibrateSignal";
@@ -263 +263 @@
     if (fSequence.IsValid())
     {
-        if (fSequence.GetRuns(iter, MSequence::kRawDat)<=0)
+        if (fSequence.GetRuns(iter, fIsTestMode?MSequence::kRawCal:MSequence::kRawDat)<=0)
             return kFALSE;
     }
@@ -383 +383 @@
     read->AddFiles(iter);
 
-    const TString fname(Form("s/(([0-9]+_)?(M[12]_)?[0-9.]+)_D_(.*[.])(raw|raw[.]gz|root)$/%s\\/$1_Y_$4root/",
+    const TString fname(Form("s/(([0-9]+_)?(M[12]_)?[0-9.]+)_[CD]_(.*[.])(raw|raw[.]gz|root)$/%s\\/$1_Y_$4root/",
                              Esc(fPathOut).Data()));
 
@@ -460 +460 @@
     fcalped.AllowTriggerLvl2();
     fcalped.AllowSumTrigger();
+    if (fIsTestMode)
+        fcalped.AllowCalibration();
 
     // This will skip interleaved events with a cal- or ped-trigger
@@ -810 +812 @@
 
     //MFDataPhrase filcalco("MCalibrationConstCam.IsReadyToSave>0.5", "CalibConstFilter");
-    if (fIsInterlaced)
+    if (fIsInterlaced && !fIsTestMode)
     {
         // The task list is executed for all events with the calibration
@@ -867 +869 @@
     // Check if we have an extremely bright event (remove them,
     // they are presumably errornous events or calibration events)
-    tlist2.AddToList(&contbright);
+    if (!fIsTestMode)
+        tlist2.AddToList(&contbright);
 
     /*

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.h

@@ -25 +25 @@
     Bool_t fIsRelTimesUpdate;           // Choose to update relative times from interlaced
     Bool_t fIsMovieMode;                // Choose to encode a movie
+    Bool_t fIsTestMode;                 // Testmode to calibrate the cal run
 
     Bool_t CheckEnvLocal();
@@ -46 +47 @@
     void SetRelTimesUpdate(const Bool_t b=kTRUE) { fIsRelTimesUpdate = b; }
     void SetMovieMode     (const Bool_t b=kTRUE) { fIsMovieMode      = b; }
+    void SetTestMode      (const Bool_t b=kTRUE) { fIsTestMode       = b; }
 
     void SetExtractor(const MExtractor *ext=NULL);