Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc	(revision 3353)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc	(revision 3354)
@@ -489,20 +489,20 @@
     {
     case 0:
-      if ((*this)[idx].IsExcluded() || !(*this)[idx].IsChargeValid())
+      if ((*this)[idx].IsExcluded())
         return kFALSE;
       val = (*this)[idx].GetMeanCharge();
       break;
     case 1:
-      if ((*this)[idx].IsExcluded() || !(*this)[idx].IsChargeValid())
+      if ((*this)[idx].IsExcluded())
         return kFALSE;
       val = (*this)[idx].GetMeanChargeErr();
       break;
     case 2:
-      if ((*this)[idx].IsExcluded() || !(*this)[idx].IsChargeValid())
+      if ((*this)[idx].IsExcluded())
         return kFALSE;
       val = (*this)[idx].GetSigmaCharge();
       break;
     case 3:
-      if ((*this)[idx].IsExcluded() || !(*this)[idx].IsChargeValid())
+      if ((*this)[idx].IsExcluded())
         return kFALSE;
       val = (*this)[idx].GetSigmaChargeErr();
Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.h
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.h	(revision 3353)
+++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeHiGainPix.h	(revision 3354)
@@ -25,6 +25,4 @@
   ~MHCalibrationChargeHiGainPix(){}
 
-  void Init();
-  
   // Setters
   void SetChargeNbins(const Int_t  bins =fgChargeNbins)          { fChargeNbins = bins;     }
@@ -35,6 +33,4 @@
   void SetAbsTimeFirst(const Axis_t first=fgAbsTimeFirst)        { fAbsTimeFirst = first;   }
   void SetAbsTimeLast (const Axis_t last =fgAbsTimeLast)         { fAbsTimeLast  = last;    }
-
-  void ChangeHistId(Int_t i);
 
   // Draw