Changeset 32923 for branches/eam_branches/ipp-20111122/psModules/src/objects/pmSourcePhotometry.c

Timestamp:

Dec 11, 2011, 1:40:19 PM (15 years ago)

Author:

eugene

Message:

fix OFF_CHIP bit: was comparing chip position to the subraster, not the full image

File:

• branches/eam_branches/ipp-20111122/psModules/src/objects/pmSourcePhotometry.c (modified) (1 diff)

branches/eam_branches/ipp-20111122/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;