Changeset 3287 for trunk

Timestamp:

02/25/04 00:42:01 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationChargePix.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -25 +25 @@
        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

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.1;
+const Float_t MCalibrationChargePix::fgConvFFactorRelErrLimit   = 0.2;
 // --------------------------------------------------------------------------
 //
@@ -696 +696 @@
 {
 
+  if (!IsChargeValid())
+      return kFALSE;
 
   if (fRSigmaCharge < 0.)
@@ -719 +721 @@
   const Float_t avQEFFactorErr            = 1./ ( 2. * avQEFFactor ) * fAverageQEErr 
                                             / ( fAverageQE * fAverageQE );
+
   const Float_t avQEFFactorRelErrSquare  = avQEFFactorErr  * avQEFFactorErr 
                                            / ( avQEFFactor * avQEFFactor) ;
@@ -735 +738 @@
   //
   const Float_t pheFFactorRelErrSquare =  ffactorsquareRelErrSquare
-                                        + chargeSquareRelErrSquare
-                                        + rsigmaSquareRelErrSquare;
+                                         + chargeSquareRelErrSquare
+                                         + rsigmaSquareRelErrSquare;
   fPheFFactorMethodErr                 =  TMath::Sqrt(pheFFactorRelErrSquare) * fPheFFactorMethod;
 
@@ -790 +793 @@
 }
 
-
-
 void MCalibrationChargePix::ApplyLoGainConversion()
 {
@@ -812 +813 @@
 
 }
+