Index: trunk/ippconfig/gpc1/ppImage.config =================================================================== --- trunk/ippconfig/gpc1/ppImage.config (revision 36111) +++ trunk/ippconfig/gpc1/ppImage.config (revision 36169) @@ -34,5 +34,5 @@ # aditional auxiliary mask applied to corners of all chips in video cells. # Is only applied if MASK.AUXMASK and USE.VIDEO.MASK are both true -AUX.VIDEO.MASK STR neb://any/gpc1/auxmask/mpg.20130506/mask_video_cell_corners.fits +AUX.VIDEO.MASK STR neb://any/gpc1/auxmask/mpg.20130930/mask_video_cell_corners.fits @@ -1292,4 +1292,96 @@ CROSSTALK.MEASURE BOOL FALSE # Subtract model background? NO.COMPRESS BOOL TRUE # turn off image compression + DETREND.CONSTRAINTS METADATA + BIAS METADATA + END + DARK METADATA + 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 + AUXMASK METADATA + DETTYPE STR AUXMASK_STS + END + ASTROM METADATA + END + NOISEMAP METADATA + END + LINEARITY METADATA + END + END +END + +# Standard chip processing + auxiliary mask with heavy masking +CHIP_AUXMASK_HEAVY 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 TRUE # apply non-linearity correction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + NOISEMAP BOOL TRUE + 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 TRUE # 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? + NO.COMPRESS BOOL TRUE # turn off image compression + DETREND.CONSTRAINTS METADATA + BIAS METADATA + END + DARK METADATA + 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 + AUXMASK METADATA + DETTYPE STR AUXMASK_HEAVY + END + ASTROM METADATA + END + NOISEMAP METADATA + END + LINEARITY METADATA + END + END END @@ -1392,4 +1484,33 @@ CROSSTALK.MEASURE BOOL FALSE # Subtract model background? NO.COMPRESS BOOL TRUE # turn off image compression + DETREND.CONSTRAINTS METADATA + BIAS METADATA + END + DARK METADATA + 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 + AUXMASK METADATA + DETTYPE STR AUXMASK_HEAVY + END + ASTROM METADATA + END + NOISEMAP METADATA + END + LINEARITY METADATA + END + END END Index: trunk/ippconfig/recipes/filerules-split.mdc =================================================================== --- trunk/ippconfig/recipes/filerules-split.mdc (revision 36111) +++ trunk/ippconfig/recipes/filerules-split.mdc (revision 36169) @@ -38,4 +38,5 @@ PPIMAGE.INPUT.MASK INPUT @FILES CHIP MASK PPIMAGE.VIDEOMASK INPUT @DETDB CHIP MASK +PPIMAGE.AUXMASK INPUT @DETDB CHIP MASK PPIMAGE.INPUT.VARIANCE INPUT @FILES CHIP VARIANCE PPIMAGE.INPUT.PSF INPUT @FILES CHIP PSF Index: trunk/ippconfig/recipes/ppImage.config =================================================================== --- trunk/ippconfig/recipes/ppImage.config (revision 36111) +++ trunk/ippconfig/recipes/ppImage.config (revision 36169) @@ -220,6 +220,31 @@ END -# Standard chip processing +# Standard chip processing with auxillary masking CHIP_AUXMASK 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. +END + +# Standard chip processing with heavy auxillary masking (same as CHIP_AUXMASK here, but different in gpc1) +CHIP_AUXMASK_HEAVY METADATA BASE.FITS BOOL FALSE # Save base detrended image? BASE.MASK.FITS BOOL FALSE # Save base detrended image? Index: trunk/ippconfig/recipes/reductionClasses.mdc =================================================================== --- trunk/ippconfig/recipes/reductionClasses.mdc (revision 36111) +++ trunk/ippconfig/recipes/reductionClasses.mdc (revision 36169) @@ -1126,12 +1126,10 @@ STS_DATASET METADATA - # CHIP_PPIMAGE STR CHIP_AUXMASK - # MPG wants auxiliary masking off for now - CHIP_PPIMAGE STR CHIP + CHIP_PPIMAGE STR CHIP_AUXMASK CHIP_PSPHOT STR CHIP WARP_PSWARP STR WARP - STACK_PPSTACK STR STACK + STACK_PPSTACK STR STACK STACK_PPSUB STR STACK - STACK_PSPHOT STR STACK + STACK_PSPHOT STR STACK DIFF_PPSUB STR DIFF DIFF_PSPHOT STR DIFF @@ -1140,6 +1138,6 @@ FAKEPHOT STR FAKEPHOT ADDSTAR STR ADDSTAR - PSASTRO STR STS_DATASET - STACKPHOT STR STACKPHOT + PSASTRO STR STS_DATASET + STACKPHOT STR STACKPHOT END