Changeset 10080 for trunk/psModules/src/detrend/pmMaskBadPixels.c

Timestamp:

Nov 18, 2006, 1:37:07 PM (19 years ago)

Author:

Paul Price

Message:

Offsets are in the readout, not in the image. Image offsets are
simply the position in the FITS file.

File:

• trunk/psModules/src/detrend/pmMaskBadPixels.c (modified) (2 diffs)

trunk/psModules/src/detrend/pmMaskBadPixels.c

@@ -23 +23 @@
     psImage *exMask = mask->mask;
 
-    int rowMax = inMask->row0 + inMask->numRows;
-    int colMax = inMask->col0 + inMask->numCols;
-
-    if (exMask->row0 > inMask->row0 || exMask->col0 > inMask->col0 ||
-            exMask->row0 + exMask->numRows < rowMax || exMask->col0 + exMask->numCols < colMax) {
-        psError( PS_ERR_BAD_PARAMETER_SIZE, true,
-                 "Input image size exceeds that of mask image: (%d, %d) vs (%d, %d)",
-                 inMask->numRows, inMask->numCols, exMask->numRows, exMask->numCols);
+    int rowMax = input->row0 + inMask->numRows;
+    int colMax = input->col0 + inMask->numCols;
+
+    if (mask->row0 > input->row0 || mask->col0 > input->col0 ||
+            mask->row0 + exMask->numRows < rowMax || mask->col0 + exMask->numCols < colMax) {
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true,
+                "Input image size exceeds that of mask image: (%d, %d) vs (%d, %d)",
+                inMask->numRows, inMask->numCols, exMask->numRows, exMask->numCols);
         return false;
     }
@@ -36 +36 @@
     // Determine total offset based on image offset with chip offset
     // XXX if we choose to correct for the readout location, apply input->col0,row0 here
-    int offCol = inMask->col0 - exMask->col0;
-    int offRow = inMask->row0 - exMask->row0;
+    int offCol = input->col0 - mask->col0;
+    int offRow = input->row0 - mask->row0;
 
     // masks are both of type PS_TYPE_MASK