Changeset 8013 for trunk/MagicSoft/Mars

Timestamp:

10/07/06 15:15:18 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhcalib/MHGausEvents.cc (modified) (1 diff)
• sponde.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -52 +52 @@
    * mbase/BaseLinkDef.h:
      - added namespace MAGIC.cc
+
+   * mhcalib/MHGausEvent.cc:
+     - disallow also non finite results
 
 

trunk/MagicSoft/Mars/mhcalib/MHGausEvents.cc

@@ -754 +754 @@
   fSigmaErr = fFGausFit->GetParError(2);
   fProb     = fFGausFit->GetProb();
+
   //
   // The fit result is accepted under condition:
-  // 1) The results are not nan's
-  // 2) The NDF is not smaller than fNDFLimit (default: fgNDFLimit)
-  // 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) 
+  // 1) The results are not NaN's  (not a number)
+  // 2) The results are all finite
+  // 3) The NDF is not smaller than fNDFLimit (default: fgNDFLimit)
+  // 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)
       || fFGausFit->GetNDF() < fNDFLimit 
       || fProb < fProbLimit )
     return kFALSE;
-  
+
   SetGausFitOK(kTRUE);
   return kTRUE;

trunk/MagicSoft/Mars/sponde.cc

@@ -30 +30 @@
     gLog << "                  Sponde - MARS V" << MARSVER             << endl;
     gLog << "               MARS -- SPectrum ON DEmand"                << endl;
-    gLog << "   Compiled with ROOT v" << ROOTVER << " on <" << __DATE__ << ">" << endl;
+    gLog << "   Compiled with ROOT v" << ROOT_RELEASE << " on <" << __DATE__ << ">" << endl;
     gLog << "========================================================" << endl;
     gLog << endl;
@@ -88 +88 @@
 int main(int argc, char **argv)
 {
+    if (!MARS::CheckRootVer())
+        return 0xff;
+
     //
     // Evaluate arguments