Index: branches/eam_branches/ipp-20130904/ippconfig/gpc1/ppImage.config =================================================================== --- branches/eam_branches/ipp-20130904/ippconfig/gpc1/ppImage.config (revision 36163) +++ branches/eam_branches/ipp-20130904/ippconfig/gpc1/ppImage.config (revision 36192) @@ -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 @@ -189,4 +189,37 @@ END +CHIP_NOCOMPRESS 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 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 # 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 # do not compress images +END + # Chip processing for testing pattern correction CHIP_PATTERNTEST METADATA @@ -1259,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 @@ -1359,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: branches/eam_branches/ipp-20130904/ippconfig/gpc1/ppStack.config =================================================================== --- branches/eam_branches/ipp-20130904/ippconfig/gpc1/ppStack.config (revision 36163) +++ branches/eam_branches/ipp-20130904/ippconfig/gpc1/ppStack.config (revision 36192) @@ -125,9 +125,14 @@ END -STACK_NIGHTLY_1DG METADATA # Typically MD 8 input nightly stacks and using 1DG convolution - OUTPUT.NOCOMP BOOL FALSE - OUTPUT.LOGFLUX BOOL FALSE - PSF.TARGET.AS.MAX BOOL TRUE - PSF.TARGET.AS.MAX.EPSILON F32 0.1 +STACK_NIGHTLY_1DG METADATA # Revised MD 8 input nightly stacks and using 1DG convolution + OUTPUT.NOCOMP BOOL FALSE + OUTPUT.LOGFLUX BOOL FALSE + PSF.INPUT.CLIP.SIMPLE BOOL True + PSF.INPUT.MAX F32 12.0 # what FWHM does diffim become mostly useless, if any? + PSF.INPUT.CLIP.NSIGMA F32 1000.0 # want to use up to MAX, but sig could possibly be small? + MATCH.REJ F32 4.0 # need to tune? + SAFE BOOL FALSE + PSF.TARGET.AS.MAX BOOL TRUE + PSF.TARGET.AS.MAX.EPSILON F32 0.1 END @@ -138,9 +143,9 @@ STACK.TYPE STR DEEP_STACK ## needed? PSF.INPUT.CLIP.SIMPLE BOOL True - PSF.INPUT.MAX F32 6.0 # never really want >6 pixels in refstack + PSF.INPUT.MAX F32 6.0 # never really want >6 pixels in refstack, even on edges PSF.INPUT.CLIP.NSIGMA F32 1.0 # sample typically on rising side of distribution (set even smaller?) PSF.INPUT.THRESH F32 NAN PSF.INPUT.ASYMMETRY F32 NAN - MATCH.REJ F32 4.0 # need ot tune? + MATCH.REJ F32 4.0 # need ot tune? SAFE BOOL FALSE PSF.TARGET.AS.MAX BOOL TRUE # Set the target PSF FWHM as the maximum of accepted input FWHM values. @@ -154,9 +159,9 @@ STACK.TYPE STR DEEP_STACK PSF.INPUT.CLIP.SIMPLE BOOL True - PSF.INPUT.MAX F32 10.0 + PSF.INPUT.MAX F32 10.0 # PSF.INPUT.CLIP.NSIGMA F32 100.0 PSF.INPUT.THRESH F32 NAN PSF.INPUT.ASYMMETRY F32 NAN - MATCH.REJ F32 4.0 # need ot tune? + MATCH.REJ F32 4.0 # need ot tune? SAFE BOOL FALSE PSF.TARGET.AS.MAX BOOL TRUE @@ -164,5 +169,5 @@ END -STACK_ALLDEEP_1DG METADATA # no cuts, everything in changes after ppStack mods 5/03/13 +STACK_ALLDEEP_1DG METADATA # no real cuts, for changes after ppStack mods 5/03/13 OUTPUT.NOCOMP BOOL TRUE OUTPUT.LOGFLUX BOOL FALSE @@ -170,9 +175,9 @@ STACK.TYPE STR DEEP_STACK PSF.INPUT.CLIP.SIMPLE BOOL True - PSF.INPUT.MAX F32 100.0 + PSF.INPUT.MAX F32 14.0 # greater than 14 is more often junk PSF.INPUT.CLIP.NSIGMA F32 100.0 PSF.INPUT.THRESH F32 NAN PSF.INPUT.ASYMMETRY F32 NAN - MATCH.REJ F32 4.0 # need ot tune? + MATCH.REJ F32 4.0 # need ot tune? SAFE BOOL FALSE PSF.TARGET.AS.MAX BOOL TRUE Index: branches/eam_branches/ipp-20130904/ippconfig/recipes/filerules-split.mdc =================================================================== --- branches/eam_branches/ipp-20130904/ippconfig/recipes/filerules-split.mdc (revision 36163) +++ branches/eam_branches/ipp-20130904/ippconfig/recipes/filerules-split.mdc (revision 36192) @@ -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: branches/eam_branches/ipp-20130904/ippconfig/recipes/ppImage.config =================================================================== --- branches/eam_branches/ipp-20130904/ippconfig/recipes/ppImage.config (revision 36163) +++ branches/eam_branches/ipp-20130904/ippconfig/recipes/ppImage.config (revision 36192) @@ -194,7 +194,57 @@ MASK.STATS BOOL TRUE # Calculate Mask statistics. END - # Standard chip processing +CHIP_NOCOMPRESS 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. + NO.COMPRESS BOOL TRUE +END + +# 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: branches/eam_branches/ipp-20130904/ippconfig/recipes/reductionClasses.mdc =================================================================== --- branches/eam_branches/ipp-20130904/ippconfig/recipes/reductionClasses.mdc (revision 36163) +++ branches/eam_branches/ipp-20130904/ippconfig/recipes/reductionClasses.mdc (revision 36192) @@ -1129,4 +1129,21 @@ 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 STS_DATASET + STACKPHOT STR STACKPHOT +END + +STS_DATASET_NOCOMPRESS METADATA + CHIP_PPIMAGE STR CHIP_NOCOMPRESS + CHIP_PSPHOT STR CHIP + WARP_PSWARP STR WARP_NOCOMPRESS STACK_PPSTACK STR STACK STACK_PPSUB STR STACK