Changeset 6828 for trunk/MagicSoft/Mars/mjobs

Timestamp:

03/16/05 13:27:32 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibrateSignal.cc (modified) (2 diffs)
• MJCalibrateSignal.h (modified) (2 diffs)
• MJCalibration.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -122 +122 @@
 // - fIsRelTimesUpdate to kFALSE
 // - fIsHiLoCalibration to kFALSE
-// - fIsModifiedExtractWin to kTRUE
 // - fPulsePosCheck to kTRUE
 //
 MJCalibrateSignal::MJCalibrateSignal(const char *name, const char *title)
-    : fExtractor(0), fIsInterlaced(kTRUE), fIsRelTimesUpdate(kFALSE),
-      fIsModifiedExtractWin(kTRUE)
+    : fExtractor(0), fIsInterlaced(kTRUE), fIsRelTimesUpdate(kFALSE)
 {
     fName  = name  ? name  : "MJCalibrateSignal";
@@ -272 +270 @@
 Bool_t MJCalibrateSignal::CheckEnvLocal()
 {
-
     SetInterlaced(GetEnv("Interlaced", fIsInterlaced));
     SetRelTimesUpdate(GetEnv("RelTimesUpdate", fIsRelTimesUpdate));
-    SetModifiedExtractWin(GetEnv("ModifiedExtractWin", fIsModifiedExtractWin));
 
     return MJCalib::CheckEnvLocal();

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.h

@@ -22 +22 @@
     MExtractor *fExtractor;
 
-  //    MRunIter *fCruns;                   // Calibration run iter
     Bool_t fIsInterlaced;               // Distinguish interlaced from other calibration
     Bool_t fIsRelTimesUpdate;           // Choose to update relative times from interlaced
-    Bool_t fIsModifiedExtractWin;       // Choose to use the modified extraction window from pulse position
     
     Bool_t CheckEnvLocal();
@@ -48 +46 @@
     void SetInterlaced     ( const Bool_t b=kTRUE )  { fIsInterlaced      = b; }
     void SetRelTimesUpdate ( const Bool_t b=kTRUE )  { fIsRelTimesUpdate  = b; }
-    void SetModifiedExtractWin( const Bool_t b=kTRUE )  { fIsModifiedExtractWin = b; }
-
-    //    void SetInputCal    ( MRunIter *iter       )  { fCruns = iter; }
 
     void SetExtractor(const MExtractor &ext);

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -197 +197 @@
   fTitle = title ? title : "Tool to create the calibration constants for one calibration run";
   
-  SetUseBlindPixel();
-  SetUsePINDiode();
+  SetUseBlindPixel(kFALSE);
+  SetUsePINDiode(kFALSE);
   
   SetHiLoCalibration();
@@ -1527 +1527 @@
       cpix.SetConversionHiLoErr(sigma);      
     }
+
   return kTRUE;
 }
@@ -1794 +1795 @@
     MHCalibrationChargeBlindCam blindcam;
     plist.AddToList(&chargecam);
-    plist.AddToList(&blindcam);
+
+    if (IsUseBlindPixel())
+      plist.AddToList(&blindcam);
     if (IsRelTimes())
-        plist.AddToList(&reltimecam);
+      plist.AddToList(&reltimecam);
     //
     // Data Reading tasks
@@ -1907 +1910 @@
 
     tlist.AddToList(&taskenv);
-    tlist.AddToList(&pinext);
-    tlist.AddToList(&blindext);
+    
+    if (IsUsePINDiode())
+      tlist.AddToList(&pinext);
+    if (IsUseBlindPixel())
+      tlist.AddToList(&blindext);
 
     MTaskEnv taskenv2("ExtractTime");