Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc	(revision 4847)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc	(revision 4848)
@@ -600,9 +600,11 @@
         continue;
 
+      const MCalibrationQEPix &qepix = (MCalibrationQEPix&)qecam[i];
+      if (!qepix.IsAverageQECombinedAvailable())
+        continue;
+      
       const MCalibrationChargePix &pix = (MCalibrationChargePix&)(*this)[i];
       const Float_t conv = pix.GetMeanConvFADC2Phe();
-
-      const MCalibrationQEPix &qepix = (MCalibrationQEPix&)qecam[i];
-      const Float_t qe = qepix.GetQECascadesCombined();
+      const Float_t qe   = qepix.GetQECascadesCombined();
 
       mean  += conv/qe;
@@ -653,8 +655,10 @@
         continue;
 
+      const MCalibrationQEPix &qepix = (MCalibrationQEPix&)qecam[i];
+      if (!qepix.IsAverageQECombinedAvailable())
+        continue;
+      
       const MCalibrationChargePix &pix = (MCalibrationChargePix&)(*this)[i];
       const Float_t conv = pix.GetMeanConvFADC2Phe();
-
-      const MCalibrationQEPix &qepix = (MCalibrationQEPix&)qecam[i];
       const Float_t qe = qepix.GetQECascadesCombined();