Index: trunk/ippconfig/gpc1/ppImage.config =================================================================== --- trunk/ippconfig/gpc1/ppImage.config (revision 35679) +++ trunk/ippconfig/gpc1/ppImage.config (revision 35685) @@ -21,7 +21,9 @@ USE.DEBURNED.IMAGE BOOL TRUE # use burntool-repaired image? USE.BEST.BURNTOOL BOOL TRUE # require the best burntooled data -MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails +MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails TILTYSTREAK.APPLY BOOL FALSE # apply the 'tiltystreak' tool NOISEMAP BOOL FALSE # Apply read noise map + +APPLY.BURNTOOL BOOL TRUE # apply burntool correction in ppImage # Final detrending options @@ -30,5 +32,5 @@ USE.VIDEO.MASK BOOL TRUE # Use a video mask if we have video data? -# aditional auxillary mask applied to corners of all chips in video cells. +# 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 @@ -153,5 +155,6 @@ FRINGE.FILTERS STR y.00000 -# Standard chip processing (NOTE: when changing this be sure to check whether changes should be applied toCHIP_BGPRESEVE and/or CHIP_AUXMASK +# Standard chip processing (NOTE: when changing this be sure to check whether changes should be applied to +# CHIP_PRESERVE_BG CHIP_AUXMASK or CHIP_PRESERVE_BG_AUXMASK CHIP METADATA BASE.FITS BOOL FALSE # Save base detrended image? @@ -172,5 +175,5 @@ MASK.BUILD BOOL TRUE # Build internal mask? MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails - MASK.AUXMASK BOOL FALSE # augment with more restrictive auxillary mask + 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 @@ -1224,5 +1227,5 @@ END -# Standard chip processing + auxillary mask +# Standard chip processing + auxiliary mask CHIP_AUXMASK METADATA BASE.FITS BOOL FALSE # Save base detrended image? @@ -1243,5 +1246,5 @@ MASK.BUILD BOOL TRUE # Build internal mask? MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails - MASK.AUXMASK BOOL TRUE # augment with more restrictive auxillary mask + 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 @@ -1255,7 +1258,8 @@ BACKGROUND BOOL TRUE # Subtract background? CROSSTALK.MEASURE BOOL TRUE # Subtract model background? -END - -# Standard chip processing without any background removal + NO.COMPRESS BOOL TRUE # turn off image compression +END + +# Standard chip processing without background subtraction or pattern correction CHIP_PRESERVE_BG METADATA BASE.FITS BOOL FALSE # Save base detrended image? @@ -1269,5 +1273,5 @@ BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction - NOISEMAP BOOL FALSE + NOISEMAP BOOL TRUE REMNANCE BOOL FALSE # Remnance masking SHUTTER BOOL FALSE # Shutter correction @@ -1276,7 +1280,8 @@ MASK.BUILD BOOL TRUE # Build internal mask? MASK.BURNTOOL BOOL TRUE # Mask potential burntool trails - MASK.AUXMASK BOOL TRUE # augment with more restrictive auxillary mask + 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 coorection using edge continuity FRINGE BOOL TRUE # Fringe subtraction BIN1.FITS BOOL TRUE # Save 1st binned chip image? @@ -1287,4 +1292,38 @@ BACKGROUND BOOL FALSE # Subtract background? CROSSTALK.MEASURE BOOL TRUE # Subtract model background? +END + +# Standard chip processing without background subtraction, pattern correction, or photometry bug applying auxiliary mask +CHIP_PRESERVE_BG_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 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 FALSE # Row pattern correction + PATTERN.CELL BOOL FALSE # Cell pattern correction + PATTERN.CONTINUITY BOOL TRUE # Cell pattern coorection 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 FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BACKGROUND BOOL FALSE # Subtract background? + CROSSTALK.MEASURE BOOL TRUE # Subtract model background? + NO.COMPRESS BOOL TRUE # turn off image compression END Index: trunk/ippconfig/recipes/ppImage.config =================================================================== --- trunk/ippconfig/recipes/ppImage.config (revision 35679) +++ trunk/ippconfig/recipes/ppImage.config (revision 35685) @@ -18,5 +18,6 @@ MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails MASK.AUXMASK BOOL FALSE # augment mask with auxillary mask -AUX.VIDEO.MASK STR NULL +AUX.VIDEO.MASK STR NULL # name of aditional masking for video cells +APPLY.BURNTOOL BOOL FALSE # apply burntool coorection VARIANCE.BUILD BOOL FALSE # Build internal variance image ADDNOISE BOOL FALSE # Add noise to degrade an MD image to a 3pi image? @@ -47,4 +48,5 @@ TILTYSTREAK.BY.CLASS METADATA # apply the 'tiltystreak' tool END +NO.COMPRESS BOOL FALSE # output data formats to save @@ -2139,4 +2141,33 @@ MASK BOOL TRUE # Mask bad pixels MASK.BUILD BOOL TRUE # Build internal mask? + PATTERN.ROW BOOL FALSE # Subtract pattern noise + PATTERN.CELL BOOL FALSE # Subtract pattern noise + 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 FALSE # Subtract background? + MASK.STATS BOOL TRUE # Calculate Mask statistics +END + +# Standard chip processing with auxiliary mask but without any background removal or pattern correction +CHIP_PRESERVE_BG_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 # 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 TRUE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? + MASK.AUXMASK BOOL TRUE # augment mask with more restrictive auxiliary mask PATTERN.ROW BOOL FALSE # Subtract pattern noise PATTERN.CELL BOOL FALSE # Subtract pattern noise Index: trunk/ippconfig/recipes/reductionClasses.mdc =================================================================== --- trunk/ippconfig/recipes/reductionClasses.mdc (revision 35679) +++ trunk/ippconfig/recipes/reductionClasses.mdc (revision 35685) @@ -1047,8 +1047,32 @@ END -M31_DATASET METADATA +M31_BG_SUBTRACT METADATA CHIP_PPIMAGE STR CHIP_AUXMASK CHIP_PSPHOT STR CHIP - WARP_PSWARP STR WARP + WARP_PSWARP STR WARP_NOCOMPRESS + STACK_PPSTACK STR STACK + STACK_PPSUB STR STACK + STACK_PSPHOT STR STACK + DIFF_PPSUB STR DIFF + DIFF_PSPHOT STR DIFF + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + FAKEPHOT STR FAKEPHOT + ADDSTAR STR ADDSTAR + PSASTRO STR DEFAULT_RECIPE + STACKPHOT_PSPHOT STR STACKPHOT + STACKPHOT_PPSUB STR STACKPHOT + STACKPHOT_PPSTACK STR STACKPHOT + STACKPHOT_SINGLE_PSPHOT STR STACKPHOT_SINGLE + BACKGROUND_PPBACKGROUND STR BACKGROUND + BACKGROUND_PSWARP STR BACKGROUND + PSVIDEOPHOT STR PSVIDEOPHOT + STATICSKY_CALIBRATION STR STATICSKY_CAL +END + +M31_BG_PRESERVE METADATA + CHIP_PPIMAGE STR CHIP_PRESERVE_BG_AUXMASK + CHIP_PSPHOT STR CHIP + WARP_PSWARP STR WARP_NOCOMPRESS STACK_PPSTACK STR STACK STACK_PPSUB STR STACK