Index: trunk/MagicSoft/Mars/mcalib/MCalibrationQECam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationQECam.cc	(revision 3714)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationQECam.cc	(revision 3715)
@@ -71,68 +71,4 @@
 // See also: MCalibrationQEPix, MCalibrationChargeCam, MCalibrationChargeCalc
 //           MCalibrationChargeBlindPix, MCalibrationChargePINDiode, MCalibrationChargePix
-//
-//                                                                         
-// The calculated values (types of GetPixelContent()) are:
-// 
-//
-// Types used by MCalibrate and MCalibrateData: 
-// ============================================
-//
-// 0: Mean Quantum Efficiency for cascades, obtained with the F-Factor method
-// 1: Error of the Mean QE for cascades, obtained with the F-Factor method
-// 2: Mean Quantum Efficiency for cascades, obtained with the Blind Pixel method
-// 3: Error of the Mean QE for cascades, obtained with the Blind Pixel method
-// 4: Mean Quantum Efficiency for cascades, obtained with the PIN Diode method
-// 5: Error of the Mean QE for cascades, obtained with the PIN Diode method
-// 6: Mean Quantum Efficiency for cascades, obtained with combination of the 3 methods
-// 7: Error of the Mean QE for cascades, obtained with combination of the 3 methods
-//
-// Types filled by MCalibrationChargeCalc in combination of MCalibrationChargePix:
-// ===============================================================================
-//
-// 8:  Mean Quantum Efficiency obtained with F-Factor Method ( color: kCT1)
-// 9:  Error of the Mean QE obtained with F-Factor Method ( color: kCT1)
-// 10: Mean Quantum Efficiency obtained with F-Factor Method ( color: kGREEN)
-// 11: Error of the Mean QE obtained with F-Factor Method ( color: kGREEN)
-// 12: Mean Quantum Efficiency obtained with F-Factor Method ( color: kBLUE)
-// 13: Error of the Mean QE obtained with F-Factor Method ( color: kBLUE)
-// 14: Mean Quantum Efficiency obtained with F-Factor Method ( color: kUV)
-// 15: Error of the Mean QE obtained with F-Factor Method ( color: kUV)
-//
-// Types filled by MCalibrationChargeCalc in combination of MCalibrationChargeBlindPix:
-// ====================================================================================
-//
-// 16: Mean Quantum Efficiency obtained with Blind Pixel Method ( color: kCT1)
-// 17: Error of the Mean QE obtained with Blind Pixel Method ( color: kCT1)
-// 18: Mean Quantum Efficiency obtained with Blind Pixel Method ( color: kGREEN)
-// 19: Error of the Mean QE obtained with Blind Pixel Method ( color: kGREEN)
-// 20: Mean Quantum Efficiency obtained with Blind Pixel Method ( color: kBLUE)
-// 21: Error of the Mean QE obtained with Blind Pixel Method ( color: kBLUE)
-// 22: Mean Quantum Efficiency obtained with Blind Pixel Method ( color: kUV)
-// 23: Error of the Mean QE obtained with Blind Pixel Method ( color: kUV)
-//
-// Types filled by MCalibrationChargeCalc in combination of MCalibrationChargePINDiode:
-// ====================================================================================
-//
-// 24: Mean Quantum Efficiency obtained with PIN Diode Method ( color: kCT1)
-// 25: Error of the Mean QE obtained with PIN Diode Method ( color: kCT1)
-// 26: Mean Quantum Efficiency obtained with PIN Diode Method ( color: kGREEN)
-// 27: Error of the Mean QE obtained with PIN Diode Method ( color: kGREEN)
-// 28: Mean Quantum Efficiency obtained with PIN Diode Method ( color: kBLUE)
-// 29: Error of the Mean QE obtained with PIN Diode Method ( color: kBLUE)
-// 30: Mean Quantum Efficiency obtained with PIN Diode Method ( color: kUV)
-// 31: Error of the Mean QE obtained with PIN Diode Method ( color: kUV)
-//
-// Types filled by MCalibrationChargeCalc in combination of MCalibrationQEPix:
-// ===========================================================================
-//
-// 24: Mean Quantum Efficiency obtained with combination of 3 methods ( color: kCT1)
-// 25: Error of the Mean QE obtained with combination of 3 methods ( color: kCT1)
-// 26: Mean Quantum Efficiency obtained with combination of 3 methods ( color: kGREEN)
-// 27: Error of the Mean QE obtained with combination of 3 methods ( color: kGREEN)
-// 28: Mean Quantum Efficiency obtained with combination of 3 methods ( color: kBLUE)
-// 29: Error of the Mean QE obtained with combination of 3 methods ( color: kBLUE)
-// 30: Mean Quantum Efficiency obtained with combination of 3 methods ( color: kUV)
-// 31: Error of the Mean QE obtained with combination of 3 methods ( color: kUV)
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -235,52 +171,56 @@
 // 6: Mean Quantum Efficiency for cascades, obtained with combination of the 3 methods
 // 7: Error of the Mean QE for cascades, obtained with combination of the 3 methods
