Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 8021)
+++ trunk/MagicSoft/Mars/Changelog	(revision 8022)
@@ -38,4 +38,9 @@
      - 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)
 
 
Index: trunk/MagicSoft/Mars/mhist/MHCamera.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 8021)
+++ trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 8022)
@@ -1643,11 +1643,11 @@
 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)
Index: trunk/MagicSoft/Mars/mhist/MHHadronness.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHHadronness.cc	(revision 8021)
+++ trunk/MagicSoft/Mars/mhist/MHHadronness.cc	(revision 8022)
@@ -211,5 +211,5 @@
     const Double_t h = TMath::Min(TMath::Max(had.GetVal(), 0.), 1.);
 
-    if (TMath::IsNaN(h))
+    if (!TMath::Finite(h))
         return kCONTINUE;
 
Index: trunk/MagicSoft/Mars/mhvstime/MHPixVsTime.cc
===================================================================
--- trunk/MagicSoft/Mars/mhvstime/MHPixVsTime.cc	(revision 8021)
+++ trunk/MagicSoft/Mars/mhvstime/MHPixVsTime.cc	(revision 8022)
@@ -180,5 +180,5 @@
     Double_t rms = 0;
     evt->GetPixelContent(val, fIndex, *fCam, fType);
-    if (TMath::IsNaN(val))
+    if (!TMath::Finite(val))
         return kCONTINUE;
 
@@ -194,5 +194,5 @@
     {
         evt->GetPixelContent(rms, fIndex, *fCam, fTypeErr);
-        if (TMath::IsNaN(rms))
+        if (!TMath::Finite(rms))
             return kCONTINUE;
     }
Index: trunk/MagicSoft/Mars/mhvstime/MHSectorVsTime.cc
===================================================================
--- trunk/MagicSoft/Mars/mhvstime/MHSectorVsTime.cc	(revision 8021)
+++ trunk/MagicSoft/Mars/mhvstime/MHSectorVsTime.cc	(revision 8022)
@@ -228,5 +228,5 @@
     const Double_t val0 = fHCamera.GetMeanSectors(fSectors, fAreaIndex);
 
-    if (TMath::IsNaN(val0))
+    if (!TMath::Finite(val0))
         return kTRUE;
 
@@ -236,5 +236,5 @@
     {
         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);
Index: trunk/MagicSoft/Mars/mranforest/MRanForest.cc
===================================================================
--- trunk/MagicSoft/Mars/mranforest/MRanForest.cc	(revision 8021)
+++ trunk/MagicSoft/Mars/mranforest/MRanForest.cc	(revision 8022)
@@ -574,8 +574,8 @@
             //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;
             }