Changeset 17217

Timestamp:

Mar 28, 2008, 4:08:16 PM (18 years ago)

Author:

Paul Price

Message:

Adding option to mask bad shutter-correction pixels

Location:

branches/pap_branch_080320/psModules/src/detrend

Files:

• pmShutterCorrection.c (modified) (4 diffs)
• pmShutterCorrection.h (modified) (2 diffs)

branches/pap_branch_080320/psModules/src/detrend/pmShutterCorrection.c

@@ -631 +631 @@
 
 
-bool pmShutterCorrectionApply(pmReadout *readout, const pmReadout *shutter)
+bool pmShutterCorrectionApply(pmReadout *readout, const pmReadout *shutter, psMaskType blank)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
@@ -675 +675 @@
     }
     psImage *image = readout->image;    // Image to correct
+    psImage *mask = readout->mask;      // Corresponding mask
 
     if (exptime <= 0.0) {
@@ -681 +682 @@
         for (int y = 0; y < image->numRows; y++) {
             for (int x = 0; x < image->numCols; x++) {
+                if (mask && !isfinite(shutterImage->data.F32[y][x])) {
+                    mask->data.PS_TYPE_MASK_DATA[y][x] |= blank;
+                    image->data.F32[y][x] = NAN;
+                    continue;
+                }
                 image->data.F32[y][x] *= 1.0 / (exptime + shutterImage->data.F32[y][x]);
             }
@@ -692 +698 @@
         for (int y = 0; y < image->numRows; y++) {
             for (int x = 0; x < image->numCols; x++) {
+                if (mask && !isfinite(shutterImage->data.F32[y][x])) {
+                    mask->data.PS_TYPE_MASK_DATA[y][x] |= blank;
+                    image->data.F32[y][x] = NAN;
+                    continue;
+                }
                 image->data.F32[y][x] *= exptime / (exptime + shutterImage->data.F32[y][x]);
             }

branches/pap_branch_080320/psModules/src/detrend/pmShutterCorrection.h

@@ -5 +5 @@
  * @author Paul Price, IfA
  *
- * @version $Revision: 1.14.22.1 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-03-27 23:28:38 $
+ * @version $Revision: 1.14.22.2 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-03-29 02:08:16 $
  * Copyright 2006 Institute for Astronomy, University of Hawaii
  */
@@ -129 +129 @@
 /// Given a shutter correction (with dT for each pixel), applies this correction to an input image.
 bool pmShutterCorrectionApply(
-    pmReadout *readout, ///< Readout to which to apply shutter correction
-    const pmReadout *shutter ///< Shutter correction readout, with dT for each pixel
+    pmReadout *readout,                 ///< Readout to which to apply shutter correction
+    const pmReadout *shutter,           ///< Shutter correction readout, with dT for each pixel
+    psMaskType blank                    ///< Value to give blank pixels
     );