Changeset 3288

Timestamp:

02/25/04 01:22:29 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc

@@ -109 +109 @@
 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 +684 @@
   
   fRSigmaCharge    = TMath::Sqrt(rsigmachargesquare);
-  fRSigmaChargeErr = TMath::Sqrt(sigmaSquareErrSquare + pedRmsSquareErrSquare);
+  fRSigmaChargeErr = TMath::Sqrt(sigmaSquareErrSquare + pedRmsSquareErrSquare) / 2. / fRSigmaCharge;
 
   return kTRUE;
@@ -727 +727 @@
   const Float_t rsigmaSquare              =     fRSigmaCharge    * fRSigmaCharge;
   const Float_t rsigmaSquareRelErrSquare  = 4.* fRSigmaChargeErr * fRSigmaChargeErr / rsigmaSquare;
+
 
   //
@@ -757 +758 @@
   //
   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();
 
   //