Index: /tags/ipp-ps1-20210510/ippconfig/gpc1/ppImage.config =================================================================== --- /tags/ipp-ps1-20210510/ippconfig/gpc1/ppImage.config (revision 41650) +++ /tags/ipp-ps1-20210510/ippconfig/gpc1/ppImage.config (revision 41651) @@ -447,4 +447,53 @@ DETREND.CONSTRAINTS METADATA + MASK METADATA + DETTYPE STR MASKTEST + END + VIDEOMASK METADATA + DETTYPE STR VIDEOMASKTEST + END + FLAT METADATA + FILTER STR FPA.FILTERID + END + FLATCORR METADATA + FILTER STR FPA.FILTERID + END + FRINGE METADATA + FILTER STR FPA.FILTERID + END + END +END + +CHIP_DARKTEST_MASKTEST 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 # Non-linearity correction; not implemented + NOISEMAP BOOL TRUE + 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 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? + + DETREND.CONSTRAINTS METADATA DARK METADATA DETTYPE STR DARKTEST Index: /tags/ipp-ps1-20210510/ippconfig/gpc2/ppImage.config =================================================================== --- /tags/ipp-ps1-20210510/ippconfig/gpc2/ppImage.config (revision 41650) +++ /tags/ipp-ps1-20210510/ippconfig/gpc2/ppImage.config (revision 41651) @@ -356,5 +356,55 @@ DETREND.CONSTRAINTS METADATA + MASK METADATA + DETTYPE STR MASKTEST + END + VIDEOMASK METADATA + DETTYPE STR VIDEOMASKTEST + END + FLAT METADATA + FILTER STR FPA.FILTERID + END + FLATCORR METADATA + FILTER STR FPA.FILTERID + END + FRINGE METADATA + FILTER STR FPA.FILTERID + END + END +END + +CHIP_DARKTEST_MASKTEST 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 FALSE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + NOISEMAP BOOL FALSE + 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 FALSE # 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 FALSE # 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? + + DETREND.CONSTRAINTS METADATA DARK METADATA + DETTYPE STR DARKTEST EXPTIME STR FPA.EXPOSURE END Index: /tags/ipp-ps1-20210510/ippconfig/recipes/ppImage.config =================================================================== --- /tags/ipp-ps1-20210510/ippconfig/recipes/ppImage.config (revision 41650) +++ /tags/ipp-ps1-20210510/ippconfig/recipes/ppImage.config (revision 41651) @@ -461,4 +461,37 @@ DETREND.CONSTRAINTS METADATA + MASK METADATA + DETTYPE STR MASKTEST + END + VIDEOMASK METADATA + DETTYPE STR VIDEOMASKTEST + END + END +END + +CHIP_DARKTEST_MASKTEST 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. + + DETREND.CONSTRAINTS METADATA DARK METADATA DETTYPE STR DARKTEST @@ -473,5 +506,5 @@ END END - + CHIP_NOISEMAP METADATA BASE.FITS BOOL FALSE # Save base detrended image? Index: /tags/ipp-ps1-20210510/ippconfig/recipes/reductionClasses.mdc =================================================================== --- /tags/ipp-ps1-20210510/ippconfig/recipes/reductionClasses.mdc (revision 41650) +++ /tags/ipp-ps1-20210510/ippconfig/recipes/reductionClasses.mdc (revision 41651) @@ -490,4 +490,27 @@ END +# Sweetspot reduction class +SWEETSPOT METADATA + CHIP_PPIMAGE STR CHIP + CHIP_PSPHOT STR CHIP + WARP_PSWARP STR WARP + STACK_PPSTACK STR QUICKSTACK + STACK_PPSUB STR STACK + STACK_PSPHOT STR STACK + DIFF_PPSUB STR DIFF + DIFF_PSPHOT STR SSTF_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 +END # Sweetspot reduction class @@ -585,7 +608,8 @@ END -# Sweetspot reduction class -SWEETSPOT METADATA - CHIP_PPIMAGE STR CHIP +# For use when both MASKTEST and DARKTEST are used +# at the same time +SWEETSPOT_DARKTEST_MASKTEST METADATA + CHIP_PPIMAGE STR CHIP_DARKTEST_MASKTEST CHIP_PSPHOT STR CHIP WARP_PSWARP STR WARP