Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 4850)
+++ trunk/MagicSoft/Mars/Changelog	(revision 4851)
@@ -30,4 +30,5 @@
 
    * mcalib/MCalibrationQEPix.[h,cc]
+   * mcalib/MCalibrationChargeCalc.[h,cc]
      - fixed UpdateCombinedMethod, removed AddAverageCombinedQEs
 
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 4850)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 4851)
@@ -711,4 +711,5 @@
   FinalizeBlindPixelQECam();
   FinalizePINDiodeQECam();
+  FinalizeCombinedQECam();
 
   //
@@ -1883,4 +1884,31 @@
 }
 
+// ------------------------------------------------------------------------
+//
+// Loop over pixels: 
+//
+// - Call MCalibrationQEPix::UpdateCombinedMethod()
+//
+void MCalibrationChargeCalc::FinalizeCombinedQECam()
+{
+  
+  const UInt_t npixels  = fGeom->GetNumPixels();
+
+  for (UInt_t i=0; i<npixels; i++)
+    {
+      
+      MCalibrationQEPix   &qepix = (MCalibrationQEPix&)  (*fQECam)[i];
+      MBadPixelsPix       &bad   = (*fBadPixels)[i];
+
+      if (!bad.IsUnsuitable (MBadPixelsPix::kUnsuitableRun))
+        {
+          qepix.SetPINDiodeMethodValid(kFALSE, fPulserColor);
+          continue;
+        }
+      
+      qepix.UpdateCombinedMethod();
+    }
+}
+
 // -----------------------------------------------------------------------------------------------
 //
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h	(revision 4850)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h	(revision 4851)
@@ -104,4 +104,5 @@
   void   FinalizeBlindPixelQECam ();
   void   FinalizePINDiodeQECam   ();
+  void   FinalizeCombinedQECam   ();
   void   FinalizeUnsuitablePixels();