Changeset 3684

Timestamp:

04/08/04 20:02:43 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc

@@ -659 +659 @@
 //
 // Calculate the total F-Factor with the formula:
-//   fMeanFFactorFADC2Phot = Sqrt ( fRSigmaSquare / GetMeanSquare() ) * nphotons
+//   fMeanFFactorFADC2Phot = Sqrt ( fRSigmaSquare ) / GetMean()  * sqrt( nphotons )
 //
 // Calculate the error of the total F-Factor
@@ -678 +678 @@
     }
 
-  fMeanFFactorFADC2Phot =  TMath::Sqrt(fRSigmaSquare) / GetMean() * nphotons;
+  fMeanFFactorFADC2Phot =  TMath::Sqrt(fRSigmaSquare * nphotons) / GetMean() ;
   
   if (fMeanFFactorFADC2Phot < 0.)
@@ -688 +688 @@
   const Float_t ffactorrelvar = 0.25 * fRSigmaSquareVar / ( fRSigmaSquare * fRSigmaSquare) 
                               + GetMeanRelVar() 
-                              + nphotonsrelvar;
+                              + 0.25 * nphotonsrelvar;
   
   fMeanFFactorFADC2PhotVar    = ffactorrelvar * fMeanFFactorFADC2Phot * fMeanFFactorFADC2Phot;