Index: trunk/ippconfig/recipes/ppImage.config =================================================================== --- trunk/ippconfig/recipes/ppImage.config (revision 42850) +++ trunk/ippconfig/recipes/ppImage.config (revision 42892) @@ -97,4 +97,10 @@ # Overscan subtraction OVERSCAN.SINGLE BOOL TRUE # Reduce overscan to a single value? +OVERSCAN.CONSTANT BOOL FALSE # Apply a known, fixed value? +OVERSCAN.VALUE F32 0.0 # value to apply, if requested +OVERSCAN.MIN.VALID F32 0.0 # minimum valid overscan value +OVERSCAN.MAX.VALID F32 65536.0 # maximum valid overscan value + +# statistics to use to convert overscan region to a vector OVERSCAN.FIT STR NONE # NONE | POLYNOMIAL | SPLINE OVERSCAN.ORDER S32 5 # Order of polynomial fit @@ -102,8 +108,18 @@ OVERSCAN.BOXCAR S32 0 # Boxcar smoothing radius OVERSCAN.GAUSS F32 0.0 # Gaussian smoothing sigma -OVERSCAN.CONSTANT BOOL FALSE # Apply a known, fixed value? -OVERSCAN.VALUE F32 0.0 # value to apply, if requested -OVERSCAN.MIN.VALID F32 0.0 # minimum valid overscan value -OVERSCAN.MAX.VALID F32 65536.0 # maximum valid overscan value + +OVERSCAN.2D BOOL FALSE # use a 2D model for the overscan subtraction? +OVERSCAN.2D.BIASSECSLOW STR [591:623,1:598] #2D overscan slow read region +OVERSCAN.2D.BIASSECFAST STR [1:623,599:607] #2D overscan fast read region + +OVERSCAN.2D.SUBSET METADATA +END + +# statistics to use to convert 2D top-overscan region to a vector +OVERSCAN.2D.FIT STR NONE # NONE | POLYNOMIAL | SPLINE +OVERSCAN.2D.ORDER S32 5 # Order of polynomial fit +OVERSCAN.2D.STAT STR MEAN # MEAN | MEDIAN +OVERSCAN.2D.BOXCAR S32 0 # Boxcar smoothing radius +OVERSCAN.2D.GAUSS F32 0.0 # Gaussian smoothing sigma # Pattern Row subtraction options @@ -268,4 +284,11 @@ ################################################################################ +# HG: for overscan subtraction only +CHIP_SUB_BIAS METADATA +END + +CHIP_SUB_2DBIAS METADATA +END + # Standard chip processing CHIP METADATA @@ -291,4 +314,38 @@ BACKGROUND BOOL TRUE # Subtract background? MASK.STATS BOOL TRUE # Calculate Mask statistics. +END + + +CHIP_2DBIAS METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + OVERSCAN.2D BOOL TRUE # 2D Overscan model + NONLIN BOOL TRUE # apply non-linearity correction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + NOISEMAP BOOL TRUE # Apply noise read map + REMNANCE BOOL FALSE # Remnance masking + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? + MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails + MASK.AUXMASK BOOL FALSE # augment mask with more restrictive auxiliary mask + PATTERN.ROW BOOL TRUE # Row pattern correction + PATTERN.CELL BOOL FALSE # Cell pattern correction + PATTERN.CONTINUITY BOOL TRUE # Cell pattern correction using edge continuity + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BACKGROUND BOOL TRUE # Subtract background? + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? END @@ -458,4 +515,65 @@ END END +END + + +# Chip processing with DARKTEST and 2D bias +CHIP_DARKTEST_2DBIAS METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + OVERSCAN.2D BOOL TRUE # 2D Overscan model + NONLIN BOOL TRUE # apply non-linearity correction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + NOISEMAP BOOL TRUE # Apply noise read map + REMNANCE BOOL FALSE # Remnance masking + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? + MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails + MASK.AUXMASK BOOL FALSE # augment mask with more restrictive auxiliary mask + PATTERN.ROW BOOL TRUE # Row pattern correction + PATTERN.CELL BOOL FALSE # Cell pattern correction + PATTERN.CONTINUITY BOOL TRUE # Cell pattern correction using edge continuity + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BACKGROUND BOOL TRUE # Subtract background? + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? + + DETREND.CONSTRAINTS METADATA + BIAS METADATA + END + DARK METADATA + DETTYPE STR DARKTEST + EXPTIME STR FPA.EXPOSURE + END + FLAT METADATA + FILTER STR FPA.FILTERID + END + FLATCORR METADATA + FILTER STR FPA.FILTERID + END + FRINGE METADATA + FILTER STR FPA.FILTERID + END + SHUTTER METADATA + END + MASK METADATA + END + ASTROM METADATA + END + NOISEMAP METADATA + END + END END @@ -1017,4 +1135,29 @@ BIN1.FITS BOOL TRUE # Save 1st binned chip image? BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Overscan, 2D bias +PPIMAGE_OB2DBIAS 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 + OVERSCAN.2D BOOL TRUE # 2D Overscan model + NONLIN BOOL TRUE # apply non-linearity correction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL FALSE # Build internal mask? + 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 @@ -2627,5 +2770,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels - MASK.BUILD BOOL TRUE # Build internal mask? + MASK.BUILD BOOL TRUE # Build internal mask? MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails PATTERN.ROW BOOL FALSE # Row pattern correction @@ -2634,4 +2777,6 @@ BIN1.FITS BOOL TRUE # Save 1st binned chip image? BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? + BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? PHOTOM BOOL FALSE # Source identification and photometry ASTROM.CHIP BOOL FALSE # Astrometry per chip? @@ -2640,6 +2785,6 @@ CROSSTALK.MEASURE BOOL FALSE # Subtract model background? - BACKGROUND BOOL TRUE # Subtract background? - PATTERN.DEAD.CELLS BOOL TRUE # continuity corrections (see options below) + BACKGROUND BOOL FALSE # Subtract background? + PATTERN.DEAD.CELLS BOOL FALSE # continuity corrections (see options below) OVERSCAN.MIN.VALID F32 100.0 # Overscan subtraction OVERSCAN.MAX.VALID F32 64000.0 # Overscan subtraction