Index: /trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc	(revision 3424)
+++ /trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc	(revision 3425)
@@ -242,5 +242,4 @@
 
 	calpix.SetBlindPixelMethodValid();
-	calpix.SetChargeValid();
 
 	calpix.SetConversionHiLo(fConversionHiLo);
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrate.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrate.cc	(revision 3424)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrate.cc	(revision 3425)
@@ -73,4 +73,7 @@
 #include "MExtractedSignalPix.h"
 
+#include "MBadPixelsCam.h"
+#include "MBadPixelsPix.h"
+
 #include "MCerPhotEvt.h"
 
@@ -216,6 +219,9 @@
 	  MCalibrationChargePix &pix = (*fCalibrations)[pixidx];       
 	  
-	  if (!pix.IsChargeValid())
-	    continue;
+
+          //
+	  // Will be replaced by a call to MBadPixels
+          //if (!pix.IsChargeValid())
+          //continue;
 	  
 	  switch(fCalibrationMode)
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc	(revision 3424)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc	(revision 3425)
@@ -237,6 +237,9 @@
     MCalibrationChargePix &pix = (*fCalibrations)[pixidx];       
 	  
-    if (!pix.IsChargeValid())
-      return kFALSE;
+    //
+    // Will be replaced by call to MBadPixels
+    //
+    //if (!pix.IsChargeValid())
+    //      return kFALSE;
 	  
     hiloconv   = pix.GetConversionHiLo();