+// 8: Availabiliy of Quantum Efficiency for cascades, F-Factor method
+// 9: Availabiliy of Quantum Efficiency for cascades, F-Factor method
+// 10: Availabiliy of Quantum Efficiency for cascades, F-Factor method
+// 11: Availabiliy of Quantum Efficiency for cascades, F-Factor method
 //
 // Types filled by MCalibrationChargeCalc in combination of MCalibrationChargePix:
 // ===============================================================================
 //
-// 8:  Mean Quantum Efficiency obtained with F-Factor Method ( color: kCT1)
-// 9:  Error of the Mean QE obtained with F-Factor Method ( color: kCT1)
-// 10: Mean Quantum Efficiency obtained with F-Factor Method ( color: kGREEN)
-// 11: Error of the Mean QE obtained with F-Factor Method ( color: kGREEN)
-// 12: Mean Quantum Efficiency obtained with F-Factor Method ( color: kBLUE)
-// 13: Error of the Mean QE obtained with F-Factor Method ( color: kBLUE)
-// 14: Mean Quantum Efficiency obtained with F-Factor Method ( color: kUV)
-// 15: Error of the Mean QE obtained with F-Factor Method ( color: kUV)
+// 12: Mean Quantum Efficiency obtained with F-Factor Method ( color: kCT1)
+// 13: Error of the Mean QE obtained with F-Factor Method ( color: kCT1)
+// 14: Mean Quantum Efficiency obtained with F-Factor Method ( color: kGREEN)
+// 15: Error of the Mean QE obtained with F-Factor Method ( color: kGREEN)
+// 16: Mean Quantum Efficiency obtained with F-Factor Method ( color: kBLUE)
+// 17: Error of the Mean QE obtained with F-Factor Method ( color: kBLUE)
+// 18: Mean Quantum Efficiency obtained with F-Factor Method ( color: kUV)
+// 19: Error of the Mean QE obtained with F-Factor Method ( color: kUV)
 //
 // Types filled by MCalibrationChargeCalc in combination of MCalibrationChargeBlindPix:
 // ====================================================================================
 //
