Index: trunk/MagicSoft/Mars/mhist/MHCamera.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 7971)
+++ 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;
 
     //