Changeset 8019 for trunk

Timestamp:

10/08/06 14:03:51 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhcalib

Files:

• MHCalibrationChargeBlindPix.cc (modified) (1 diff)
• MHCalibrationPix.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindPix.cc

@@ -666 +666 @@
   // 4) at least fNumSinglePheLimit events are in the single Photo-electron peak
   //
-  if (   TMath::IsNaN(fLambda) 
-      || TMath::IsNaN(fLambdaErr)
-      || TMath::IsNaN(fProb)    
-      || TMath::IsNaN(fMu0)
-      || TMath::IsNaN(fMu0Err) 
-      || TMath::IsNaN(fMu1)
-      || TMath::IsNaN(fMu1Err) 
-      || TMath::IsNaN(fSigma0)
-      || TMath::IsNaN(fSigma0Err) 
-      || TMath::IsNaN(fSigma1)
-      || TMath::IsNaN(fSigma1Err) 
-      || fNDF  < fNDFLimit
-      || fProb < fProbLimit )
+  // !Finitite means either infinite or not-a-number
+  if (   !TMath::Finite(fLambda)
+      || !TMath::Finite(fLambdaErr)
+      || !TMath::Finite(fProb)
+      || !TMath::Finite(fMu0)
+      || !TMath::Finite(fMu0Err)
+      || !TMath::Finite(fMu1)
+      || !TMath::Finite(fMu1Err)
+      || !TMath::Finite(fSigma0)
+      || !TMath::Finite(fSigma0Err)
+      || !TMath::Finite(fSigma1)
+      || !TMath::Finite(fSigma1Err)
+      || fNDF  < GetNDFLimit()
+      || fProb < GetProbLimit() )
     return kFALSE;
 

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPix.cc

@@ -159 +159 @@
 const Double_t MHCalibrationPix::GetPickup() const 
 {
-  
-  if ((fMean == 0.) && (fSigma == 0.))
+  if (!IsValid())
     return -1.;
 
@@ -196 +195 @@
     return kTRUE;
 
-  if ((fMean == 0.) && (fSigma == 0.))
+  if (!IsValid())
     return FitGaus();
 
@@ -202 +201 @@
   // Get new fitting ranges
   //
-  Axis_t rmin = fMean - fBlackoutLimit * fSigma;
-  Axis_t rmax = fMean + fPickupLimit   * fSigma;
+  Axis_t rmin = GetMean() - fBlackoutLimit * GetSigma();
+  Axis_t rmax = GetMean() + fPickupLimit   * GetSigma();
 
   Axis_t hmin = fHGausHist.GetBinCenter(fHGausHist.GetXaxis()->GetFirst());
@@ -229 +228 @@
       || TMath::IsNaN ( fSigma    )
       || TMath::IsNaN ( fSigmaErr ) 
-      || fFGausFit->GetNDF() < fNDFLimit 
-      || fProb < fProbLimit )
+      || fFGausFit->GetNDF() < GetNDFLimit()
+      || fProb < GetProbLimit() )
     return kFALSE;