Changeset 8022 for trunk/MagicSoft

Timestamp:

10/08/06 14:26:04 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhist/MHCamera.cc (modified) (1 diff)
• mhist/MHHadronness.cc (modified) (1 diff)
• mhvstime/MHPixVsTime.cc (modified) (2 diffs)
• mhvstime/MHSectorVsTime.cc (modified) (2 diffs)
• mranforest/MRanForest.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -38 +38 @@
      - changed some protected data members of the base class
        into private data members
+
+   * mhflux/MAlphaFitter.cc, mhflux/MHEnergyEst.cc, mhist/MHCamera.cc,
+     mhist/MHHadronness.cc, mhvstime/MHPixVsTime.cc, 
+     mhvstime/MHSectorVsTime.cc, mranforest/MRanForest.cc:
+     - replaced IsNaN by !IsFinite (which includes IsNaN)
 
 

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -1643 +1643 @@
 Int_t MHCamera::GetColor(Float_t val, Float_t min, Float_t max, Bool_t islog)
 {
-    if (!TMath::Finite(val)) // FIXME: gLog!
-        return maxcolidx/2;
-
     //
     //   first treat the over- and under-flows
     //
     const Int_t maxcolidx = kItemsLegend-1;
+
+    if (!TMath::Finite(val)) // FIXME: gLog!
+        return maxcolidx/2;
 
     if (val >= max)

trunk/MagicSoft/Mars/mhist/MHHadronness.cc

@@ -211 +211 @@
     const Double_t h = TMath::Min(TMath::Max(had.GetVal(), 0.), 1.);
 
-    if (TMath::IsNaN(h))
+    if (!TMath::Finite(h))
         return kCONTINUE;
 

trunk/MagicSoft/Mars/mhvstime/MHPixVsTime.cc

@@ -180 +180 @@
     Double_t rms = 0;
     evt->GetPixelContent(val, fIndex, *fCam, fType);
-    if (TMath::IsNaN(val))
+    if (!TMath::Finite(val))
         return kCONTINUE;
 
@@ -194 +194 @@
     {
         evt->GetPixelContent(rms, fIndex, *fCam, fTypeErr);
-        if (TMath::IsNaN(rms))
+        if (!TMath::Finite(rms))
             return kCONTINUE;
     }

trunk/MagicSoft/Mars/mhvstime/MHSectorVsTime.cc

@@ -228 +228 @@
     const Double_t val0 = fHCamera.GetMeanSectors(fSectors, fAreaIndex);
 
-    if (TMath::IsNaN(val0))
+    if (!TMath::Finite(val0))
         return kTRUE;
 
@@ -236 +236 @@
     {
         const Double_t rms0 = fHCamera.GetRmsSectors(fSectors, fAreaIndex);
-        if (TMath::IsNaN(rms0))
+        if (!TMath::Finite(rms0))
             return kTRUE;
         ((TGraphErrors*)fGraph)->SetPointError(fGraph->GetN()-1, 0, rms0);

trunk/MagicSoft/Mars/mranforest/MRanForest.cc

@@ -574 +574 @@
             //isort[n]=n;
 
-            if(TMath::IsNaN(v[n]))
+            if (!TMath::Finite(v[n]))
             {
                 *fLog << err <<"Event no. "<<n<<", matrix column no. "<<mvar;
-                *fLog << err <<" has the value NaN."<<endl;
+                *fLog << err <<" has a non finite value (eg. NaN)."<<endl;
                 return kFALSE;
             }