Index: branches/eam_branches/ipp-20130419/ippconfig/gpc1/ppImage.config =================================================================== --- branches/eam_branches/ipp-20130419/ippconfig/gpc1/ppImage.config (revision 35540) +++ branches/eam_branches/ipp-20130419/ippconfig/gpc1/ppImage.config (revision 35548) @@ -30,4 +30,7 @@ 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. +# 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 @@ -150,5 +153,5 @@ FRINGE.FILTERS STR y.00000 -# Standard chip processing +# Standard chip processing (NOTE: when changing this be sure to check whether changes should be applied toCHIP_BGPRESEVE and/or CHIP_AUXMASK CHIP METADATA BASE.FITS BOOL FALSE # Save base detrended image? @@ -169,4 +172,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 PATTERN.ROW BOOL TRUE # Row pattern correction PATTERN.CELL BOOL FALSE # Cell pattern correction @@ -1220,4 +1224,37 @@ END +# Standard chip processing + auxillary mask +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 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 with more restrictive auxillary 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 TRUE # Subtract model background? +END + # Standard chip processing without any background removal CHIP_PRESERVE_BG METADATA @@ -1239,4 +1276,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 PATTERN.ROW BOOL FALSE # Row pattern correction PATTERN.CELL BOOL FALSE # Cell pattern correction Index: branches/eam_branches/ipp-20130419/ippconfig/gpc1/ppStack.config =================================================================== --- branches/eam_branches/ipp-20130419/ippconfig/gpc1/ppStack.config (revision 35540) +++ branches/eam_branches/ipp-20130419/ippconfig/gpc1/ppStack.config (revision 35548) @@ -61,6 +61,22 @@ PSF.INPUT.MAX F32 10.0 # input cut more restrictive now 12->10 pix, limit target PSF in convolved stacks PSF.INPUT.CLIP.NSIGMA F32 1.5 # additional cut if majority of inputs much smaller than INPUT.MAX - PSF.INPUT.THRESH F32 5.0 + PSF.INPUT.THRESH F32 10.0 PSF.INPUT.ASYMMETRY F32 0.2 + MATCH.REJ F32 4.0 + SAFE BOOL F + +END + +STACK_THREEPI_ALT METADATA + OUTPUT.NOCOMP BOOL TRUE ## MD test mod + OUTPUT.LOGFLUX BOOL FALSE ## MD test mod + STACK.TYPE STR DEEP_STACK ## MD test mod + PSF.INPUT.MAX F32 10.0 # input cut more restrictive now 12->10 pix, limit target PSF in convolved stacks + PSF.INPUT.CLIP.NSIGMA F32 1.5 # additional cut if majority of inputs much smaller than INPUT.MAX + PSF.INPUT.THRESH F32 10.0 + PSF.INPUT.ASYMMETRY F32 0.2 + MATCH.REJ F32 4.0 + SAFE BOOL F + END Index: branches/eam_branches/ipp-20130419/ippconfig/gpc1/psastro.config =================================================================== --- branches/eam_branches/ipp-20130419/ippconfig/gpc1/psastro.config (revision 35540) +++ branches/eam_branches/ipp-20130419/ippconfig/gpc1/psastro.config (revision 35548) @@ -121,5 +121,5 @@ DVO.GETSTAR.MAX.RHO F32 3000.0 DVO.GETSTAR.MIN.MAG F32 12.0 -DVO.GETSTAR.MIN.MAG.INST F32 -15.0 +DVO.GETSTAR.MIN.MAG.INST F32 -25.0 # rather than mean, use specified EDGE: @@ -402,5 +402,5 @@ PSASTRO.MOSAIC.MODE BOOL FALSE DVO.GETSTAR.FIXED.ZEROPT F32 25.0 - + DVO.GETSTAR.MIN.MAG.INST F32 -15.0 PSASTRO.CATDIR STR PS1.REF.20120524 ZERO.POINT.USE.MEAN BOOL TRUE Index: branches/eam_branches/ipp-20130419/ippconfig/recipes/ppImage.config =================================================================== --- branches/eam_branches/ipp-20130419/ippconfig/recipes/ppImage.config (revision 35540) +++ branches/eam_branches/ipp-20130419/ippconfig/recipes/ppImage.config (revision 35548) @@ -17,4 +17,6 @@ MASK.LOW BOOL TRUE # Mask pixels below valid range MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails +MASK.AUXMASK BOOL FALSE # augment mask with auxillary mask +AUX.VIDEO.MASK STR NULL VARIANCE.BUILD BOOL FALSE # Build internal variance image ADDNOISE BOOL FALSE # Add noise to degrade an MD image to a 3pi image? @@ -168,4 +170,29 @@ # Standard chip processing CHIP 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 +CHIP_AUXMASK METADATA BASE.FITS BOOL FALSE # Save base detrended image? BASE.MASK.FITS BOOL FALSE # Save base detrended image? Index: branches/eam_branches/ipp-20130419/ippconfig/recipes/ppStack.config =================================================================== --- branches/eam_branches/ipp-20130419/ippconfig/recipes/ppStack.config (revision 35540) +++ branches/eam_branches/ipp-20130419/ippconfig/recipes/ppStack.config (revision 35548) @@ -90,8 +90,9 @@ -PSF.INPUT.MAX F32 NAN -PSF.INPUT.CLIP.NSIGMA F32 NAN -PSF.INPUT.THRESH F32 NAN -PSF.INPUT.ASYMMETRY F32 NAN +PSF.INPUT.CLIP.SIMPLE BOOL F # Should we do a simple sigma clip (T, requires CLIP.NSIGMA) or the mixture model (F, requires all parameters) +PSF.INPUT.MAX F32 NAN # Set maximum limit on input FWHM (defaults to inf) +PSF.INPUT.CLIP.NSIGMA F32 NAN # Set n-sigma cut limit for input rejection +PSF.INPUT.THRESH F32 NAN # Set minimum limit below which we do not exclude an input (defaults to 0.0) +PSF.INPUT.ASYMMETRY F32 NAN # Set difference in mixture model populations to consider equal. TEMP.IMAGE STR conv.im.fits # Suffix for temporary convolved images @@ -160,4 +161,6 @@ STACK_THREEPI METADATA END +STACK_THREEPI_ALT METADATA +END STACK_ALLDEEP METADATA Index: branches/eam_branches/ipp-20130419/ippconfig/recipes/reductionClasses.mdc =================================================================== --- branches/eam_branches/ipp-20130419/ippconfig/recipes/reductionClasses.mdc (revision 35540) +++ branches/eam_branches/ipp-20130419/ippconfig/recipes/reductionClasses.mdc (revision 35548) @@ -538,4 +538,11 @@ END +THREEPI_STACK_ALT METADATA + STACK_PPSTACK STR STACK_THREEPI_ALT + STACK_PPSUB STR STACK + STACK_PSPHOT STR STACK +END + + # quick stacks QUICKSTACK METADATA @@ -632,4 +639,23 @@ PRESERVE_BG METADATA CHIP_PPIMAGE STR CHIP_PRESERVE_BG + CHIP_PSPHOT STR CHIP + WARP_PSWARP STR WARP + 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 + BACKGROUND_PPBACKGROUND STR BACKGROUND + BACKGROUND_PSWARP STR BACKGROUND +END + +# Background removal, but then add it back in +RESTORE_BG METADATA + CHIP_PPIMAGE STR CHIP_RESTORE_BG CHIP_PSPHOT STR CHIP WARP_PSWARP STR WARP @@ -981,5 +1007,5 @@ STS_DATASET METADATA - CHIP_PPIMAGE STR CHIP + CHIP_PPIMAGE STR CHIP_AUXMASK CHIP_PSPHOT STR CHIP WARP_PSWARP STR WARP @@ -997,4 +1023,28 @@ END +M31_DATASET METADATA + CHIP_PPIMAGE STR CHIP_AUXMASK + CHIP_PSPHOT STR CHIP + WARP_PSWARP STR WARP + 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 + CNP_DATASET METADATA CHIP_PPIMAGE STR CHIP