Index: /branches/eam_branches/ipp-20111122/ippconfig/recipes/ppImage.config =================================================================== --- /branches/eam_branches/ipp-20111122/ippconfig/recipes/ppImage.config (revision 33629) +++ /branches/eam_branches/ipp-20111122/ippconfig/recipes/ppImage.config (revision 33630) @@ -2078,2 +2078,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: /branches/eam_branches/ipp-20111122/ippconfig/recipes/psphot.config =================================================================== --- /branches/eam_branches/ipp-20111122/ippconfig/recipes/psphot.config (revision 33629) +++ /branches/eam_branches/ipp-20111122/ippconfig/recipes/psphot.config (revision 33630) @@ -441,39 +441,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: /branches/eam_branches/ipp-20111122/ippconfig/recipes/reductionClasses.mdc =================================================================== --- /branches/eam_branches/ipp-20111122/ippconfig/recipes/reductionClasses.mdc (revision 33629) +++ /branches/eam_branches/ipp-20111122/ippconfig/recipes/reductionClasses.mdc (revision 33630) @@ -170,5 +170,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 @@ -179,5 +179,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 @@ -188,5 +188,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