Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc	(revision 3287)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc	(revision 3288)
@@ -109,5 +109,5 @@
 const Float_t MCalibrationChargePix::fgTimeLimit                = 1.5;
 const Float_t MCalibrationChargePix::fgTimeErrLimit             = 3.;
-const Float_t MCalibrationChargePix::fgConvFFactorRelErrLimit   = 0.2;
+const Float_t MCalibrationChargePix::fgConvFFactorRelErrLimit   = 0.25;
 // --------------------------------------------------------------------------
 //
@@ -684,5 +684,5 @@
   
   fRSigmaCharge    = TMath::Sqrt(rsigmachargesquare);
-  fRSigmaChargeErr = TMath::Sqrt(sigmaSquareErrSquare + pedRmsSquareErrSquare);
+  fRSigmaChargeErr = TMath::Sqrt(sigmaSquareErrSquare + pedRmsSquareErrSquare) / 2. / fRSigmaCharge;
 
   return kTRUE;
@@ -727,4 +727,5 @@
   const Float_t rsigmaSquare              =     fRSigmaCharge    * fRSigmaCharge;
   const Float_t rsigmaSquareRelErrSquare  = 4.* fRSigmaChargeErr * fRSigmaChargeErr / rsigmaSquare;
+
 
   //
@@ -757,13 +758,14 @@
   //
   const Float_t convRelErrSquare     =  ( pheFFactorRelErrSquare + chargeRelErrSquare + avQERelErrSquare);
-  
+
   if (convRelErrSquare < 0.)
       return kFALSE;
 
+
   const Float_t convRelErr           =  TMath::Sqrt(convRelErrSquare);
   fConversionFFactorMethodErr        = convRelErr * fMeanConversionFFactorMethod;
   
   if (convRelErr < fConvFFactorRelErrLimit)
-      SetFFactorMethodValid();
+    SetFFactorMethodValid();
 
   //