Changeset 3990 for trunk/MagicSoft/Mars/mcalib

Timestamp:

05/05/04 19:39:39 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc

@@ -79 +79 @@
 using namespace std;
 
-const Float_t MCalibrationChargePix::gkElectronicPedRms         = 1.5;
-const Float_t MCalibrationChargePix::gkElectronicPedRmsErr      = 0.1;
+const Float_t MCalibrationChargePix::gkElectronicPedRmsInner    = 1.5;
+const Float_t MCalibrationChargePix::gkElectronicPedRmsOuter    = 1.8;
+const Float_t MCalibrationChargePix::gkElectronicPedRmsErr      = 0.35;
 const Float_t MCalibrationChargePix::gkFFactor                  = 1.15;
 const Float_t MCalibrationChargePix::gkFFactorErr               = 0.02;
@@ -87 +88 @@
 const Float_t MCalibrationChargePix::fgConversionHiLoErr        = 2.5;
 const Float_t MCalibrationChargePix::fgPheFFactorMethodLimit    = 5.;
-const Float_t MCalibrationChargePix::fgConvFFactorRelErrLimit   = 0.5;
+const Float_t MCalibrationChargePix::fgConvFFactorRelErrLimit   = 0.75;
 // --------------------------------------------------------------------------
 //
@@ -605 +606 @@
   //
   fRSigmaSquare = sigmaSquare - pedRmsSquare;
+
   if (fRSigmaSquare <= 0.)
     {
@@ -690 +692 @@
   // 
   const Float_t convrelvar = ffactorsquareRelVar + GetMeanRelVar() + rsigmaSquareRelVar;
-
-  if (convrelvar > fConvFFactorRelVarLimit || convrelvar < 0.)
+  const Float_t limit      = IsHiGainSaturation() ? fConvFFactorRelVarLimit * 4. : fConvFFactorRelVarLimit;
+
+  if (convrelvar > limit || convrelvar < 0.)
     {
       *fLog << warn << GetDescriptor() << ": Conversion F-Factor Method Rel. Variance: " 
@@ -771 +774 @@
 //   Var (Low Gain Ped RMS Square) = Var(LoGain NSB square) + Var(elec.ped. square)
 //
-void MCalibrationChargePix::CalcLoGainPedestal(Float_t logainsamples)
+void MCalibrationChargePix::CalcLoGainPedestal(Float_t logainsamples, const Int_t aidx)
 {
 
@@ -780 +783 @@
     return;
 
-  const Float_t elecPedRms     = gkElectronicPedRms    * TMath::Sqrt(logainsamples);
+  const Float_t elecPedRms     = (aidx > 0 ? gkElectronicPedRmsOuter : gkElectronicPedRmsInner ) 
+                               * TMath::Sqrt(logainsamples);
   const Float_t elecPedRmsVar  = gkElectronicPedRmsErr * gkElectronicPedRmsErr * logainsamples;