Changeset 8020

Timestamp:

10/08/06 14:09:01 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MEnergyEstParam.cc (modified) (1 diff)
• manalysis/MEnergyEstParamDanielMkn421.cc (modified) (1 diff)
• mhcalib/MHCalibrationPix.cc (modified) (1 diff)
• mhcalib/MHGausEvents.cc (modified) (2 diffs)
• mhcalib/MHGausEvents.h (modified) (3 diffs)
• mhcalib/MHPedestalPix.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -31 +31 @@
    * mcalib/MCalibrationHiLoCam.[h,cc]:
      - broke down a long Form() chain into single Form()'s
+
+   * mhcalib/MHPedestalPix.cc, mhcalib/MHGausEvents.[h,cc], 
+     mhcalib/MHCalibrationChargeBlindPix.cc, 
+     mhcalib/MHCalibrationPix.cc:
+     - replaced IsNaN by !IsFinite (which includes IsNaN)
+     - changed some protected data members of the base class
+       into private data members
 
 

trunk/MagicSoft/Mars/manalysis/MEnergyEstParam.cc

@@ -359 +359 @@
             return kCONTINUE;
 
-        if (TMath::IsNaN(ir))
+        // !Finitite includes IsNaN
+        if (!TMath::Finite(ir))
             *fLog << all << theta << " " << width << " " << length << " " << size << " " << dist << endl;
