Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 3286)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 3287)
@@ -25,4 +25,7 @@
        CalcFFactorMethod(). The average QE was applied twice. 
        This error had been introduced on 13/02/04
+     - loosened criterium convFFactorRelErrLimit from 0.1 to 0.2
+     - CalcFFactor asks for IsChargeValid before calculating anything
+
 
    * mcalib/MCalibrate.cc
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc	(revision 3286)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc	(revision 3287)
@@ -109,5 +109,5 @@
 const Float_t MCalibrationChargePix::fgTimeLimit                = 1.5;
 const Float_t MCalibrationChargePix::fgTimeErrLimit             = 3.;
-const Float_t MCalibrationChargePix::fgConvFFactorRelErrLimit   = 0.1;
+const Float_t MCalibrationChargePix::fgConvFFactorRelErrLimit   = 0.2;
 // --------------------------------------------------------------------------
 //
@@ -696,4 +696,6 @@
 {
 
+  if (!IsChargeValid())
+      return kFALSE;
 
   if (fRSigmaCharge < 0.)
@@ -719,4 +721,5 @@
   const Float_t avQEFFactorErr            = 1./ ( 2. * avQEFFactor ) * fAverageQEErr 
                                             / ( fAverageQE * fAverageQE );
+
   const Float_t avQEFFactorRelErrSquare  = avQEFFactorErr  * avQEFFactorErr 
                                            / ( avQEFFactor * avQEFFactor) ;
@@ -735,6 +738,6 @@
   //
   const Float_t pheFFactorRelErrSquare =  ffactorsquareRelErrSquare
-                                        + chargeSquareRelErrSquare
-                                        + rsigmaSquareRelErrSquare;
+                                         + chargeSquareRelErrSquare
+                                         + rsigmaSquareRelErrSquare;
   fPheFFactorMethodErr                 =  TMath::Sqrt(pheFFactorRelErrSquare) * fPheFFactorMethod;
 
@@ -790,6 +793,4 @@
 }
 
-
-
 void MCalibrationChargePix::ApplyLoGainConversion()
 {
@@ -812,2 +813,3 @@
 
 }
+