Index: trunk/ippconfig/recipes/ppImage.config =================================================================== --- trunk/ippconfig/recipes/ppImage.config (revision 33636) +++ trunk/ippconfig/recipes/ppImage.config (revision 33642) @@ -2197,2 +2197,81 @@ END END + +# test recipes (not necessarily consistent over time) +# 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 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. +END + +# test recipes (not necessarily consistent over time) +# currently: default CHIP recipe +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 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. +END + +# test recipes (not necessarily consistent over time) +# 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 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. +END + Index: trunk/ippconfig/recipes/psphot.config =================================================================== --- trunk/ippconfig/recipes/psphot.config (revision 33636) +++ trunk/ippconfig/recipes/psphot.config (revision 33642) @@ -159,5 +159,5 @@ # this model is used for approximate subtraction in the main object analysis step -EXT_MODEL STR PS_MODEL_SERSIC +EXT_MODEL STR PS_MODEL_GAUSS EXT_FIT_NSIGMA F32 1 # significance for pixel included in fit EXT_FIT_PADDING F32 5 # extra annulus to use for fit @@ -184,4 +184,6 @@ EXTENDED_SOURCE_KRON BOOL FALSE PETROSIAN_FOR_STARS BOOL FALSE + +KRON_ITERATIONS S32 2 # Extended source fit parameters @@ -260,4 +262,9 @@ POISSON.ERRORS.PHOT.LIN BOOL FALSE POISSON.ERRORS.PARAMS BOOL TRUE + +# psphotFitSourcesLinear has 3 options for the weighting: CONSTANT, +# IMAGE_VAR, MODEL_VA the first of these used to be folded into the +# boolean CONSTANT_PHOTOMETRIC_WEIGHTS above. +LINEAR_FIT_VARIANCE_MODE STR CONSTANT PCM_BOX_SIZE S32 8 @@ -439,39 +446,21 @@ # Extended source fit parameters APTEST_V1 METADATA - OUTPUT.FORMAT STR PS1_V3 - - # CONSTANT_PHOTOMETRIC_WEIGHTS BOOL TRUE - # POISSON.ERRORS.PHOT.LMM BOOL FALSE CONSTANT_PHOTOMETRIC_WEIGHTS BOOL FALSE POISSON.ERRORS.PHOT.LMM BOOL TRUE - - PSF_APERTURE_SCALE F32 4.5 - PSF_REF_RADIUS F32 25 + SKY_STAT STR FITTED_MEAN END # Extended source fit parameters APTEST_V2 METADATA - OUTPUT.FORMAT STR PS1_V3 - - # CONSTANT_PHOTOMETRIC_WEIGHTS BOOL TRUE - # POISSON.ERRORS.PHOT.LMM BOOL FALSE CONSTANT_PHOTOMETRIC_WEIGHTS BOOL FALSE POISSON.ERRORS.PHOT.LMM BOOL TRUE - - PSF_APERTURE_SCALE F32 4.5 - PSF_REF_RADIUS F32 30 + SKY_STAT STR ROBUST_MEDIAN END # Extended source fit parameters APTEST_V3 METADATA - OUTPUT.FORMAT STR PS1_V3 - - # CONSTANT_PHOTOMETRIC_WEIGHTS BOOL TRUE - # POISSON.ERRORS.PHOT.LMM BOOL FALSE - CONSTANT_PHOTOMETRIC_WEIGHTS BOOL FALSE + CONSTANT_PHOTOMETRIC_WEIGHTS BOOL TRUE POISSON.ERRORS.PHOT.LMM BOOL TRUE - - PSF_APERTURE_SCALE F32 4.5 - PSF_REF_RADIUS F32 35 + SKY_STAT STR FITTED_MEAN END Index: trunk/ippconfig/recipes/reductionClasses.mdc =================================================================== --- trunk/ippconfig/recipes/reductionClasses.mdc (revision 33636) +++ trunk/ippconfig/recipes/reductionClasses.mdc (revision 33642) @@ -178,5 +178,5 @@ # basic science analysis APTEST_V1 METADATA - CHIP_PPIMAGE STR CHIP + CHIP_PPIMAGE STR APTEST_V1 CHIP_PSPHOT STR APTEST_V1 PSASTRO STR DEFAULT_RECIPE @@ -187,5 +187,5 @@ # basic science analysis APTEST_V2 METADATA - CHIP_PPIMAGE STR CHIP + CHIP_PPIMAGE STR APTEST_V2 CHIP_PSPHOT STR APTEST_V2 PSASTRO STR DEFAULT_RECIPE @@ -196,5 +196,5 @@ # basic science analysis APTEST_V3 METADATA - CHIP_PPIMAGE STR CHIP + CHIP_PPIMAGE STR APTEST_V3 CHIP_PSPHOT STR APTEST_V3 PSASTRO STR DEFAULT_RECIPE