-// 16: Mean Quantum Efficiency obtained with Blind Pixel Method ( color: kCT1)
-// 17: Error of the Mean QE obtained with Blind Pixel Method ( color: kCT1)
-// 18: Mean Quantum Efficiency obtained with Blind Pixel Method ( color: kGREEN)
-// 19: Error of the Mean QE obtained with Blind Pixel Method ( color: kGREEN)
-// 20: Mean Quantum Efficiency obtained with Blind Pixel Method ( color: kBLUE)
-// 21: Error of the Mean QE obtained with Blind Pixel Method ( color: kBLUE)
-// 22: Mean Quantum Efficiency obtained with Blind Pixel Method ( color: kUV)
-// 23: Error of the Mean QE obtained with Blind Pixel Method ( color: kUV)
+// 20: Mean Quantum Efficiency obtained with Blind Pixel Method ( color: kCT1)
+// 21: Error of the Mean QE obtained with Blind Pixel Method ( color: kCT1)
+// 22: Mean Quantum Efficiency obtained with Blind Pixel Method ( color: kGREEN)
+// 23: Error of the Mean QE obtained with Blind Pixel Method ( color: kGREEN)
+// 24: Mean Quantum Efficiency obtained with Blind Pixel Method ( color: kBLUE)
+// 25: Error of the Mean QE obtained with Blind Pixel Method ( color: kBLUE)
+// 26: Mean Quantum Efficiency obtained with Blind Pixel Method ( color: kUV)
+// 27: Error of the Mean QE obtained with Blind Pixel Method ( color: kUV)
 //
 // Types filled by MCalibrationChargeCalc in combination of MCalibrationChargePINDiode:
 // ====================================================================================
 //
-// 24: Mean Quantum Efficiency obtained with PIN Diode Method ( color: kCT1)
-// 25: Error of the Mean QE obtained with PIN Diode Method ( color: kCT1)
-// 26: Mean Quantum Efficiency obtained with PIN Diode Method ( color: kGREEN)
-// 27: Error of the Mean QE obtained with PIN Diode Method ( color: kGREEN)
-// 28: Mean Quantum Efficiency obtained with PIN Diode Method ( color: kBLUE)
-// 29: Error of the Mean QE obtained with PIN Diode Method ( color: kBLUE)
-// 30: Mean Quantum Efficiency obtained with PIN Diode Method ( color: kUV)
-// 31: Error of the Mean QE obtained with PIN Diode Method ( color: kUV)
+// 28: Mean Quantum Efficiency obtained with PIN Diode Method ( color: kCT1)
+// 29: Error of the Mean QE obtained with PIN Diode Method ( color: kCT1)
+// 30: Mean Quantum Efficiency obtained with PIN Diode Method ( color: kGREEN)
+// 31: Error of the Mean QE obtained with PIN Diode Method ( color: kGREEN)
+// 32: Mean Quantum Efficiency obtained with PIN Diode Method ( color: kBLUE)
+// 33: Error of the Mean QE obtained with PIN Diode Method ( color: kBLUE)
+// 34: Mean Quantum Efficiency obtained with PIN Diode Method ( color: kUV)
+// 35: Error of the Mean QE obtained with PIN Diode Method ( color: kUV)
 //
 // Types filled by MCalibrationChargeCalc in combination of MCalibrationQEPix:
 // ===========================================================================
 //
-// 24: Mean Quantum Efficiency obtained with combination of 3 methods ( color: kCT1)
-// 25: Error of the Mean QE obtained with combination of 3 methods ( color: kCT1)
-// 26: Mean Quantum Efficiency obtained with combination of 3 methods ( color: kGREEN)
-// 27: Error of the Mean QE obtained with combination of 3 methods ( color: kGREEN)
-// 28: Mean Quantum Efficiency obtained with combination of 3 methods ( color: kBLUE)
-// 29: Error of the Mean QE obtained with combination of 3 methods ( color: kBLUE)
-// 30: Mean Quantum Efficiency obtained with combination of 3 methods ( color: kUV)
-// 31: Error of the Mean QE obtained with combination of 3 methods ( color: kUV)
+// 36: Mean Quantum Efficiency obtained with combination of 3 methods ( color: kCT1)
+// 37: Error of the Mean QE obtained with combination of 3 methods ( color: kCT1)
+// 38: Mean Quantum Efficiency obtained with combination of 3 methods ( color: kGREEN)
+// 39: Error of the Mean QE obtained with combination of 3 methods ( color: kGREEN)
+// 40: Mean Quantum Efficiency obtained with combination of 3 methods ( color: kBLUE)
+// 41: Error of the Mean QE obtained with combination of 3 methods ( color: kBLUE)
+// 42: Mean Quantum Efficiency obtained with combination of 3 methods ( color: kUV)
+// 43: Error of the Mean QE obtained with combination of 3 methods ( color: kUV)
 //
 Bool_t MCalibrationQECam::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const