-        if (TMath::IsNaN(er))
+        if (!TMath::Finite(er))
         {
             *fLog << all << theta << " " << width << " " << length << " " << size << " " << dist << endl;

trunk/MagicSoft/Mars/manalysis/MEnergyEstParamDanielMkn421.cc

@@ -358 +358 @@
             return kCONTINUE;
 
-        if (TMath::IsNaN(ir))
+        // !Finitite includes IsNaN
+        if (!TMath::Finite(ir))
             *fLog << all << theta << " " << width << " " << length << " " << size << " " << dist << endl;
-        if (TMath::IsNaN(er))
+        if (!TMath::Finite(er))
         {
             *fLog << all << theta << " " << width << " " << length << " " << size << " " << dist << endl;

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPix.cc

@@ -223 +223 @@
   // 3) The Probability is greater than fProbLimit (default: fgProbLimit)
   //
-  if (   TMath::IsNaN ( fMean     ) 
-      || TMath::IsNaN ( fMeanErr  )
-      || TMath::IsNaN ( fProb     )    
-      || TMath::IsNaN ( fSigma    )
-      || TMath::IsNaN ( fSigmaErr ) 
+  if (   !TMath::Finite( fMean     )
+      || !TMath::Finite( fMeanErr  )
+      || !TMath::Finite( fProb     )
+      || !TMath::Finite( fSigma    )
+      || !TMath::Finite( fSigmaErr )
       || fFGausFit->GetNDF() < GetNDFLimit()
       || fProb < GetProbLimit() )

trunk/MagicSoft/Mars/mhcalib/MHGausEvents.cc

@@ -129 +129 @@
       fHPowerProbability(NULL), 
       fPowerSpectrum(NULL),
-      fFGausFit(NULL), fFExpFit(NULL),
+      fFExpFit(NULL),
       fFirst(0.), 
       fGraphEvents(NULL), fGraphPowerSpectrum(NULL),
-      fLast(100.), fNbins(100)
+      fLast(100.), fNbins(100), fFGausFit(NULL)
 { 
 
@@ -762 +762 @@
   // 4) The Probability is greater than fProbLimit (default: fgProbLimit)
   //
-  if (   TMath::IsNaN(fMean)        || !TMath::Finite(fMean)
-      || TMath::IsNaN(fMeanErr)     || !TMath::Finite(fMeanErr)
-      || TMath::IsNaN(fProb)        || !TMath::Finite(fProb)
-      || TMath::IsNaN(fSigma)       || !TMath::Finite(fSigma)
-      || TMath::IsNaN(fSigmaErr)    || !TMath::Finite(fSigmaErr)
+  // !Finitite means either infinite or not-a-number
+  if (   !TMath::Finite(fMean)
+      || !TMath::Finite(fMeanErr)
+      || !TMath::Finite(fProb)
+      || !TMath::Finite(fSigma)
+      || !TMath::Finite(fSigmaErr)
       || fFGausFit->GetNDF() < fNDFLimit 
       || fProb < fProbLimit )

trunk/MagicSoft/Mars/mhcalib/MHGausEvents.h

@@ -35 +35 @@
   Float_t *CreatePSDXaxis  (Int_t n);           // Create an x-axis for the PSD TGraphs
   
-protected:
+private:
 
   Int_t    fBinsAfterStripping;        // Bins for the Gauss Histogram after stripping off the zeros at both ends
@@ -52 +52 @@
   
   MArrayF  fEvents;                    // Array which holds the entries of GausHist
-  TF1     *fFGausFit;                  // Gauss fit for fHGausHist
   TF1     *fFExpFit;                   // Exponential fit for FHPowerProbability
   Axis_t   fFirst;                     // Lower histogram edge  for fHGausHist (used by InitBins()) 
   TGraph  *fGraphEvents;               //! TGraph to display the event array 
   TGraph  *fGraphPowerSpectrum;        //! TGraph to display the power spectrum array 
+  Axis_t   fLast;                      // Upper histogram edge  for fHGausHist (used by InitBins()) 
+  Int_t    fNbins;                     // Number histogram bins for fHGausHist (used by InitBins())
+  Int_t    fNDFLimit;                  // NDF limit for judgement if fit is OK
+  Float_t  fProbLimit;                 // Probability limit for judgement if fit is OK 
+
+protected:
+  TF1     *fFGausFit;                  // Gauss fit for fHGausHist
   TH1F     fHGausHist;                 // Histogram to hold the Gaussian distribution
-  Axis_t   fLast;                      // Upper histogram edge  for fHGausHist (used by InitBins()) 
+
   Double_t fMean;                      // Mean of the Gauss fit
   Double_t fMeanErr;                   // Error of the mean of the Gauss fit
-  Int_t    fNbins;                     // Number histogram bins for fHGausHist (used by InitBins())
-  Int_t    fNDFLimit;                  // NDF limit for judgement if fit is OK
   Double_t fSigma;                     // Sigma of the Gauss fit
   Double_t fSigmaErr;                  // Error of the sigma of the Gauss fit
   Double_t fProb;                      // Probability of the Gauss fit 
-  Float_t  fProbLimit;                 // Probability limit for judgement if fit is OK 
 
   // Setters
@@ -137 +140 @@
   const Double_t GetSigmaErr()           const { return fSigmaErr;           }
   const Double_t GetSlope()              const { return ( fFExpFit  ? fFExpFit->GetParameter(1) : 0.); }
+  const Int_t    GetNDFLimit()           const { return fNDFLimit; }
+  const Float_t  GetProbLimit()          const { return fProbLimit; }
 
+  const Bool_t   IsValid()               const { return fMean!=0 || fSigma!=0; }
   const Bool_t   IsExcluded()            const { return TESTBIT(fFlags,kExcluded);          }
   const Bool_t   IsExpFitOK()            const { return TESTBIT(fFlags,kExpFitOK);          }

trunk/MagicSoft/Mars/mhcalib/MHPedestalPix.cc

@@ -136 +136 @@
   // 3) The Probability is greater than fProbLimit (default: fgProbLimit)
   //
-  if (   TMath::IsNaN(GetMean()) 
-      || TMath::IsNaN(GetMeanErr())
-      || TMath::IsNaN(GetProb())    
-      || TMath::IsNaN(GetSigma())
-      || TMath::IsNaN(GetSigmaErr()) 
-      || fProb < fProbLimit )
+  // !Finitite means either infinite or not-a-number
+  if (   !TMath::Finite(GetMean())
+      || !TMath::Finite(GetMeanErr())
+      || !TMath::Finite(GetProb())
+      || !TMath::Finite(GetSigma())
+      || !TMath::Finite(GetSigmaErr())
+      || fProb < GetProbLimit())
     return kFALSE;
   
@@ -222 +223 @@
   // 3) The Probability is greater than fProbLimit (default: fgProbLimit)
   //
-  if (   TMath::IsNaN(GetMean()) 
-      || TMath::IsNaN(GetMeanErr())
-      || TMath::IsNaN(GetProb())    
-      || TMath::IsNaN(GetSigma())
-      || TMath::IsNaN(GetSigmaErr()) 
-      || fProb < fProbLimit )
+  // !Finitite means either infinite or not-a-number
+  if (   !TMath::Finite(GetMean())
+      || !TMath::Finite(GetMeanErr())
+      || !TMath::Finite(GetProb())
+      || !TMath::Finite(GetSigma())
+      || !TMath::Finite(GetSigmaErr())
+      || fProb < GetProbLimit() )
     return kFALSE;