Index: trunk/MagicSoft/Mars/mcalib/MCalibrationQECam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationQECam.cc	(revision 4200)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationQECam.cc	(revision 4201)
@@ -244,19 +244,31 @@
       break;
     case 2:
+      if (!pix.IsAverageQEBlindPixelAvailable())
+        return kFALSE;
       val = pix.GetQECascadesBlindPixel();
       break;
     case 3:
+      if (!pix.IsAverageQEBlindPixelAvailable())
+        return kFALSE;
       val = pix.GetQECascadesBlindPixelErr();
       break;
     case 4:
+      if (!pix.IsAverageQEPINDiodeAvailable())
+        return kFALSE;
       val = pix.GetQECascadesPINDiode();
       break;
     case 5:
+      if (!pix.IsAverageQEPINDiodeAvailable())
+        return kFALSE;
       val = pix.GetQECascadesPINDiodeErr();
       break;
     case 6:
+      if (!pix.IsAverageQECombinedAvailable())
+        return kFALSE;
       val = pix.GetQECascadesCombined();
       break;
     case 7:
+      if (!pix.IsAverageQECombinedAvailable())
+        return kFALSE;
       val = pix.GetQECascadesCombinedErr();
       break;