Changeset 32998 for trunk/psModules

Timestamp:

Dec 22, 2011, 9:13:38 AM (14 years ago)

Author:

eugene

Message:

fix OFF_CHIP mask bit

Location:

trunk/psModules

Files:

• . (modified) (1 prop)
• src/objects/pmFootprintCullPeaks.c (modified) (1 diff)
• src/objects/pmSourcePhotometry.c (modified) (2 diffs)

trunk/psModules/src/objects/pmFootprintCullPeaks.c

@@ -122 +122 @@
                     threshbounds->data.F32[threshbounds->n-1], maxFlux);
         }
-
         psHistogram *threshist = psHistogramAllocGeneric(threshbounds);
 

trunk/psModules/src/objects/pmSourcePhotometry.c

@@ -543 +543 @@
     int yChip = source->peak->y;
 
+    // need to access the parent if we are looking at a subimage (likely)
+    psImage *chipImage = (source->pixels == NULL) ? source->pixels : (psImage *) source->pixels->parent;
+
     bool onChip = true;
     onChip &= (xChip >= 0);
-    onChip &= (xChip < mask->numCols);
+    onChip &= (xChip < chipImage->numCols);
     onChip &= (yChip >= 0);
-    onChip &= (yChip < mask->numRows);
+    onChip &= (yChip < chipImage->numRows);
     if (!onChip) {
         // if the source is off the edge of the chip, raise a different bit?
         source->mode |= PM_SOURCE_MODE_OFF_CHIP;
     } else {
-        psImageMaskType maskValue = mask->data.PS_TYPE_IMAGE_MASK_DATA[yChip][xChip];
+        int xMask = xChip - mask->col0;
+        int yMask = yChip - mask->row0;
+        psImageMaskType maskValue = mask->data.PS_TYPE_IMAGE_MASK_DATA[yMask][xMask];
         if (maskValue & maskGhost) {
             source->mode |= PM_SOURCE_MODE_ON_GHOST;
@@ -564 +569 @@
         }
     }
-
     return (true);
 }