Index: /tags/ipp-20170121/ippconfig/gpc1/ppImage.config =================================================================== --- /tags/ipp-20170121/ippconfig/gpc1/ppImage.config (revision 40619) +++ /tags/ipp-20170121/ippconfig/gpc1/ppImage.config (revision 40620) @@ -225,4 +225,36 @@ CROSSTALK.MEASURE BOOL FALSE # Subtract model background? NO.COMPRESS BOOL TRUE # do not compress images +END + +# test for MOPS request reprocessing without masking +CHIP_NOMASKTEST 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 FALSE # Mask bad pixels + MASK.BUILD BOOL FALSE # 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? END Index: /tags/ipp-20170121/ippconfig/gpc2/ppImage.config =================================================================== --- /tags/ipp-20170121/ippconfig/gpc2/ppImage.config (revision 40619) +++ /tags/ipp-20170121/ippconfig/gpc2/ppImage.config (revision 40620) @@ -1,3 +1,3 @@ - +BACKGROUND BOOL FALSE # binned output image options BIN1.XBIN S32 16 @@ -36,84 +36,6 @@ # AUX.VIDEO.MASK STR neb://any/gpc1/auxmask/mpg.20130930/mask_video_cell_corners.fits - +# only valid for GPC1 TILTYSTREAK.BY.CLASS METADATA # apply the 'tiltystreak' tool -APPLY.XY01 BOOL FALSE -APPLY.XY03 BOOL FALSE -APPLY.XY04 BOOL FALSE -APPLY.XY05 BOOL FALSE -APPLY.XY06 BOOL FALSE -APPLY.XY10 BOOL FALSE -APPLY.XY11 BOOL FALSE -APPLY.XY13 BOOL FALSE -APPLY.XY14 BOOL FALSE -APPLY.XY15 BOOL FALSE -APPLY.XY16 BOOL FALSE -APPLY.XY17 BOOL FALSE -APPLY.XY20 BOOL FALSE -APPLY.XY21 BOOL FALSE -APPLY.XY23 BOOL FALSE -APPLY.XY24 BOOL FALSE -APPLY.XY25 BOOL FALSE -APPLY.XY26 BOOL FALSE -APPLY.XY30 BOOL FALSE -APPLY.XY31 BOOL FALSE -APPLY.XY33 BOOL FALSE -APPLY.XY34 BOOL FALSE -APPLY.XY35 BOOL FALSE -APPLY.XY36 BOOL FALSE -APPLY.XY37 BOOL FALSE -APPLY.XY40 BOOL FALSE -APPLY.XY41 BOOL FALSE -APPLY.XY42 BOOL FALSE -APPLY.XY43 BOOL FALSE -APPLY.XY44 BOOL FALSE -APPLY.XY46 BOOL FALSE -APPLY.XY50 BOOL FALSE -APPLY.XY52 BOOL FALSE -APPLY.XY53 BOOL FALSE -APPLY.XY54 BOOL FALSE -APPLY.XY56 BOOL FALSE -APPLY.XY60 BOOL FALSE -APPLY.XY62 BOOL FALSE -APPLY.XY63 BOOL FALSE -APPLY.XY64 BOOL FALSE -APPLY.XY66 BOOL FALSE -APPLY.XY71 BOOL FALSE -APPLY.XY72 BOOL FALSE -APPLY.XY73 BOOL FALSE -APPLY.XY74 BOOL FALSE -APPLY.XY76 BOOL FALSE - -APPLY.XY02 BOOL TRUE -APPLY.XY12 BOOL TRUE -APPLY.XY22 BOOL TRUE -APPLY.XY27 BOOL TRUE -APPLY.XY32 BOOL TRUE -APPLY.XY45 BOOL TRUE -APPLY.XY47 BOOL TRUE -APPLY.XY51 BOOL TRUE -APPLY.XY55 BOOL TRUE -APPLY.XY57 BOOL TRUE -APPLY.XY61 BOOL TRUE -APPLY.XY65 BOOL TRUE -APPLY.XY67 BOOL TRUE -APPLY.XY75 BOOL TRUE - -OPTIONS.XY02 STR mask=0001011100010111000101110001011100010111000101110001011100010111 # cols: 3,5,6,7 -OPTIONS.XY12 STR mask=0000011100000111000001110000011100000111111101111111011111110111 # col 5,6,7 (+ 0,1,2,3 for row > 4) -OPTIONS.XY22 STR mask=0001001100010011000100110001001100010011000100110001001100010011 # cols: 3,6,7 -OPTIONS.XY27 STR none -OPTIONS.XY32 STR mask=0011011100110111001101110011011100110111001101110011011100110111 # cols: 2,3,5,6,7 -OPTIONS.XY45 STR mask=0111111101111111011111111111111111111111111111111111111111111111 # all except 00, 01, 02 -OPTIONS.XY47 STR mask=1111111001111110011111100111111001111110011111100111111001111110 # cols: 2,3,4,5,6,7 (add 00) -OPTIONS.XY51 STR mask=0011101100111011001110110011101100111011001110110011101100111011 # cols: 2,3,4,6,7 -OPTIONS.XY55 STR mask=0000000011111111111111111111111111111111111111111111111111111111 # all except row 0 -OPTIONS.XY57 STR none -OPTIONS.XY61 STR none -OPTIONS.XY65 STR mask=0111011101110111011101110111011101110111011101110111011101110111 # cols: 1,2,3,5,6,7 -OPTIONS.XY67 STR mask=1100111111001111110011111100111100000000000000000000000000000000 # cols: 0,1,4,5,6,7 except rows 4,5,6,7 -OPTIONS.XY75 STR mask=0001111100011111000111110001111100011111000111110001111100011111 # cols: 3,4,5,6,7 - -# OPTIONS.XY02 STR mask=00010111.00010111.00010111.00010111.00010111.00010111.00010111.00010111 # cols: 3,5,6,7 END @@ -222,4 +144,37 @@ END +# test for MOPS request reprocessing without masking +CHIP_NOMASKTEST 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 # apply non-linearity correction + 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 FALSE # Mask bad pixels + MASK.BUILD BOOL FALSE # Build internal mask? + MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails + 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 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? +END + # Chip processing for testing pattern correction CHIP_PATTERNTEST METADATA @@ -318,7 +273,7 @@ OVERSCAN BOOL TRUE # Overscan subtraction NONLIN BOOL FALSE # Non-linearity correction; not implemented - NOISEMAP BOOL TRUE BIAS BOOL FALSE # Bias subtraction DARK BOOL TRUE # Dark subtraction + NOISEMAP BOOL FALSE REMNANCE BOOL FALSE # Remnance masking SHUTTER BOOL FALSE # Shutter correction @@ -326,9 +281,9 @@ 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 + 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? @@ -341,5 +296,4 @@ DETREND.CONSTRAINTS METADATA DARK METADATA - DETTYPE STR DARKTEST EXPTIME STR FPA.EXPOSURE END @@ -641,5 +595,5 @@ DETREND.CONSTRAINTS METADATA DARK METADATA - DETTYPE STR DARK + DETTYPE STR DARK_PREMASK EXPTIME STR FPA.EXPOSURE END @@ -696,5 +650,5 @@ DETREND.CONSTRAINTS METADATA DARK METADATA - DETTYPE STR DARK + DETTYPE STR DARK_PREMASK EXPTIME STR FPA.EXPOSURE END @@ -1688,4 +1642,31 @@ END +# CZW 2018-02-14 +# The default PPIMAGE_N includes BACKGROUND=T, and that breaks detrend construction +PPIMAGE_N METADATA + BASE.FITS BOOL TRUE # 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 FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL FALSE # Build internal mask? + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + BACKGROUND BOOL FALSE # Subtract background? +END + + # test recipes # currently : default CHIP recipe @@ -1795,2 +1776,34 @@ END +PPIMAGE_BKGCONT METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL FALSE # Build internal mask? + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BASE.FITS BOOL FALSE # Save base image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL FALSE # Save chip-mosaic-ed image? + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? + BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? + BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? + BIN1.XBIN S32 1 # Image is already binned + BIN1.YBIN S32 1 # Image is already binned + BIN2.XBIN S32 1 # Image is already binned + BIN2.YBIN S32 1 # Image is already binned + MASK.SATURATED BOOL FALSE # DO NOT Mask the saturated pixels + MASK.LOW BOOL FALSE # DO NOT Mask the saturated pixels + BACKGROUND.CONTINUITY BOOL FALSE + PATTERN.CONTINUITY.WIDTH S32 2 +END Index: /tags/ipp-20170121/ippconfig/recipes/ppImage.config =================================================================== --- /tags/ipp-20170121/ippconfig/recipes/ppImage.config (revision 40619) +++ /tags/ipp-20170121/ippconfig/recipes/ppImage.config (revision 40620) @@ -512,4 +512,8 @@ # Standard chip processing for areas with high stellar density CHIP_DENSE_STARS METADATA +END + +# test for MOPS request reprocessing without masking -- may be different for gpc1/gpc2 +CHIP_NOMASKTEST METADATA END Index: /tags/ipp-20170121/ippconfig/recipes/reductionClasses.mdc =================================================================== --- /tags/ipp-20170121/ippconfig/recipes/reductionClasses.mdc (revision 40619) +++ /tags/ipp-20170121/ippconfig/recipes/reductionClasses.mdc (revision 40620) @@ -552,4 +552,28 @@ JPEG_BIN1 STR PPIMAGE_J1 JPEG_BIN2 STR PPIMAGE_J2 +END + +# test for MOPS request reprocessing without masking +NOMASKTEST METADATA + CHIP_PPIMAGE STR CHIP_NOMASKTEST + 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