Index: trunk/ippconfig/recipes/filerules-split.mdc =================================================================== --- trunk/ippconfig/recipes/filerules-split.mdc (revision 18481) +++ trunk/ippconfig/recipes/filerules-split.mdc (revision 18563) @@ -138,5 +138,5 @@ PSPHOT.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.cmf CMF NONE CHIP TRUE NONE PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE MEF -PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF NONE CHIP TRUE MEF +PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.{CHIP.NAME}.psf PSF NONE CHIP TRUE MEF SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.{CHIP.NAME}.mnt.png KAPA NONE CHIP TRUE NONE Index: trunk/ippconfig/recipes/masks.config =================================================================== --- trunk/ippconfig/recipes/masks.config (revision 18481) +++ trunk/ippconfig/recipes/masks.config (revision 18563) @@ -1,10 +1,30 @@ ### Recipe specifying values for various mask concepts + +# this file defines bit values for various abstract mask concepts. It +# is not necessary for all bit values to be unique. Note that there +# are two main classes: detector-intrinsic and detector-extrinsic +# effects. The former will default to DETECTOR and the latter to +# RANGE if those values are not specifed + +# Note that it is necessary to leave at least a single unassigned bit +# for internal marking (or ppImage will complain) + +# these mask values are used for detector intrinsic effects +# BLANK and FLAT will be set to DETECTOR if not specified +DETECTOR U8 0x01 # Generic detector-intrinsic defect BLANK U8 0x01 # The pixel is blank or has no (valid) data +DARK U8 0x02 # The pixel is not correctable for dark current 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) + +# these mask values are used for detector extrinsic effects +# SAT and BAD will be set to RANGE if not specified +RANGE U8 0x04 # The pixel is out of range in the image of interest 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 +GHOST U8 0x08 # The pixel is probably a CR + + +BAD.WARP U8 0x04 # The pixel is low in the image of interest +POOR.WARP U8 0x04 # The pixel is low in the image of interest Index: trunk/ippconfig/recipes/ppImage.config =================================================================== --- trunk/ippconfig/recipes/ppImage.config (revision 18481) +++ trunk/ippconfig/recipes/ppImage.config (revision 18563) @@ -11,5 +11,7 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL FALSE # Mask bad pixels -MASK.VALUE STR SAT,BAD,DETECTOR # Mask pixels with these attributes + +# XXX EAM : this is being deprecated +# MASK.VALUE STR SAT,BAD,DETECTOR # Mask pixels with these attributes MASK.BUILD BOOL FALSE # Build internal mask image Index: trunk/ippconfig/recipes/ppMerge.config =================================================================== --- trunk/ippconfig/recipes/ppMerge.config (revision 18481) +++ trunk/ippconfig/recipes/ppMerge.config (revision 18563) @@ -20,6 +20,6 @@ MASK.CHIPSTATS BOOL TRUE # Measure stats for masking by chip (otherwise by readout)? MASK.GROW S32 0 # Grow bad pixels by this radius -MASK.GROWVAL STR SUSPECT # Give grown mask pixels this value -MASKVAL STR SAT,BAD # Mask value for input data +MASK.SET.VALUE STR FLAT # set this bit in the output mask + COMBINE STR CLIPPED # Statistic to use for combination MEAN STR ROBUST_MEDIAN # Statistic to use to measure the mean @@ -83,4 +83,5 @@ MASK.BAD F32 0.2 # Threshold for bad pixels (sigma) MASK.MODE STR FRACTION # Mode for identifying bad pixels in the suspect map + MASK.SET.VALUE STR DARK # set this bit in the output mask END @@ -90,4 +91,5 @@ MASK.BAD F32 0.2 # Threshold for bad pixels (sigma) MASK.MODE STR FRACTION # Mode for identifying bad pixels in the suspect map + MASK.SET.VALUE STR FLAT # set this bit in the output mask END Index: trunk/ippconfig/recipes/ppStats.config =================================================================== --- trunk/ippconfig/recipes/ppStats.config (revision 18481) +++ trunk/ippconfig/recipes/ppStats.config (revision 18563) @@ -3,5 +3,9 @@ # Options governing statistics SAMPLE F32 0.1 # Fraction of cell to sample -MASKVAL STR SAT,BAD # Mask value to use for statistics + +# Mask value to use for statistics. this is only used for stand-alone +# operations. ppStats library calls pass a mask value as needed +MASKVAL STR SAT,BAD + # Define the outputs as MULTI Index: trunk/ippconfig/recipes/psphot.config =================================================================== --- trunk/ippconfig/recipes/psphot.config (revision 18481) +++ trunk/ippconfig/recipes/psphot.config (revision 18563) @@ -15,6 +15,4 @@ ZERO_POINT F32 25.000 # zero point used by DVO ZERO_PT F32 25.000 # zero point used by DVO - -MASKVAL STR SAT,BAD,BLANK # Mask these types of pixels OUTPUT.FORMAT STR PS1_DEV_1 Index: trunk/ippconfig/recipes/pswarp.config =================================================================== --- trunk/ippconfig/recipes/pswarp.config (revision 18481) +++ trunk/ippconfig/recipes/pswarp.config (revision 18563) @@ -4,7 +4,4 @@ GRID.NY S32 128 # Iso-astrom grid size in y (pixels) INTERPOLATION.MODE STR LANCZOS3 # Interpolation mode to use -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 ASTROM.SOURCE STR PSASTRO.OUTPUT.MEF # Source file rule for astrometry, or NULL