Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 3417)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 3418)
@@ -18,4 +18,6 @@
       (now accessible from MBadPixelsCam)
 
+  * mcalib/MCalibrationChargePix.[h,cc]
+    - include MBadPixelsCam
 
 2004/03/05: Nadia Tonello
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 3417)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 3418)
@@ -275,10 +275,9 @@
         return kFALSE;
 
-    fCam->SetPINDiode(fPINDiode);
-
     fBlindPixel = (MCalibrationChargeBlindPix*)pList->FindCreateObj("MCalibrationChargeBlindPix");
     if (!fBlindPixel)
         return kFALSE;
 
+    fCam->SetPINDiode(fPINDiode);
     fCam->SetBlindPixel(fBlindPixel);
 
@@ -333,5 +332,4 @@
   
   fCam->SetGeomCam(fGeom);
-  fCam->SetBadPixelsCam(fBadPixels);
 
   fNumHiGainSamples  =  fSignals->GetNumUsedHiGainFADCSlices();
@@ -392,4 +390,11 @@
 
       MCalibrationChargePix &pix = (*fCam)[pixid];
+      MBadPixelsPix         &bad = (*fBadPixels)[pixid];
+
+      //
+      // Check if the pixel has been excluded from the fits
+      //
+      if (pix.IsExcluded())
+        continue;
 
       //
@@ -400,10 +405,4 @@
       const Float_t num    = TMath::Sqrt((Float_t)fPedestals->GetTotalEntries());
 
-      //
-      // Check if the pixel has been excluded from the fits
-      //
-      if (pix.IsExcluded())
-        continue;
-
       if (fGeom->GetPixRatio(pixid) == 1.)
       {
@@ -436,5 +435,5 @@
       }
 
-      if (!pix.CheckChargeValidity() || !pix.CheckTimeValidity())
+      if (!pix.CheckChargeValidity(&bad) || !pix.CheckTimeValidity(&bad))
 	  continue;
 
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc	(revision 3417)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc	(revision 3418)
@@ -90,4 +90,6 @@
 #include "MLogManip.h"
 
+#include "MBadPixelsPix.h"
+
 ClassImp(MCalibrationChargePix);
 
@@ -507,5 +509,5 @@
 
 
-Bool_t MCalibrationChargePix::IsExcluded()            const
+Bool_t MCalibrationChargePix::IsExcluded()     const
 { 
    return TESTBIT(fFlags,kExcluded);  
@@ -576,5 +578,5 @@
 // 4) Pixel has a charge sigma bigger than its Pedestal RMS
 // 
-Bool_t MCalibrationChargePix::CheckChargeValidity()
+Bool_t MCalibrationChargePix::CheckChargeValidity(MBadPixelsPix *bad)
 {
  
@@ -618,5 +620,5 @@
 // The mean arrival time is at least 1.0 slices from the used edge slices 
 //
-Bool_t MCalibrationChargePix::CheckTimeValidity()
+Bool_t MCalibrationChargePix::CheckTimeValidity(MBadPixelsPix *bad)
 {
 
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.h
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.h	(revision 3417)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.h	(revision 3418)
@@ -6,4 +6,5 @@
 #endif
 
+class MBadPixelsPix;
 class MCalibrationChargePix : public MParContainer
 {
@@ -297,6 +298,6 @@
   void  ApplyLoGainConversion();
 
-  Bool_t CheckChargeValidity();
-  Bool_t CheckTimeValidity();
+  Bool_t CheckChargeValidity ( MBadPixelsPix *bad=NULL );
+  Bool_t CheckTimeValidity   ( MBadPixelsPix *bad=NULL );
   Bool_t CalcReducedSigma();
   Bool_t CalcFFactorMethod();