Changeset 3480 for trunk/MagicSoft/Mars/mcalib

Timestamp:

03/11/04 18:45:30 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrate.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrate.cc

@@ -99 +99 @@
 //  - MCalibrationChargeCam
 //  - MExtractedSignalCam
+//  - MBadPixelsCam
 //
 // The following output containers are also searched and created if
@@ -117 +118 @@
 
     fBadPixels = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam"));
-
     if (!fBadPixels)
-    {
-      *fLog << err << AddSerialNumber("MBadPixelsCam") << " not found ... aborting" << endl;
-        return kFALSE;
-    }
-
-   if(fCalibrationMode>kNone)
+      *fLog << warn << AddSerialNumber("MBadPixelsCam") << " not found ... no action" << endl;
+    
+    if(fCalibrationMode>kNone)
       {
 
@@ -228 +225 @@
         {
 
-          MCalibrationChargePix &pix = (*fCalibrations)[pixidx];       
+          
+          MCalibrationChargePix &pix = (*fCalibrations)[pixidx];
           MBadPixelsPix         &bad = (*fBadPixels)[pixidx];
 
-          if (!bad.IsCalibrationResultOK())
-            continue;
-          
+          if (fBadPixels)
+            if (!bad.IsCalibrationResultOK())
+              continue;
+
           switch(fCalibrationMode)
             {