Index: trunk/MagicSoft/Mars/msignal/MSignalCam.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MSignalCam.cc	(revision 7355)
+++ trunk/MagicSoft/Mars/msignal/MSignalCam.cc	(revision 7364)
@@ -599,6 +599,9 @@
 {
     MSignalPix *pix = GetPixById(idx);
-
-    if ((!pix || !pix->IsPixelUsed()) && (type<6 || type==8))
+    if (!pix)
+        return kFALSE;
+
+    // Used inlcudes status unampped
+    if (!pix->IsPixelUsed() && (type<6 || type==8))
         return kFALSE;
 
@@ -625,8 +628,10 @@
         break;
     case 6:
+        if (pix->IsPixelUnmapped())
+            return kFALSE;
         val = pix->GetArrivalTime();
         break;
     case 7:
-        if (pix->GetNumPhotons()*ratio<15) // maybe 15 as static data member?
+        if (pix->IsPixelUnmapped() || pix->GetNumPhotons()*ratio<15) // maybe 15 as static data member?
             return kFALSE;
         val = pix->GetArrivalTime();