Index: trunk/ippconfig/gpc1/format_20100723.config =================================================================== --- trunk/ippconfig/gpc1/format_20100723.config (revision 42891) +++ trunk/ippconfig/gpc1/format_20100723.config (revision 42892) @@ -166,4 +166,66 @@ END +OVERSCAN.2D.SUBSET METADATA +XY01 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY02 STR 1111111111111111111111111111111111111111111111001111100011100000 +XY03 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY04 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY05 STR 1111111111111111111111111111111111111111011111110011111100011111 +XY06 STR 1111111111111111111111111111111111110111111111111111111111111111 +XY10 STR 1111111111111111111111111111111111110111111111111111111111111111 +XY11 STR 0000000000000000000000000000000000000000000000000000000000000000 +XY12 STR 1111111011111010111110001111100011110000111100001110000011100000 +XY13 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY14 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY15 STR 1111111111111111010011111111111111111111111111111111111111111111 +XY16 STR 0111111111111111111011111111111111111111111111111111111101111111 +XY17 STR 0000000000000000000000000000000000000000000000000000000000000000 +XY20 STR 1111111111111111111111111111111111111111111111001111100011100000 +XY21 STR 1111111111101111111011111111111111111111111111111111111011111000 +XY22 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY23 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY24 STR 1111111111111111111111111111111111100000110000001100000011000000 +XY25 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY26 STR 1111101111111111111111111111111111111111111111111111111111111111 +XY27 STR 1111111111111111111111111111111111111111011111110011111100001111 +XY30 STR 1111000011110000111100001111000011110000111100001111000011110000 +XY31 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY32 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY33 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY34 STR 1111111110111111111111111111111111111111111111111111111111111111 +XY35 STR 1111111111111111111111111111111111111111111111111111101111111111 +XY36 STR 1110000011000000110000000100000011000000110000001001000011000000 +XY37 STR 0111111111111111001111111111111111111111111111111111111111111111 +XY40 STR 1111111110111111111111111011111111111111111111111111111111111111 +XY41 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY42 STR 1111111111111111111111111111111111111111111111111111111101111111 +XY43 STR 0111111111111111111111111111111111111111111111111111111111111111 +XY44 STR 1111111101111111111111111111111111111111111111111111111011111100 +XY45 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY46 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY47 STR 1100000011000000110000001100000011000000110000001000000010000000 +XY50 STR 1111111111111111111111111111111111111111011111110011111100011111 +XY51 STR 0111111111111111111111111111111111111111111111111111111111111111 +XY52 STR 1111111111111111111111111111111111111111111111110111111100111111 +XY53 STR 0111111111111111111111111111111111111111111111111111111111111111 +XY54 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY55 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY56 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY57 STR 1111111111111111111111110111111111111111111111111111111111111111 +XY60 STR 1111111111111111111111111111111111111111011111110011111100000111 +XY61 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY62 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY63 STR 0011111111111111111111111111111111111111111111111111111111111111 +XY64 STR 1111111111111111111111111111111111111111111111111111111111111110 +XY65 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY66 STR 1110000011100000111000001110000011000000110000001010001110000011 +XY67 STR 1111111111111111111111111111111111111111111111101111110011110000 +XY71 STR 0000000000000000000000000000000000000000000000000000000000000000 +XY72 STR 1111111111111111111111111111111111111111011111100011111100001111 +XY73 STR 1111111111111111111111111110111111111111111111111111111111111111 +XY74 STR 1111111011111111110111101110111111111111111111111110111111101111 +XY75 STR 1111111111111111111111111111111111111111111111101111100011100000 +XY76 STR 1111111111111111111110111111111111111110111111101110000000000000 +END # How to translate PS concepts into FITS headers Index: trunk/ippconfig/gpc1/format_20220827.config =================================================================== --- trunk/ippconfig/gpc1/format_20220827.config (revision 42891) +++ trunk/ippconfig/gpc1/format_20220827.config (revision 42892) @@ -166,4 +166,66 @@ END +OVERSCAN.2D.SUBSET METADATA +XY01 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY02 STR 1111111111111111111111111111111111111111111111001111100011100000 +XY03 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY04 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY05 STR 1111111111111111111111111111111111111111011111110011111100011111 +XY06 STR 1111111111111111111111111111111111110111111111111111111111111111 +XY10 STR 1111111111111111111111111111111111110111111111111111111111111111 +XY11 STR 0000000000000000000000000000000000000000000000000000000000000000 +XY12 STR 1111111011111010111110001111100011110000111100001110000011100000 +XY13 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY14 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY15 STR 1111111111111111010011111111111111111111111111111111111111111111 +XY16 STR 0111111111111111111011111111111111111111111111111111111101111111 +XY17 STR 0000000000000000000000000000000000000000000000000000000000000000 +XY20 STR 1111111111111111111111111111111111111111111111001111100011100000 +XY21 STR 1111111111101111111011111111111111111111111111111111111011111000 +XY22 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY23 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY24 STR 1111111111111111111111111111111111100000110000001100000011000000 +XY25 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY26 STR 1111101111111111111111111111111111111111111111111111111111111111 +XY27 STR 1111111111111111111111111111111111111111011111110011111100001111 +XY30 STR 1111000011110000111100001111000011110000111100001111000011110000 +XY31 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY32 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY33 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY34 STR 1111111110111111111111111111111111111111111111111111111111111111 +XY35 STR 1111111111111111111111111111111111111111111111111111101111111111 +XY36 STR 1110000011000000110000000100000011000000110000001001000011000000 +XY37 STR 0111111111111111001111111111111111111111111111111111111111111111 +XY40 STR 1111111110111111111111111011111111111111111111111111111111111111 +XY41 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY42 STR 1111111111111111111111111111111111111111111111111111111101111111 +XY43 STR 0111111111111111111111111111111111111111111111111111111111111111 +XY44 STR 1111111101111111111111111111111111111111111111111111111011111100 +XY45 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY46 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY47 STR 1100000011000000110000001100000011000000110000001000000010000000 +XY50 STR 1111111111111111111111111111111111111111011111110011111100011111 +XY51 STR 0111111111111111111111111111111111111111111111111111111111111111 +XY52 STR 1111111111111111111111111111111111111111111111110111111100111111 +XY53 STR 0111111111111111111111111111111111111111111111111111111111111111 +XY54 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY55 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY56 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY57 STR 1111111111111111111111110111111111111111111111111111111111111111 +XY60 STR 1111111111111111111111111111111111111111011111110011111100000111 +XY61 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY62 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY63 STR 0011111111111111111111111111111111111111111111111111111111111111 +XY64 STR 1111111111111111111111111111111111111111111111111111111111111110 +XY65 STR 1111111111111111111111111111111111111111111111111111111111111111 +XY66 STR 1110000011100000111000001110000011000000110000001010001110000011 +XY67 STR 1111111111111111111111111111111111111111111111101111110011110000 +XY71 STR 0000000000000000000000000000000000000000000000000000000000000000 +XY72 STR 1111111111111111111111111111111111111111011111100011111100001111 +XY73 STR 1111111111111111111111111110111111111111111111111111111111111111 +XY74 STR 1111111011111111110111101110111111111111111111111110111111101111 +XY75 STR 1111111111111111111111111111111111111111111111101111100011100000 +XY76 STR 1111111111111111111110111111111111111110111111101110000000000000 +END # How to translate PS concepts into FITS headers Index: trunk/ippconfig/recipes/ppImage.config =================================================================== --- trunk/ippconfig/recipes/ppImage.config (revision 42891) +++ trunk/ippconfig/recipes/ppImage.config (revision 42892) @@ -97,4 +97,10 @@ # Overscan subtraction OVERSCAN.SINGLE BOOL TRUE # Reduce overscan to a single value? +OVERSCAN.CONSTANT BOOL FALSE # Apply a known, fixed value? +OVERSCAN.VALUE F32 0.0 # value to apply, if requested +OVERSCAN.MIN.VALID F32 0.0 # minimum valid overscan value +OVERSCAN.MAX.VALID F32 65536.0 # maximum valid overscan value + +# statistics to use to convert overscan region to a vector OVERSCAN.FIT STR NONE # NONE | POLYNOMIAL | SPLINE OVERSCAN.ORDER S32 5 # Order of polynomial fit @@ -102,8 +108,18 @@ OVERSCAN.BOXCAR S32 0 # Boxcar smoothing radius OVERSCAN.GAUSS F32 0.0 # Gaussian smoothing sigma -OVERSCAN.CONSTANT BOOL FALSE # Apply a known, fixed value? -OVERSCAN.VALUE F32 0.0 # value to apply, if requested -OVERSCAN.MIN.VALID F32 0.0 # minimum valid overscan value -OVERSCAN.MAX.VALID F32 65536.0 # maximum valid overscan value + +OVERSCAN.2D BOOL FALSE # use a 2D model for the overscan subtraction? +OVERSCAN.2D.BIASSECSLOW STR [591:623,1:598] #2D overscan slow read region +OVERSCAN.2D.BIASSECFAST STR [1:623,599:607] #2D overscan fast read region + +OVERSCAN.2D.SUBSET METADATA +END + +# statistics to use to convert 2D top-overscan region to a vector +OVERSCAN.2D.FIT STR NONE # NONE | POLYNOMIAL | SPLINE +OVERSCAN.2D.ORDER S32 5 # Order of polynomial fit +OVERSCAN.2D.STAT STR MEAN # MEAN | MEDIAN +OVERSCAN.2D.BOXCAR S32 0 # Boxcar smoothing radius +OVERSCAN.2D.GAUSS F32 0.0 # Gaussian smoothing sigma # Pattern Row subtraction options @@ -268,4 +284,11 @@ ################################################################################ +# HG: for overscan subtraction only +CHIP_SUB_BIAS METADATA +END + +CHIP_SUB_2DBIAS METADATA +END + # Standard chip processing CHIP METADATA @@ -291,4 +314,38 @@ BACKGROUND BOOL TRUE # Subtract background? MASK.STATS BOOL TRUE # Calculate Mask statistics. +END + + +CHIP_2DBIAS 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 + OVERSCAN.2D BOOL TRUE # 2D Overscan model + NONLIN BOOL TRUE # apply non-linearity correction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + NOISEMAP BOOL TRUE # Apply noise read map + 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? END @@ -458,4 +515,65 @@ END END +END + + +# Chip processing with DARKTEST and 2D bias +CHIP_DARKTEST_2DBIAS 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 + OVERSCAN.2D BOOL TRUE # 2D Overscan model + NONLIN BOOL TRUE # apply non-linearity correction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + NOISEMAP BOOL TRUE # Apply noise read map + 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? + + DETREND.CONSTRAINTS METADATA + BIAS METADATA + END + DARK METADATA + DETTYPE STR DARKTEST + 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 + ASTROM METADATA + END + NOISEMAP METADATA + END + END END @@ -1017,4 +1135,29 @@ BIN1.FITS BOOL TRUE # Save 1st binned chip image? BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Overscan, 2D bias +PPIMAGE_OB2DBIAS METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL TRUE # Save base detrended image? + BASE.VARIANCE.FITS BOOL TRUE # 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 TRUE # Overscan subtraction + OVERSCAN.2D BOOL TRUE # 2D Overscan model + NONLIN BOOL TRUE # apply non-linearity correction + 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? END @@ -2627,5 +2770,5 @@ FLAT BOOL TRUE # Flat-field normalisation MASK BOOL TRUE # Mask bad pixels - MASK.BUILD BOOL TRUE # Build internal mask? + MASK.BUILD BOOL TRUE # Build internal mask? MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails PATTERN.ROW BOOL FALSE # Row pattern correction @@ -2634,4 +2777,6 @@ BIN1.FITS BOOL TRUE # Save 1st binned chip image? BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? + BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? PHOTOM BOOL FALSE # Source identification and photometry ASTROM.CHIP BOOL FALSE # Astrometry per chip? @@ -2640,6 +2785,6 @@ CROSSTALK.MEASURE BOOL FALSE # Subtract model background? - BACKGROUND BOOL TRUE # Subtract background? - PATTERN.DEAD.CELLS BOOL TRUE # continuity corrections (see options below) + BACKGROUND BOOL FALSE # Subtract background? + PATTERN.DEAD.CELLS BOOL FALSE # continuity corrections (see options below) OVERSCAN.MIN.VALID F32 100.0 # Overscan subtraction OVERSCAN.MAX.VALID F32 64000.0 # Overscan subtraction Index: trunk/ippconfig/recipes/reductionClasses.mdc =================================================================== --- trunk/ippconfig/recipes/reductionClasses.mdc (revision 42891) +++ trunk/ippconfig/recipes/reductionClasses.mdc (revision 42892) @@ -623,4 +623,27 @@ END +SWEETSPOT_TWOD METADATA + CHIP_PPIMAGE STR CHIP_DARKTEST_2DBIAS + 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_DARKTEST_CONTINUITY METADATA CHIP_PPIMAGE STR CHIP_DARKTEST_CONTINUITY @@ -1342,4 +1365,42 @@ PSASTRO STR DEFAULT_RECIPE STACKPHOT STR STACKPHOT + BACKGROUND_PPBACKGROUND STR BACKGROUND + BACKGROUND_PSWARP STR BACKGROUND +END + +# only subtract overscan +BIAS_ONLY METADATA + CHIP_PPIMAGE STR CHIP_SUB_BIAS + 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 + +# only subtract 2D overscan +2DBIAS_ONLY METADATA + CHIP_PPIMAGE STR CHIP_SUB_2DBIAS + 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