Index: trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc
===================================================================
--- trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc	(revision 8020)
+++ trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc	(revision 8021)
@@ -170,5 +170,6 @@
     fSignificanceExc  = MMath::SignificanceLiMaExc(fEventsSignal, fEventsBackground);
 
-    if (TMath::IsNaN(fSignificance))
+    // !Finitite includes IsNaN
+    if (!TMath::Finite(fSignificance))
         fSignificance=0;
 
@@ -373,5 +374,6 @@
     fSignificanceExc  = MMath::SignificanceLiMaExc(fEventsSignal, fEventsBackground/alpha, alpha);
 
-    if (TMath::IsNaN(fSignificance))
+    // !Finitite includes IsNaN
+    if (!TMath::Finite(fSignificance))
         fSignificance=0;
     if (fEventsExcess<0)
Index: trunk/MagicSoft/Mars/mhflux/MHEnergyEst.cc
===================================================================
--- trunk/MagicSoft/Mars/mhflux/MHEnergyEst.cc	(revision 8020)
+++ trunk/MagicSoft/Mars/mhflux/MHEnergyEst.cc	(revision 8021)
@@ -212,7 +212,7 @@
 {
     const Double_t res = TMath::Sqrt(fChisq-fBias*fBias);
-    if (TMath::IsNaN(res))
+    if (!TMath::Finite(res))
     {
-        *fLog << all << "MHEnergyEst::Print: ERROR - Resolution is NaN (not a number)." << endl;
+        *fLog << all << "MHEnergyEst::Print: ERROR - Resolution is not finite (eg. NaN)." << endl;
         return;
     }
Index: trunk/MagicSoft/Mars/mhist/MHCamera.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 8020)
+++ trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 8021)
@@ -938,5 +938,5 @@
         if (!issame)
         {
-            const Bool_t isnan = TMath::IsNaN(fArray[i+1]);
+            const Bool_t isnan = !TMath::Finite(fArray[i+1]);
             if (!IsUsed(i) || !iscol || isnan)
             {
@@ -944,5 +944,5 @@
 
                 if (isnan)
-                    gLog << warn << "MHCamera::Update: " << GetName() << " <" << GetTitle() << "> - Pixel Index #" << i << " contents is NaN (Not a Number)..." << endl;
+                    gLog << warn << "MHCamera::Update: " << GetName() << " <" << GetTitle() << "> - Pixel Index #" << i << " contents is not finite..." << endl;
             }
             else
@@ -960,5 +960,5 @@
                 hex.PaintHexagon(x, y, d);
         else
-            if (IsUsed(i) && !TMath::IsNaN(fArray[i+1]))
+            if (IsUsed(i) && TMath::Finite(fArray[i+1]))
             {
                 Float_t size = d*(GetBinContent(i+1)-min)/(max-min);
@@ -1643,6 +1643,6 @@
 Int_t MHCamera::GetColor(Float_t val, Float_t min, Float_t max, Bool_t islog)
 {
-    if (TMath::IsNaN(val)) // FIXME: gLog!
-        return 10;
+    if (!TMath::Finite(val)) // FIXME: gLog!
+        return maxcolidx/2;
 
     //