Index: /branches/eam_branches/ipp-20111122/ippconfig/gpc1/ppImage.config =================================================================== --- /branches/eam_branches/ipp-20111122/ippconfig/gpc1/ppImage.config (revision 33630) +++ /branches/eam_branches/ipp-20111122/ippconfig/gpc1/ppImage.config (revision 33631) @@ -1263,2 +1263,96 @@ END END + +# test recipes +# currently : default CHIP recipe +APTEST_V1 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 + 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 TRUE # Cell pattern correction + 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 TRUE # Subtract model background? +END + +# test recipes +# currently : default CHIP recipe as normal +APTEST_V2 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 + 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 TRUE # Cell pattern correction + 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 TRUE # Subtract model background? +END + +# test recipes +# currently : default CHIP recipe +APTEST_V3 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 + 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 TRUE # Cell pattern correction + 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 TRUE # Subtract model background? +END + Index: /branches/eam_branches/ipp-20111122/ippconfig/gpc1/psastro.config =================================================================== --- /branches/eam_branches/ipp-20111122/ippconfig/gpc1/psastro.config (revision 33630) +++ /branches/eam_branches/ipp-20111122/ippconfig/gpc1/psastro.config (revision 33631) @@ -120,5 +120,5 @@ # rather than mean, use specified EDGE: -ZERO.POINT.USE.MEAN BOOL FALSE +ZERO.POINT.USE.MEAN BOOL TRUE ZERO.POINT.EDGE.FRACTION F32 0.9 ZERO.POINT.EDGE.SAMPLE S32 25 @@ -128,5 +128,5 @@ PHOTCODE.DATA METADATA FILTER STR g - ZEROPT F32 24.9 + ZEROPT F32 24.563 PHOTCODE STR g GHOST_MAX_MAG F32 -20.0 @@ -134,5 +134,5 @@ PHOTCODE.DATA METADATA FILTER STR r - ZEROPT F32 25.1 + ZEROPT F32 24.750 PHOTCODE STR r GHOST_MAX_MAG F32 -20.0 @@ -140,5 +140,5 @@ PHOTCODE.DATA METADATA FILTER STR i - ZEROPT F32 25.0 + ZEROPT F32 24.611 PHOTCODE STR i GHOST_MAX_MAG F32 -25.0 @@ -146,5 +146,5 @@ PHOTCODE.DATA METADATA FILTER STR z - ZEROPT F32 24.6 + ZEROPT F32 24.250 PHOTCODE STR z GHOST_MAX_MAG F32 -25.0 @@ -152,5 +152,5 @@ PHOTCODE.DATA METADATA FILTER STR y - ZEROPT F32 22.2 + ZEROPT F32 23.320 PHOTCODE STR y GHOST_MAX_MAG F32 -25.0