Index: /trunk/ippconfig/gpc1/ppImage.config =================================================================== --- /trunk/ippconfig/gpc1/ppImage.config (revision 23980) +++ /trunk/ippconfig/gpc1/ppImage.config (revision 23981) @@ -124,20 +124,49 @@ BASE.FITS BOOL TRUE # Save base detrended image? BASE.MASK.FITS BOOL TRUE # Save base detrended image? - BASE.VARIANCE.FITS BOOL TRUE # Save base detrended image? - CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? - CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? - CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? - OVERSCAN BOOL TRUE # Overscan subtraction - BIAS BOOL FALSE # Bias subtraction - DARK BOOL TRUE # Dark subtraction - SHUTTER BOOL FALSE # Shutter correction - FLAT BOOL FALSE # Flat-field normalisation - MASK BOOL FALSE # Mask bad pixels - FRINGE BOOL FALSE # Fringe subtraction - PHOTOM BOOL FALSE # Source identification and photometry - ASTROM.CHIP BOOL FALSE # Astrometry per chip? - ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? - BIN1.FITS BOOL TRUE # Save 1st binned chip image? - BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + BASE.VARIANCE.FITS BOOL TRUE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Overscan, bias, dark -- search for DARK_PREMASK +PPIMAGE_DARKMASK_PROCESS METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL TRUE # Save base detrended image? + BASE.VARIANCE.FITS BOOL TRUE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL FALSE + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + + DETREND.CONSTRAINTS METADATA + DARK METADATA + DETTYPE STR DARK_PREMASK + EXPTIME STR FPA.EXPOSURE + END + END END @@ -212,4 +241,37 @@ BIN1.FITS BOOL TRUE # Save 1st binned chip image? BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Overscan, bias, dark, shutter, flat-field -- use FLAT_PREMASK +PPIMAGE_FLATMASK_PROCESS METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL TRUE # Save base detrended image? + BASE.VARIANCE.FITS BOOL TRUE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + + DETREND.CONSTRAINTS METADATA + DARK METADATA + DETTYPE STR DARK_PREMASK + EXPTIME STR FPA.EXPOSURE + END + FLAT METADATA + DETTYPE STR FLAT_PREMASK + FILTER STR FPA.FILTERID + END + END END @@ -563,2 +625,37 @@ END +# generate CTE map image +PPIMAGE_CTEMAP METADATA + BASE.FITS BOOL TRUE # Save base image? + BASE.MASK.FITS BOOL TRUE # Save base detrended image? + BASE.VARIANCE.FITS BOOL TRUE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL FALSE # Overscan subtraction + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + CHECK.CTE BOOL TRUE # measure CTE errors? + + DETREND.CONSTRAINTS METADATA + DARK METADATA + DETTYPE STR DARK_PREMASK + EXPTIME STR FPA.EXPOSURE + END + FLAT METADATA + DETTYPE STR FLAT_PREMASK + FILTER STR FPA.FILTERID + END + END +END + Index: /trunk/ippconfig/recipes/ppImage.config =================================================================== --- /trunk/ippconfig/recipes/ppImage.config (revision 23980) +++ /trunk/ippconfig/recipes/ppImage.config (revision 23981) @@ -450,4 +450,33 @@ END +# Overscan, bias, dark -- search for DARK_PREMASK +PPIMAGE_DARKMASK_PROCESS METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL TRUE # Save base detrended image? + BASE.VARIANCE.FITS BOOL TRUE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + + DETREND.CONSTRAINTS METADATA + DARK METADATA + DETTYPE STR DARK_PREMASK + EXPTIME STR FPA.EXPOSURE + END + END +END + # Overscan, bias, dark, shutter PPIMAGE_OBDS METADATA @@ -521,4 +550,37 @@ BIN1.FITS BOOL TRUE # Save 1st binned chip image? BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Overscan, bias, dark, shutter, flat-field -- use FLAT_PREMASK +PPIMAGE_FLATMASK_PROCESS METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL TRUE # Save base detrended image? + BASE.VARIANCE.FITS BOOL TRUE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + + DETREND.CONSTRAINTS METADATA + DARK METADATA + DETTYPE STR DARK_PREMASK + EXPTIME STR FPA.EXPOSURE + END + FLAT METADATA + DETTYPE STR FLAT_PREMASK + FILTER STR FPA.FILTERID + END + END END @@ -1474,4 +1536,15 @@ BIN2.FITS BOOL TRUE # Save 2nd binned chip image? CHECK.CTE BOOL TRUE # measure CTE errors? + + DETREND.CONSTRAINTS METADATA + DARK METADATA + DETTYPE STR DARK_PREMASK + EXPTIME STR FPA.EXPOSURE + END + FLAT METADATA + DETTYPE STR FLAT_PREMASK + FILTER STR FPA.FILTERID + END + END END Index: /trunk/ippconfig/recipes/reductionClasses.mdc =================================================================== --- /trunk/ippconfig/recipes/reductionClasses.mdc (revision 23980) +++ /trunk/ippconfig/recipes/reductionClasses.mdc (revision 23981) @@ -97,5 +97,5 @@ # Generation of pixel masks from darks and flats - DARKMASK_PROCESS STR PPIMAGE_OBD + DARKMASK_PROCESS STR PPIMAGE_DARKMASK_PROCESS DARKMASK_RESID STR PPIMAGE_M DARKMASK_VERIFY STR PPIMAGE_M @@ -104,5 +104,5 @@ DARKMASK_JPEG_RESID STR BIAS_RESID - FLATMASK_PROCESS STR PPIMAGE_OBDSF + FLATMASK_PROCESS STR PPIMAGE_FLATMASK_PROCESS FLATMASK_RESID STR PPIMAGE_M FLATMASK_VERIFY STR PPIMAGE_M