Changeset 7364 for trunk/MagicSoft/Mars/msignal/MSignalCam.cc

Timestamp:

09/22/05 14:06:38 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/msignal/MSignalCam.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/msignal/MSignalCam.cc

@@ -599 +599 @@
 {
     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 +628 @@
         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();