Changeset 4769 for trunk/MagicSoft

Timestamp:

08/27/04 17:26:06 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc

@@ -134 +134 @@
     }
 
+    fGeomCam = 0;
+    if (!IsUseInterpolation())
+        return kTRUE;
+
     fGeomCam = (MGeomCam*)pList->FindObject(AddSerialNumber("MGeomCam"));
-    if (!fGeomCam && TESTBIT(fFlags, kUseInterpolation))
+    if (!fGeomCam)
     {
         *fLog << err << AddSerialNumber("MGeomCam") << " not found - can't use interpolation... abort." << endl;
@@ -150 +154 @@
             return kFALSE;
         }
-        *fLog << inf << "Processing Pedestals..." << endl;
     }
 
@@ -162 +165 @@
             return kFALSE;
         }
-        *fLog << inf << "Processing Times..." << endl;
-    }
+    }
+
+    if (IsProcessPedestalEvt())
+        *fLog << inf << "Processing Pedestals once per event..." << endl;
+    if (IsProcessPedestalRun())
+        *fLog << inf << "Processing Pedestals once per run..." << endl;
+    if (IsProcessTimes())
+        *fLog << inf << "Processing Arrival Times once per event..." << endl;
 
     return kTRUE;
@@ -610 +619 @@
 Bool_t MBadPixelsTreat::ReInit(MParList *pList)
 {
-    if (IsProcessPedestalRun())
+    if (IsUseInterpolation() && IsProcessPedestalRun())
         InterpolatePedestals();
     return kTRUE;
@@ -621 +630 @@
 Int_t MBadPixelsTreat::Process()
 {
-    if (TESTBIT(fFlags, kUseInterpolation) && fGeomCam)
+    if (IsUseInterpolation())
     {
         InterpolateSignal();