Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 3687)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 3688)
@@ -1045,5 +1045,8 @@
       qepix.SetQEFFactor    ( qe            , fPulserColor );
       qepix.SetQEFFactorVar ( qerelvar*qe*qe, fPulserColor );      
-      qepix.UpdateFFactorMethod();
+      qepix.SetFFactorMethodValid(  kTRUE   , fPulserColor );
+
+      if (!qepix.UpdateFFactorMethod())
+        *fLog << warn << GetDescriptor() << ": Cannot update Quantum efficiencies with the F-Factor Method" << endl;
     }
 }
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.h
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.h	(revision 3687)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.h	(revision 3688)
@@ -30,6 +30,4 @@
   static const Float_t gkDefaultQEUVErr;      //! Uncertainty Def. QE  at 370 nm (now set to: 0.07)
   static const Float_t gkDefaultQECT1Err;     //! Uncertainty Def. QE  at 370 nm (now set to: 0.07)
-  static const Float_t gkDefaultAverageQE;    //! Default QE folded into Cascade spectrum (now set to: 0.18)
-  static const Float_t gkDefaultAverageQEErr; //! Uncertainty Def. QE Cascade spectrum    (now set to: 0.02)
   
   TArrayF fQEBlindPixel;                     // Calibrated QEs    (Blind Pixel Method)
@@ -73,4 +71,7 @@
   
 public:
+
+  static const Float_t gkDefaultAverageQE;    //! Default QE folded into Cascade spectrum (now set to: 0.18)
+  static const Float_t gkDefaultAverageQEErr; //! Uncertainty Def. QE Cascade spectrum    (now set to: 0.02)
 
   MCalibrationQEPix(const char *name=NULL, const char *title=NULL);
Index: /trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.cc	(revision 3687)
+++ /trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.cc	(revision 3688)
@@ -50,4 +50,7 @@
 #include "MCalibrationChargeCam.h"
 
+#include "MCalibrationQEPix.h"
+#include "MCalibrationQECam.h"
+
 #include "MGeomCam.h"
 #include "MRawRunHeader.h"
@@ -103,4 +106,11 @@
     {
         *fLog << err << AddSerialNumber("MCalibrationChargeCam") << "not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    fQECam = (MCalibrationQECam*) pList->FindObject(AddSerialNumber("MCalibrationQECam"));
+    if (!fQECam)
+    {
+        *fLog << err << AddSerialNumber("MCalibrationQECam") << "not found... aborting." << endl;
         return kFALSE;
     }
@@ -244,11 +254,19 @@
 
     const Int_t num = fCalCam->GetSize();
+
     for (int i=0; i<num; i++)
     {
+
         MCalibrationChargePix &calpix = (MCalibrationChargePix&)(*fCalCam)[i];
-
-        const Float_t factor = fADC2Phot*calpix.GetMeanConversionBlindPixelMethod();
-
-        calpix.SetConversionBlindPixelMethod(factor, 0., 0.);
+        //        MCalibrationQEPix     &qepix  = (MCalibrationQEPix&)    (*fQECam) [i];
+
+        const Float_t qe     = MCalibrationQEPix::gkDefaultAverageQE;
+        const Float_t factor = fADC2Phot/qe*calpix.GetMeanConvFADC2Phe();
+        //
+        // FIXME: Now, only the conversion to PHe is stored, need also the quantum efficiency simulated!!!
+        //
+        calpix.SetMeanConvFADC2Phe(factor);
+        calpix.SetMeanConvFADC2PheVar(0.);
+        calpix.SetMeanFFactorFADC2Phot(0.);
     }