Index: trunk/ippconfig/gpc1/ppImage.config =================================================================== --- trunk/ippconfig/gpc1/ppImage.config (revision 41186) +++ trunk/ippconfig/gpc1/ppImage.config (revision 41195) @@ -173,14 +173,14 @@ BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction - NOISEMAP BOOL TRUE + 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.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.CELL BOOL FALSE # Cell pattern correction PATTERN.CONTINUITY BOOL TRUE # Cell pattern correction using edge continuity FRINGE BOOL TRUE # Fringe subtraction @@ -301,13 +301,15 @@ 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.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 + 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? @@ -323,22 +325,22 @@ END DARK METADATA - DETTYPE STR DARKTEST - EXPTIME STR FPA.EXPOSURE + DETTYPE STR DARKTEST + EXPTIME STR FPA.EXPOSURE END FLAT METADATA - FILTER STR FPA.FILTERID + FILTER STR FPA.FILTERID END FLATCORR METADATA - FILTER STR FPA.FILTERID + FILTER STR FPA.FILTERID END FRINGE METADATA - FILTER STR FPA.FILTERID + FILTER STR FPA.FILTERID END SHUTTER METADATA END MASK METADATA - END + END ASTROM METADATA - END + END NOISEMAP METADATA END Index: trunk/ippconfig/gpc2/ppImage.config =================================================================== --- trunk/ippconfig/gpc2/ppImage.config (revision 41186) +++ trunk/ippconfig/gpc2/ppImage.config (revision 41195) @@ -90,14 +90,14 @@ BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction - NOISEMAP BOOL FALSE + NOISEMAP BOOL FALSE # 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.BUILD BOOL TRUE # Build internal mask? MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails MASK.AUXMASK BOOL FALSE # augment mask with more restrictive auxiliary mask PATTERN.ROW BOOL FALSE # Row pattern correction - PATTERN.CELL BOOL FALSE # Cell pattern correction + PATTERN.CELL BOOL FALSE # Cell pattern correction PATTERN.CONTINUITY BOOL FALSE # Cell pattern correction using edge continuity FRINGE BOOL FALSE # Fringe subtraction @@ -219,14 +219,16 @@ BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction + NOISEMAP BOOL FALSE # 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 - PATTERN.ROW BOOL TRUE # Row pattern correction - PATTERN.CELL BOOL FALSE # Cell pattern correction - PATTERN.CONTINUITY BOOL TRUE - FRINGE BOOL TRUE # Fringe subtraction + MASK.BUILD BOOL TRUE # Build internal mask? + MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails + MASK.AUXMASK BOOL FALSE # augment mask with more restrictive auxiliary mask + PATTERN.ROW BOOL FALSE # Row pattern correction + PATTERN.CELL BOOL FALSE # Cell pattern correction + PATTERN.CONTINUITY BOOL FALSE # Cell pattern correction using edge continuity + FRINGE BOOL FALSE # Fringe subtraction BIN1.FITS BOOL TRUE # Save 1st binned chip image? BIN2.FITS BOOL TRUE # Save 2nd binned chip image? @@ -256,10 +258,10 @@ END MASK METADATA - END + END ASTROM METADATA - END + END NOISEMAP METADATA END - END + END END Index: trunk/ippconfig/recipes/ppImage.config =================================================================== --- trunk/ippconfig/recipes/ppImage.config (revision 41186) +++ trunk/ippconfig/recipes/ppImage.config (revision 41195) @@ -244,5 +244,5 @@ # Standard chip processing -CHIP METADATA +CHIP METADATA BASE.FITS BOOL FALSE # Save base detrended image? BASE.MASK.FITS BOOL FALSE # Save base detrended image? @@ -370,6 +370,37 @@ END +# Chip processing with DARKTEST +CHIP_DARKTEST 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 # Non-linearity correction; not implemented + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + 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? + BACKGROUND BOOL TRUE # Subtract background? + MASK.STATS BOOL TRUE # Calculate Mask statistics. + + DETREND.CONSTRAINTS METADATA + DARK METADATA + DETTYPE STR DARKTEST + EXPTIME STR FPA.EXPOSURE + END + END +END + #standard processing, testing new mask - CHIP_MASKTEST METADATA BASE.FITS BOOL FALSE # Save base detrended image? @@ -908,35 +939,4 @@ DARK METADATA DETTYPE STR DARK_PREMASK - EXPTIME STR FPA.EXPOSURE - END - END -END - -# Chip processing with DARKTEST -CHIP_DARKTEST 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 # Non-linearity correction; not implemented - BIAS BOOL TRUE # Bias subtraction - DARK BOOL TRUE # Dark subtraction - 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? - BACKGROUND BOOL TRUE # Subtract background? - - DETREND.CONSTRAINTS METADATA - DARK METADATA - DETTYPE STR DARKTEST EXPTIME STR FPA.EXPOSURE END