Changeset 3480

Timestamp:

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

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrate.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -64 +64 @@
      - use two loops over pixels in order to determine mean flux of phe;s to 
        discard pixels far outside the normal distribution
+
+   * mcalib/MCalibrate.cc
+     - added case that no MBadPixelsCam is available.
+
 
  2004/03/10: Abelardo Moralejo

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)
             {