Index: /trunk/MagicSoft/Mars/mcalib/MCalibrate.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrate.cc	(revision 3436)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrate.cc	(revision 3437)
@@ -85,5 +85,7 @@
 // Default constructor. 
 //
-MCalibrate::MCalibrate(CalibrationMode_t calmode,const char *name, const char *title) : fCalibrationMode(calmode)
+MCalibrate::MCalibrate(CalibrationMode_t calmode,const char *name, const char *title) 
+    : fGeomCam(NULL), fCalibrations(NULL), fBadPixels(NULL), fSignals(NULL), 
+      fCerPhotEvt(NULL), fCalibrationMode(calmode)
 {
     fName  = name  ? name  : "MCalibrate";
@@ -111,4 +113,12 @@
     {
       *fLog << err << AddSerialNumber("MExtractedSignalCam") << " not found ... aborting" << endl;
+        return kFALSE;
+    }
+
+    fBadPixels = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam"));
+
+    if (!fBadPixels)
+    {
+      *fLog << err << AddSerialNumber("MBadPixelsCam") << " not found ... aborting" << endl;
         return kFALSE;
     }
@@ -217,11 +227,10 @@
       if(fCalibrationMode!=kNone)
 	{
+
 	  MCalibrationChargePix &pix = (*fCalibrations)[pixidx];       
-	  
-
-          //
-	  // Will be replaced by a call to MBadPixels
-          //if (!pix.IsChargeValid())
-          //continue;
+	  MBadPixelsPix         &bad = (*fBadPixels)[pixidx];
+
+          if (!bad.IsCalibrationResultOK())
+            continue;
 	  
 	  switch(fCalibrationMode)
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrate.h
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrate.h	(revision 3436)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrate.h	(revision 3437)
@@ -15,4 +15,5 @@
 
 class MGeomCam;
+class MBadPixelsCam;
 class MCalibrationChargeCam;
 class MExtractedSignalCam;
@@ -23,5 +24,6 @@
 private:
     MGeomCam              *fGeomCam;      // Camera geometry container
-    MCalibrationChargeCam *fCalibrations; // Calibration constants 
+    MCalibrationChargeCam *fCalibrations; // Calibration constants
+    MBadPixelsCam         *fBadPixels;    // Bad Pixels information
     MExtractedSignalCam   *fSignals;      // Integrated charge in FADCs counts
     MCerPhotEvt           *fCerPhotEvt;   // Cerenkov Photon Event used for calculation
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc	(revision 3436)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc	(revision 3437)
@@ -69,4 +69,7 @@
 #include "MPedPhotPix.h"
 
+#include "MBadPixelsCam.h"
+#include "MBadPixelsPix.h"
+
 #include "MCerPhotEvt.h"
 
@@ -78,5 +81,7 @@
 // Default constructor. 
 //
-MCalibrateData::MCalibrateData(CalibrationMode_t calmode,const char *name, const char *title) : fCalibrationMode(calmode)
+MCalibrateData::MCalibrateData(CalibrationMode_t calmode,const char *name, const char *title) 
+    : fCam(NULL), fPedestal(NULL), fBadPixels(NULL), fCalibrations(NULL), fSignals(NULL), 
+      fPedPhot(NULL), fCerPhotEvt(NULL), fCalibrationMode(calmode)
 {
     fName  = name  ? name  : "MCalibrateData";
@@ -112,4 +117,12 @@
     {
       *fLog << err << AddSerialNumber("MExtractedSignalCam") << " not found ... aborting" << endl;
+        return kFALSE;
+    }
+
+    fBadPixels = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam"));
+
+    if (!fBadPixels)
+    {
+      *fLog << err << AddSerialNumber("MBadPixelsCam") << " not found ... aborting" << endl;
         return kFALSE;
     }
@@ -236,11 +249,9 @@
   {
     MCalibrationChargePix &pix = (*fCalibrations)[pixidx];       
-	  
-    //
-    // Will be replaced by call to MBadPixels
-    //
-    //if (!pix.IsChargeValid())
-    //      return kFALSE;
-	  
+    MBadPixelsPix         &bad = (*fBadPixels)[pixidx];
+    
+    if (!bad.IsCalibrationResultOK())
+      return kFALSE;
+    
     hiloconv   = pix.GetConversionHiLo();
     hiloconverr= pix.GetConversionHiLoErr();
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrateData.h
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrateData.h	(revision 3436)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrateData.h	(revision 3437)
@@ -23,4 +23,5 @@
 
 class MGeomCam;
+class MBadPixelsCam;
 class MPedestalCam;
 class MCalibrationChargeCam;
@@ -35,4 +36,5 @@
     MGeomCam              *fCam;
     MPedestalCam          *fPedestal;     // Pedestals/slice [ADC counts]
+    MBadPixelsCam         *fBadPixels;    // Bad Pixels information
     MCalibrationChargeCam *fCalibrations; // Calibration constants 
     MExtractedSignalCam   *fSignals;      // Integrated charge in FADCs counts