Index: /branches/eam_branches/ipp-20220316/ippconfig/gpc2/ppImage.config =================================================================== --- /branches/eam_branches/ipp-20220316/ippconfig/gpc2/ppImage.config (revision 42216) +++ /branches/eam_branches/ipp-20220316/ippconfig/gpc2/ppImage.config (revision 42217) @@ -1872,63 +1872,63 @@ # test recipes # currently : default CHIP recipe as normal -APTEST_V2 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 - NONLIN BOOL FALSE # apply non-linearity correction - BIAS BOOL FALSE # Bias subtraction - DARK BOOL TRUE # Dark subtraction - 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 - PATTERN.ROW BOOL TRUE # Row pattern correction - PATTERN.CELL BOOL TRUE # Cell pattern correction - 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 - -# test recipes -# currently : default CHIP recipe -APTEST_V3 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 - NONLIN BOOL FALSE # apply non-linearity correction - BIAS BOOL FALSE # Bias subtraction - DARK BOOL TRUE # Dark subtraction - 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 - PATTERN.ROW BOOL TRUE # Row pattern correction - PATTERN.CELL BOOL TRUE # Cell pattern correction - 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 +# APTEST_V2 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 +# NONLIN BOOL FALSE # apply non-linearity correction +# BIAS BOOL FALSE # Bias subtraction +# DARK BOOL TRUE # Dark subtraction +# 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 +# PATTERN.ROW BOOL TRUE # Row pattern correction +# PATTERN.CELL BOOL TRUE # Cell pattern correction +# 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 +# +# # test recipes +# # currently : default CHIP recipe +# APTEST_V3 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 +# NONLIN BOOL FALSE # apply non-linearity correction +# BIAS BOOL FALSE # Bias subtraction +# DARK BOOL TRUE # Dark subtraction +# 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 +# PATTERN.ROW BOOL TRUE # Row pattern correction +# PATTERN.CELL BOOL TRUE # Cell pattern correction +# 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 PPIMAGE_BKGCONT METADATA Index: /branches/eam_branches/ipp-20220316/ippconfig/recipes/ppImage.config =================================================================== --- /branches/eam_branches/ipp-20220316/ippconfig/recipes/ppImage.config (revision 42216) +++ /branches/eam_branches/ipp-20220316/ippconfig/recipes/ppImage.config (revision 42217) @@ -104,6 +104,4 @@ OVERSCAN.MIN.VALID F32 0.0 # minimum valid overscan value OVERSCAN.MAX.VALID F32 65536.0 # maximum valid overscan value -#OVERSCAN.MIN.VALID F32 100.0 # minimum valid overscan value -#OVERSCAN.MAX.VALID F32 64000.0 # maximum valid overscan value # Pattern Row subtraction options @@ -2582,9 +2580,9 @@ NONLIN BOOL FALSE # Non-linearity correction; not implemented BIAS BOOL FALSE # Bias subtraction - DARK BOOL FALSE # Dark subtraction + DARK BOOL TRUE # Dark subtraction REMNANCE BOOL FALSE # Remnance masking SHUTTER BOOL FALSE # Shutter correction - FLAT BOOL FALSE # Flat-field normalisation - MASK BOOL FALSE # Mask bad pixels + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL TRUE # Mask bad pixels MASK.BUILD BOOL TRUE # Build internal mask? MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails @@ -2597,11 +2595,11 @@ ASTROM.CHIP BOOL FALSE # Astrometry per chip? ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? - BACKGROUND BOOL FALSE # Subtract background? MASK.STATS BOOL FALSE # Calculate Mask statistics. CROSSTALK.MEASURE BOOL FALSE # Subtract model background? + BACKGROUND BOOL TRUE # Subtract background? + PATTERN.DEAD.CELLS BOOL TRUE # continuity corrections (see options below) OVERSCAN.MIN.VALID F32 100.0 # Overscan subtraction OVERSCAN.MAX.VALID F32 64000.0 # Overscan subtraction -# OVERSCAN.MIN.VALID F32 0.0 # Overscan subtraction END @@ -2617,17 +2615,27 @@ OVERSCAN BOOL TRUE # Overscan subtraction NONLIN BOOL FALSE # Non-linearity correction; not implemented - BIAS BOOL TRUE # Bias subtraction + BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction + REMNANCE BOOL FALSE # Remnance masking SHUTTER BOOL FALSE # Shutter correction FLAT BOOL TRUE # Flat-field normalisation - MASK BOOL TRUE # Mask bad pixels - 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? + MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL FALSE # Build internal mask? + MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails + PATTERN.ROW BOOL FALSE # Row pattern correction + PATTERN.CELL BOOL FALSE # Cell pattern correction + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + MASK.STATS BOOL FALSE # Calculate Mask statistics. + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? + BACKGROUND BOOL TRUE # Subtract background? - MASK.STATS BOOL TRUE # Calculate Mask statistics. + PATTERN.DEAD.CELLS BOOL TRUE # continuity corrections (see options below) + OVERSCAN.MIN.VALID F32 100.0 # Overscan subtraction + OVERSCAN.MAX.VALID F32 64000.0 # Overscan subtraction END