Changeset 3069 for trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

Timestamp:

02/09/04 15:44:04 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -51 +51 @@
 #include "MReadMarsFile.h"
 #include "MGeomApply.h"
+#include "MBadPixelsMerge.h"
 #include "MExtractSignal.h"
 #include "MExtractSignal2.h"
@@ -382 +383 @@
         return kFALSE;
     }
+
+    if (fBadPixels.Write()<=0)
+    {
+        *fLog << err << "Unable to write MBadPixelsCam to " << oname << endl;
+        return kFALSE;
+    }
+
     return kTRUE;
 
@@ -426 +434 @@
         *fLog << "Unable to read MCalibrationCam from " << fname << endl;
         return kFALSE;
+    }
+
+    if (file.FindKey("MBadPixelsCam"))
+    {
+        MBadPixelsCam bad;
+        if (bad.Read()<=0)
+        {
+            *fLog << "Unable to read MBadPixelsCam from " << fname << endl;
+            return kFALSE;
+        }
+        fBadPixels.Merge(bad);
     }
 
@@ -466 +485 @@
 
     MGeomApply       apply;
+    MBadPixelsMerge  merge(&fBadPixels);
+    // MExtractSignal   extract; // Do not use this at the moment...
     MExtractSignal2  extract;
     MCalibrationCalc calcalc;
@@ -476 +497 @@
     //calcalc.SkipBlindPixelFit();
 
+    tlist.AddToList(&read);
     tlist.AddToList(&apply);
-    tlist.AddToList(&read);
+    tlist.AddToList(&merge);
     tlist.AddToList(&extract);
     tlist.AddToList(&calcalc);