Index: /branches/eam_branches/ipp-20130509/ippconfig/gpc1/ppImage.config =================================================================== --- /branches/eam_branches/ipp-20130509/ippconfig/gpc1/ppImage.config (revision 35751) +++ /branches/eam_branches/ipp-20130509/ippconfig/gpc1/ppImage.config (revision 35752) @@ -21,14 +21,16 @@ 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 -HAS.VIDEO BOOL FALSE # Treat this OTA as if it has video data -USE.VIDEO.DARK BOOL FALSE # Use a video dark if we have video data? -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. +HAS.VIDEO BOOL FALSE # Treat this OTA as if it has video data +USE.VIDEO.DARK BOOL TRUE # Use a video dark if we have video data? +USE.VIDEO.MASK BOOL FALSE # Use a video mask if we have video data? + +# 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 TRUE # Cell pattern coorection using edge continuity FRINGE BOOL TRUE # Fringe subtraction BIN1.FITS BOOL TRUE # Save 1st binned chip image? @@ -1288,4 +1293,72 @@ CROSSTALK.MEASURE BOOL TRUE # Subtract model background? END + + +# Standard chip processing with background removal, but then added back in +CHIP_RESTORE_BG 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 + 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 FALSE # Row pattern correction + PATTERN.CELL BOOL FALSE # Cell pattern correction + PATTERN.CONTINUITY BOOL FALSE # 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 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 FALSE # 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 + # Standard chip processing Index: /branches/eam_branches/ipp-20130509/ippconfig/gpc1/psastro.config =================================================================== --- /branches/eam_branches/ipp-20130509/ippconfig/gpc1/psastro.config (revision 35751) +++ /branches/eam_branches/ipp-20130509/ippconfig/gpc1/psastro.config (revision 35752) @@ -111,4 +111,7 @@ #PSASTRO.MODEL.BORESITE.X F32 -200.0 #PSASTRO.MODEL.BORESITE.Y F32 -300.0 + +# maximum accepted fwhm_major (moved from camera.config +PSASTRO.MAX.ALLOWED.FWHM F32 12 # *** make sure the choice of CATDIR (dvo database) contains the photcodes desired below @@ -360,4 +363,9 @@ END +CNP_DATASET METADATA + ZERO.POINT.USE.MEAN BOOL TRUE + PSASTRO.MAX.ALLOWED.FWHM F32 25 +END + LAP_ASTRO METADATA # PSASTRO.CATDIR STR 3PI.20110505.REFCAT Index: /branches/eam_branches/ipp-20130509/ippconfig/gpc1/psphot.config =================================================================== --- /branches/eam_branches/ipp-20130509/ippconfig/gpc1/psphot.config (revision 35751) +++ /branches/eam_branches/ipp-20130509/ippconfig/gpc1/psphot.config (revision 35752) @@ -5,6 +5,6 @@ BACKGROUND.YSAMPLE F32 2.0 # size of background superpixels -SOFTEN.VARIANCE BOOL TRUE # XXX drop? soften the errors for bright pixels -SOFTEN.VARIANCE.FRACTION F32 0.005 +SOFTEN.VARIANCE BOOL FALSE # XXX drop? soften the errors for bright pixels +SOFTEN.VARIANCE.FRACTION F32 0.000 # CZW 2013-06-20 I've disabled this, as I don't think it's needed. PEAKS_SMOOTH_SIGMA F32 2.5 # smoothing kernel sigma in pixels Index: /branches/eam_branches/ipp-20130509/ippconfig/megacam/psastro.config =================================================================== --- /branches/eam_branches/ipp-20130509/ippconfig/megacam/psastro.config (revision 35751) +++ /branches/eam_branches/ipp-20130509/ippconfig/megacam/psastro.config (revision 35752) @@ -50,4 +50,6 @@ PSASTRO.MAX.ERROR F32 10.0 # max error in pixels PSASTRO.MIN.NSTAR S32 10 # min fitted stars in solution + +PSASTRO.MAX.ALLOWED.FWHM F32 25 PSASTRO.MOSAIC.MODE BOOL TRUE Index: /branches/eam_branches/ipp-20130509/ippconfig/recipes/filerules-split.mdc =================================================================== --- /branches/eam_branches/ipp-20130509/ippconfig/recipes/filerules-split.mdc (revision 35751) +++ /branches/eam_branches/ipp-20130509/ippconfig/recipes/filerules-split.mdc (revision 35752) @@ -14,4 +14,5 @@ PSASTRO.OUTPUT STR PSASTRO.OUT.CMF.MEF +PSASTRO.OUTPUT.ORIGINAL STR PSASTRO.OUT.ORIGINAL.CMF.MEF # PSASTRO.OUTPUT.SPL STR PSASTRO.OUT.CMF.SPL # PSASTRO.OUTPUT.MEF STR PSASTRO.OUT.CMF.MEF @@ -275,4 +276,6 @@ PSASTRO.CONFIG OUTPUT {OUTPUT}.psastro.mdc TEXT NONE FPA TRUE NONE PSASTRO.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK COMP_MASK CHIP TRUE NONE + +PSASTRO.OUT.ORIGINAL.CMF.MEF OUTPUT {OUTPUT}.smf.original CMF NONE FPA TRUE MEF PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE @@ -410,5 +413,5 @@ PPVIZPATTERN.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE NONE CHIP TRUE NONE -PPBACKGROUND.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE COMP_IMG CHIP TRUE NONE +PPBACKGROUND.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE NONE PPBACKGROUND.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK COMP_MASK CHIP TRUE NONE PPBACKGROUND.OUTPUT.VARIANCE OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits VARIANCE COMP_WT CHIP TRUE NONE Index: /branches/eam_branches/ipp-20130509/ippconfig/recipes/nightly_science.config =================================================================== --- /branches/eam_branches/ipp-20130509/ippconfig/recipes/nightly_science.config (revision 35751) +++ /branches/eam_branches/ipp-20130509/ippconfig/recipes/nightly_science.config (revision 35752) @@ -281,4 +281,5 @@ STACKABLE BOOL FALSE DIFFABLE BOOL FALSE + REDUCTION STR CNP_DATASET CHIP S16 800 WARP S16 800 Index: /branches/eam_branches/ipp-20130509/ippconfig/recipes/ppImage.config =================================================================== --- /branches/eam_branches/ipp-20130509/ippconfig/recipes/ppImage.config (revision 35751) +++ /branches/eam_branches/ipp-20130509/ippconfig/recipes/ppImage.config (revision 35752) @@ -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,62 @@ 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 the background able to be readded +CHIP_RESTORE_BG 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? + 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 TRUE # 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: /branches/eam_branches/ipp-20130509/ippconfig/recipes/psastro.config =================================================================== --- /branches/eam_branches/ipp-20130509/ippconfig/recipes/psastro.config (revision 35751) +++ /branches/eam_branches/ipp-20130509/ippconfig/recipes/psastro.config (revision 35752) @@ -179,5 +179,6 @@ MASKSTAT.ADVISORY U32 0x080 - +# maximum allowed fwhm_major (moved from */camera.config) +PSASTRO.MAX.ALLOWED.FWHM F32 0 # 2MASS default configuration (use 2MASS_J as ref magnitude) @@ -265,4 +266,7 @@ END +CNP_DATASET METADATA +END + SYNTH_CAT METADATA END Index: /branches/eam_branches/ipp-20130509/ippconfig/recipes/pswarp.config =================================================================== --- /branches/eam_branches/ipp-20130509/ippconfig/recipes/pswarp.config (revision 35751) +++ /branches/eam_branches/ipp-20130509/ippconfig/recipes/pswarp.config (revision 35752) @@ -12,4 +12,6 @@ PSF BOOL TRUE # Measure PSF for warped image? SOURCES BOOL TRUE # Write source list for warped image? + +NO.COMPRESS BOOL FALSE # turn off image compression (if enabled) MASK.STATS BOOL TRUE # calculate mask statistics. @@ -27,4 +29,8 @@ END +WARP_NOCOMPRESS METADATA + NO.COMPRESS BOOL TRUE +END + #PR recipe for faster processing PR METADATA Index: /branches/eam_branches/ipp-20130509/ippconfig/recipes/reductionClasses.mdc =================================================================== --- /branches/eam_branches/ipp-20130509/ippconfig/recipes/reductionClasses.mdc (revision 35751) +++ /branches/eam_branches/ipp-20130509/ippconfig/recipes/reductionClasses.mdc (revision 35752) @@ -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