Index: /trunk/ippconfig/gpc1/camera.config =================================================================== --- /trunk/ippconfig/gpc1/camera.config (revision 42968) +++ /trunk/ippconfig/gpc1/camera.config (revision 42969) @@ -3,5 +3,6 @@ # File formats that we know about FORMATS METADATA - MEF STR gpc1/format_mef.config + MEF STR gpc1/format_mef_20100101.config + MEF_OLD STR gpc1/format_mef.config RELPHOT STR gpc1/format_relphot.config RAW_20220827 STR gpc1/format_20220827.config Index: /trunk/ippconfig/gpc1/ppImage.config =================================================================== --- /trunk/ippconfig/gpc1/ppImage.config (revision 42968) +++ /trunk/ippconfig/gpc1/ppImage.config (revision 42969) @@ -1358,5 +1358,4 @@ DARK METADATA EXPTIME STR FPA.EXPOSURE - DETTYPE STR TIMEDARK END FLAT METADATA @@ -2236,4 +2235,7 @@ BACKGROUND BOOL TRUE # Subtract background? CROSSTALK.MEASURE BOOL FALSE # Subtract model background? + APPLY.BURNTOOL BOOL FALSE # apply burntool correction in ppImage + USE.DEBURNED.IMAGE BOOL FALSE # use burntool-repaired image? + USE.BEST.BURNTOOL BOOL FALSE # require the best burntooled data END @@ -2336,2 +2338,40 @@ USE.BEST.BURNTOOL BOOL FALSE # require the best burntooled data END + +# chip processing with only overscan +CHIP_OVERSCAN_ONLY 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 FALSE # Dark subtraction + NOISEMAP BOOL FALSE # Apply noise read map + REMNANCE BOOL FALSE # Remnance masking + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL TRUE # 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 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 FALSE # Subtract model background? + APPLY.BURNTOOL BOOL FALSE # apply burntool correction in ppImage + USE.DEBURNED.IMAGE BOOL FALSE # use burntool-repaired image? + USE.BEST.BURNTOOL BOOL FALSE # require the best burntooled data + SATURATION.OVERRIDE F32 55000 # replace missing saturation with this value +END + Index: /trunk/ippconfig/gpc1/psastro.config =================================================================== --- /trunk/ippconfig/gpc1/psastro.config (revision 42968) +++ /trunk/ippconfig/gpc1/psastro.config (revision 42969) @@ -2,4 +2,6 @@ # save matched stars? PSASTRO.SAVE.REFMATCH BOOL TRUE # save refstar matches as table in output smf file + +PSASTRO.SKIP.BACKGROUND BOOL FALSE # generate the background model for GPC1 # astrometry matching parameters @@ -868,2 +870,6 @@ ZERO.POINT.USE.MEAN BOOL TRUE END + +NO_BACKGROUND METADATA + PSASTRO.SKIP.BACKGROUND BOOL TRUE +END Index: /trunk/ippconfig/gpc2/format_20220616.config =================================================================== --- /trunk/ippconfig/gpc2/format_20220616.config (revision 42968) +++ /trunk/ippconfig/gpc2/format_20220616.config (revision 42969) @@ -592,6 +592,6 @@ END CELL.READDIR S32 1 -# CELL.BAD S32 0 - CELL.BAD S32 -1000 + CELL.BAD S32 0 +# CELL.BAD S32 -1000 CELL.XSIZE S32 592 CELL.YSIZE S32 600 Index: /trunk/ippconfig/gpc2/ppImage.config =================================================================== --- /trunk/ippconfig/gpc2/ppImage.config (revision 42968) +++ /trunk/ippconfig/gpc2/ppImage.config (revision 42969) @@ -2057,2 +2057,41 @@ USE.BEST.BURNTOOL BOOL FALSE # require the best burntooled data END + +# chip processing with only overscan +CHIP_OVERSCAN_ONLY 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 FALSE # Dark subtraction + NOISEMAP BOOL FALSE # Apply noise read map + REMNANCE BOOL FALSE # Remnance masking + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL TRUE # 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 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 FALSE # Subtract model background? + APPLY.BURNTOOL BOOL FALSE # apply burntool correction in ppImage + USE.DEBURNED.IMAGE BOOL FALSE # use burntool-repaired image? + USE.BEST.BURNTOOL BOOL FALSE # require the best burntooled data + + OVERSCAN.MIN.VALID F32 1.0 # minimum valid overscan value + OVERSCAN.MAX.VALID F32 60000.0 # maximum valid overscan value +END Index: /trunk/ippconfig/recipes/jpeg.mdc =================================================================== --- /trunk/ippconfig/recipes/jpeg.mdc (revision 42968) +++ /trunk/ippconfig/recipes/jpeg.mdc (revision 42969) @@ -328,2 +328,20 @@ OPTIONS STR -SB,-X,+Y END + +CHECK_LOW_CELLS METADATA + PPIMAGE.JPEG1 METADATA + COLORMAP STR rainbow + SCALE.MODE STR RANGE + SCALE.MIN F32 -5.0 + SCALE.MAX F32 +10.0 + OPTIONS STR +SB,-X,+Y + END + + PPIMAGE.JPEG2 METADATA + COLORMAP STR rainbow + SCALE.MODE STR RANGE + SCALE.MIN F32 -5.0 + SCALE.MAX F32 +10.0 + OPTIONS STR -SB,-X,+Y + END +END Index: /trunk/ippconfig/recipes/ppImage.config =================================================================== --- /trunk/ippconfig/recipes/ppImage.config (revision 42968) +++ /trunk/ippconfig/recipes/ppImage.config (revision 42969) @@ -2950,2 +2950,59 @@ END +# Standard chip processing +CHIP_OVERSCAN_ONLY 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 FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + 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 FALSE # 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 FALSE # Calculate Mask statistics. +END + +# Save JPEG and FITS from BIN1 +PPIMAGE_J1_FITS 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 TRUE # 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 + FPA1.FITS BOOL TRUE # Save mosaiced FITS image? +END Index: /trunk/ippconfig/recipes/psastro.config =================================================================== --- /trunk/ippconfig/recipes/psastro.config (revision 42968) +++ /trunk/ippconfig/recipes/psastro.config (revision 42969) @@ -6,4 +6,5 @@ PSASTRO.SKIP.ASTROMETRY BOOL FALSE +PSASTRO.SKIP.BACKGROUND BOOL TRUE # do not generate background model for most cameras # select which WCS style to use on output images. @@ -413,2 +414,5 @@ END +NO_BACKGROUND METADATA + PSASTRO.SKIP.BACKGROUND BOOL TRUE +END Index: /trunk/ippconfig/recipes/reductionClasses.mdc =================================================================== --- /trunk/ippconfig/recipes/reductionClasses.mdc (revision 42968) +++ /trunk/ippconfig/recipes/reductionClasses.mdc (revision 42969) @@ -2243,2 +2243,12 @@ FULLFORCE_PSPHOT STR FULLFORCE_EUCLID END + +# only overscan correction and internal masks +JPEG_OVERSCAN_ONLY METADATA + CHIP_PPIMAGE STR CHIP_OVERSCAN_ONLY + CHIP_PSPHOT STR CHIP + JPEG_BIN1 STR PPIMAGE_J1_FITS + JPEG_BIN2 STR PPIMAGE_J2 + PSASTRO STR NO_BACKGROUND + JPEG STR CHECK_LOW_CELLS +END