Changeset 1465

Timestamp:

Aug 10, 2004, 4:39:30 PM (22 years ago)

Author:

Paul Price

Message:

Small changes to masking, so that can specify maskVal to be, e.g.,
PM_MASK_BADCOL | PM_MASK_SAT.

File:

• trunk/archive/modules/include/phase2.h (modified) (2 diffs)

trunk/archive/modules/include/phase2.h

@@ -79 +79 @@
 /** Mask values */
 typedef enum {
-    PM_MASK_TRAP,                       ///< The pixel is a charge trap
-    PM_MASK_BADCOL,                     ///< The pixel is a bad column
-    PM_MASK_SAT,                        ///< The pixel is saturated
-    PM_MASK_FLAT,                       ///< The pixel is non-positive in the flat-field
-    PM_MASK_CR_MORPH                    ///< The pixel is determined to be a cosmic ray, from morphology
+    PM_MASK_TRAP       = 0x0001,        ///< The pixel is a charge trap
+    PM_MASK_BADCOL     = 0x0002,        ///< The pixel is a bad column
+    PM_MASK_SAT        = 0x0004,        ///< The pixel is saturated
+    PM_MASK_FLAT       = 0x0008,        ///< The pixel is non-positive in the flat-field
+    PM_MASK_CR_MORPH   = 0x000F,        ///< The pixel is determined to be a cosmic ray, from morphology
 } pmMaskValue;
 
@@ -89 +89 @@
 psReadout *pmMaskBadPixels(psReadout *in, ///< Image to be masked, and output
                            const psImage *mask, ///< Bad pixel mask to apply
-                           int maskVal, ///< Mask the pixels for which mask & maskVal > 0.
+                           unsigned int maskVal, ///< Mask the pixels for which mask & maskVal > 0.
                            float sat, ///< Saturation level: pixels brighter than this level are masked
                            int grow ///< Radius to grow the bad pixels