Changeset 2627 for trunk/MagicSoft/Mars/manalysis/MCalibrationPix.cc

Timestamp:

12/09/03 18:25:21 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/manalysis/MCalibrationPix.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/manalysis/MCalibrationPix.cc

@@ -50 +50 @@
       fSigmaCharge(-1.),
       fErrSigmaCharge(-1.),
+      fRSigma(-1.),
       fChargeProb(-1.),
       fPed(-1.),
@@ -56 +57 @@
       fSigmaTime(-1.),
       fTimeProb(-1.),
-      fRCharge(-1.),
-      fErrRCharge(-1.),
-      fRSigma(-1.),
       fFactor(1.3),
       fPheFFactorMethod(-1.),
-      fConversionFFactorMethod(-1.)
+      fConversionFFactorMethod(-1.),
+      fHiGainSaturation(kFALSE)
 {
 
@@ -102 +101 @@
 
   if (fPed && fPedRms)
-    fHist->SetLowerFitRange(fPed + 1.5*fPedRms);
+    fHist->SetLowerFitRange(3.5*fPedRms);
+  //    fHist->SetLowerFitRange(fPed + 3.5*fPedRms);
   else
     *fLog << warn << "Cannot set lower fit range to suppress cosmics: Pedestals not available" << endl;
 
-  if(!fHist->FitCharge())
+
+  if (fHiGainSaturation)
     {
-      *fLog << warn << "Could not fit charges of pixel " << fPixId << endl;
-      fHist->PrintChargeFitResult();
-      return kFALSE;
+      if(!fHist->FitChargeLoGain())
+        {
+          *fLog << warn << "Could not fit Lo Gain charges of pixel " << fPixId << endl;
+          fHist->PrintChargeFitResult();
+          return kFALSE;
+        }
+    }
+  else 
+    {
+      if(!fHist->FitChargeHiGain())
+        {
+          *fLog << warn << "Could not fit Hi Gain charges of pixel " << fPixId << endl;
+          fHist->PrintChargeFitResult();
+          return kFALSE;
+        }
     }
   
+
   fCharge         = fHist->GetChargeMean();
   fErrCharge      = fHist->GetChargeMeanErr(); 
@@ -122 +136 @@
     {
       
-    fRCharge      = fCharge - fPed;
-    fErrRCharge   = TMath::Sqrt(fErrCharge*fErrCharge + fPedRms*fPedRms);
-
     fRSigma       = (fSigmaCharge*fSigmaCharge) - (fPedRms*fPedRms);
 
     if (fRSigma > 0. )
       {
-       fPheFFactorMethod =  fFactor * fRCharge*fRCharge / fRSigma;
-       fConversionFFactorMethod = fPheFFactorMethod / fRCharge ;
+       fPheFFactorMethod =  fFactor * fCharge*fCharge / fRSigma;
+       fConversionFFactorMethod = fPheFFactorMethod /   fCharge ;
       }
     else
@@ -144 +155 @@
 }
 
+
 void MCalibrationPix::SetPedestal(Float_t ped, Float_t pedrms)
 {
@@ -150 +162 @@
   fPedRms = pedrms;
   
-  if ((fRCharge == -1.) && (fCharge > 0.)) 
-    fRCharge = fCharge - fPed;
-  if ((fErrRCharge == -1.) && (fErrCharge > 0.))
-    fErrRCharge   = TMath::Sqrt(fErrCharge*fErrCharge + fPedRms*fPedRms);
-
 }
 
@@ -160 +167 @@
 {
 
-  if(!fHist->FitTime())
+  if (fHiGainSaturation)
     {
-      *fLog << warn << "Could not fit times of pixel " << fPixId << endl;
-      fHist->PrintTimeFitResult();
-      return kFALSE;
+      if(!fHist->FitTimeLoGain())
+        {
+          *fLog << warn << "Could not fit Lo Gain times of pixel " << fPixId << endl;
+          fHist->PrintTimeFitResult();
+          return kFALSE;
+        }
     }
-
+  else
+    {
+      if(!fHist->FitTimeHiGain())
+        {
+          *fLog << warn << "Could not fit Hi Gain times of pixel " << fPixId << endl;
+          fHist->PrintTimeFitResult();
+          return kFALSE;
+        }
+    }
+    
   fTime       = fHist->GetTimeMean();
   fSigmaTime  = fHist->GetTimeSigma();