Index: /trunk/ippconfig/ipprc.config.in =================================================================== --- /trunk/ippconfig/ipprc.config.in (revision 13591) +++ /trunk/ippconfig/ipprc.config.in (revision 13592) @@ -63,4 +63,5 @@ RECIPES METADATA # Site-level recipes + MASKS STR recipes/masks.config # Mask values PPIMAGE STR recipes/ppImage.config # Image reduction PPMERGE STR recipes/ppMerge.config # Image combination Index: /trunk/ippconfig/recipes/masks.config =================================================================== --- /trunk/ippconfig/recipes/masks.config (revision 13592) +++ /trunk/ippconfig/recipes/masks.config (revision 13592) @@ -0,0 +1,10 @@ +### Recipe specifying values for various mask concepts +BLANK U8 0x01 # The pixel is blank or has no (valid) data +FLAT U8 0x02 # The pixel is non-positive in the flat-field +DETECTOR U8 0x02 # The detector pixel is bad (e.g., bad column, charge trap) +SAT U8 0x04 # The pixel is saturated in the image of interest +BAD U8 0x04 # The pixel is low in the image of interest +RANGE U8 0x04 # The pixel is out of range in the image of interest +CR U8 0x08 # The pixel is probably a CR +SUSPECT U8 0x40 # The pixel is suspected of being bad, but may not be +MARK U8 0x80 # The pixel is marked as temporarily ignored Index: /trunk/ippconfig/recipes/ppImage.config =================================================================== --- /trunk/ippconfig/recipes/ppImage.config (revision 13591) +++ /trunk/ippconfig/recipes/ppImage.config (revision 13592) @@ -11,5 +11,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL FALSE # Mask bad pixels -MASK.VALUE U8 0xff # only mask pixels matching this bitmask +MASK.VALUE STR SAT,BAD # Mask pixels with these attributes FRINGE BOOL FALSE # Fringe subtraction PHOTOM BOOL FALSE # Source identification and photometry Index: /trunk/ippconfig/recipes/ppMerge.config =================================================================== --- /trunk/ippconfig/recipes/ppMerge.config (revision 13591) +++ /trunk/ippconfig/recipes/ppMerge.config (revision 13592) @@ -19,5 +19,5 @@ MASK.SUSPECT F32 5.0 # Threshold for suspect pixels (sigma) MASK.BAD F32 -4.0 # Threshold for bad pixels (sigma) -MASKVAL S32 0xff # Mask value for input data +MASKVAL STR SAT,BAD # Mask value for input data COMBINE STR CLIPPED # Statistic to use for combination MEAN STR ROBUST_MEDIAN # Statistic to use to measure the mean @@ -32,5 +32,4 @@ FRACLOW F32 0.0 # Fraction of low pixels to reject immediately WEIGHTS BOOL FALSE # Use image weights? - MASKVAL S32 0 # Mask value for input data COMBINE STR CLIPPED # Statistic to use for combination: END @@ -45,5 +44,4 @@ FRACLOW F32 0.0 # Fraction of low pixels to reject immediately WEIGHTS BOOL FALSE # Use image weights? - MASKVAL S32 0 # Mask value for input data COMBINE STR CLIPPED # Statistic to use for combination: END @@ -56,5 +54,4 @@ FRACLOW F32 0.1 # Fraction of low pixels to reject immediately NKEEP S32 5 # Minimum number of pixels in stack to keep - MASKVAL S32 0xff # Mask value for input data WEIGHTS BOOL TRUE # Use image weights? COMBINE STR MEAN # Statistic to use for combination: Index: /trunk/ippconfig/recipes/ppStack.config =================================================================== --- /trunk/ippconfig/recipes/ppStack.config (revision 13591) +++ /trunk/ippconfig/recipes/ppStack.config (revision 13592) @@ -5,4 +5,4 @@ CONVOLVE.REJ F32 10.0 # Rejection threshold in convolution (sigma) EXTENT F32 3.0 # Extent of Gaussian convolution (sigma) -MASK.BAD U8 0x0f # Mask value of bad pixels -MASK.BLANK U8 0xf0 # Mask value to give blank pixels +MASK.BAD U8 SAT,BAD # Mask value of bad pixels +MASK.BLANK U8 BLANK # Mask value to give blank pixels Index: /trunk/ippconfig/recipes/ppStats.config =================================================================== --- /trunk/ippconfig/recipes/ppStats.config (revision 13591) +++ /trunk/ippconfig/recipes/ppStats.config (revision 13592) @@ -3,5 +3,5 @@ # Options governing statistics SAMPLE F32 0.1 # Fraction of cell to sample -MASKVAL U8 0xff # Mask value to use for statistics +MASKVAL STR SAT,BAD # Mask value to use for statistics # Define the outputs as MULTI @@ -18,9 +18,9 @@ ### ppStats recipe for Phase 0 -PPSTATS_PHASE0 METADATA +PPSTATS_REGISTER METADATA # Options governing statistics SAMPLE F32 0.1 # Fraction of cell to sample - MASKVAL U8 0xff # Mask value to use for statistics + MASKVAL STR SAT,BAD # Mask value to use for statistics # Define the outputs as MULTI Index: /trunk/ippconfig/recipes/ppSub.config =================================================================== --- /trunk/ippconfig/recipes/ppSub.config (revision 13591) +++ /trunk/ippconfig/recipes/ppSub.config (revision 13592) @@ -9,6 +9,6 @@ ITER S32 10 # Number of rejection iterations REJ F32 2.5 # Rejection level (std dev) -MASK.BAD U8 0xff # Mask value for bad pixels -MASK.BLANK U8 0xff # Mask value to give blank pixels +MASK.BAD STR BAD,SAT # Mask value for bad pixels +MASK.BLANK STR BLANK # Mask value to give blank pixels @ISIS.WIDTHS F32 0.7 1.5 3 # Gaussian widths for ISIS kernels @ISIS.ORDERS S32 6 4 2 # Polynomial orders for ISIS kernels Index: /trunk/ippconfig/recipes/pswarp.config =================================================================== --- /trunk/ippconfig/recipes/pswarp.config (revision 13591) +++ /trunk/ippconfig/recipes/pswarp.config (revision 13592) @@ -4,6 +4,6 @@ GRID.NY S32 128 # Iso-astrom grid size in y (pixels) INTERPOLATION.MODE STR LANCZOS3 # Interpolation mode to use -MASK.IN U8 0 # Mask for input data -MASK.POOR U8 0x40 # Mask for "poor" warped data -MASK.BAD U8 0x80 # Mask for bad warped data +MASK.IN STR BAD,SAT # Mask for input data +MASK.POOR STR SUSPECT # Mask for "poor" warped data +MASK.BAD STR BLANK # Mask for bad warped data POOR.FRAC F32 0.01 # Max fraction of bad flux for a "poor" warped pixel