@@ -322,97 +262,121 @@
       break;
     case 8:
+      if (pix.IsAverageQEFFactorAvailable())
+        val = 1;
+      else
+        return kFALSE;
+      break;
+    case 9:
+      if (pix.IsAverageQEBlindPixelAvailable())
+        val = 1;
+      else
+        return kFALSE;
+      break;
+    case 10:
+      if (pix.IsAverageQEPINDiodeAvailable())
+        val = 1;
+      else
+        return kFALSE;
+      break;
+    case 11:
+      if (pix.IsAverageQECombinedAvailable())
+        val = 1;
+      else
+        return kFALSE;
+      break;
+    case 12:
       val = pix.GetQEFFactor(kCT1);
       break;
-    case 9:
+    case 13:
       val = pix.GetQEFFactorErr(kCT1);
       break;
-    case 10:
+    case 14:
       val = pix.GetQEFFactor(kGREEN);
       break;
-    case 11:
+    case 15:
       val = pix.GetQEFFactorErr(kGREEN);
       break;
-    case 12:
+    case 16:
       val = pix.GetQEFFactor(kBLUE);
       break;
-    case 13:
+    case 17:
       val = pix.GetQEFFactorErr(kBLUE);
       break;
-    case 14:
+    case 18:
       val = pix.GetQEFFactor(kUV);
       break;
-    case 15:
+    case 19:
       val = pix.GetQEFFactorErr(kUV);
       break;
-    case 16:
+    case 20:
       val = pix.GetQEBlindPixel(kCT1);
       break;
-    case 17:
+    case 21:
       val = pix.GetQEBlindPixelErr(kCT1);
       break;
-    case 18:
+    case 22:
       val = pix.GetQEBlindPixel(kGREEN);
       break;
-    case 19:
+    case 23:
       val = pix.GetQEBlindPixelErr(kGREEN);
       break;
-    case 20:
+    case 24:
       val = pix.GetQEBlindPixel(kBLUE);
       break;
-    case 21:
+    case 25:
       val = pix.GetQEBlindPixelErr(kBLUE);
       break;
-    case 22:
+    case 26:
       val = pix.GetQEBlindPixel(kUV);
       break;
-    case 23:
+    case 27:
       val = pix.GetQEBlindPixelErr(kUV);
       break;
-    case 24:
+    case 28:
       val = pix.GetQEPINDiode(kCT1);
       break;
-    case 25:
+    case 29:
       val = pix.GetQEPINDiodeErr(kCT1);
       break;
-    case 26:
+    case 30:
       val = pix.GetQEPINDiode(kGREEN);
       break;
-    case 27:
+    case 31:
       val = pix.GetQEPINDiodeErr(kGREEN);
       break;
-    case 28:
+    case 32:
       val = pix.GetQEPINDiode(kBLUE);
       break;
-    case 29:
+    case 33:
       val = pix.GetQEPINDiodeErr(kBLUE);
       break;
-    case 30:
+    case 34:
       val = pix.GetQEPINDiode(kUV);
       break;
-    case 31:
+    case 35:
       val = pix.GetQEPINDiodeErr(kUV);
       break;
-    case 32:
+    case 36:
       val = pix.GetQECombined(kCT1);
       break;
-    case 33:
+    case 37:
       val = pix.GetQECombinedErr(kCT1);
       break;
-    case 34:
+    case 38:
       val = pix.GetQECombined(kGREEN);
       break;
-    case 35:
+    case 39:
       val = pix.GetQECombinedErr(kGREEN);
       break;
-    case 36:
+    case 40:
       val = pix.GetQECombined(kBLUE);
       break;
-    case 37:
+    case 41:
       val = pix.GetQECombinedErr(kBLUE);
       break;
-    case 38:
+    case 42:
       val = pix.GetQECombined(kUV);
       break;
-    case 39:
+    case 43:
       val = pix.GetQECombinedErr(kUV);
       break;