Index: /branches/eam_branches/ipp-20110505/ippconfig/gpc1/ppStack.config =================================================================== --- /branches/eam_branches/ipp-20110505/ippconfig/gpc1/ppStack.config (revision 31509) +++ /branches/eam_branches/ipp-20110505/ippconfig/gpc1/ppStack.config (revision 31510) @@ -27,4 +27,7 @@ OUTPUT.NOCOMP BOOL TRUE OUTPUT.LOGFLUX BOOL FALSE + + PSF.INPUT.MAX F32 7.5 + PSF.INPUT.CLIP.NSIGMA F32 5.0 END Index: /branches/eam_branches/ipp-20110505/ippconfig/recipes/filerules-mef.mdc =================================================================== --- /branches/eam_branches/ipp-20110505/ippconfig/recipes/filerules-mef.mdc (revision 31509) +++ /branches/eam_branches/ipp-20110505/ippconfig/recipes/filerules-mef.mdc (revision 31510) @@ -192,5 +192,5 @@ PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG NONE FPA TRUE NONE PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE - +PPIMAGE.PATTERN OUTPUT {OUTPUT}.ptn PATTERN NONE CHIP TRUE MEF PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE MEF Index: /branches/eam_branches/ipp-20110505/ippconfig/recipes/ppImage.config =================================================================== --- /branches/eam_branches/ipp-20110505/ippconfig/recipes/ppImage.config (revision 31509) +++ /branches/eam_branches/ipp-20110505/ippconfig/recipes/ppImage.config (revision 31510) @@ -540,16 +540,16 @@ 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? + 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 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? + CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? + 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 TRUE # Build internal mask? FRINGE BOOL FALSE # Fringe subtraction PHOTOM BOOL TRUE # Source identification and photometry Index: /branches/eam_branches/ipp-20110505/ippconfig/recipes/ppStack.config =================================================================== --- /branches/eam_branches/ipp-20110505/ippconfig/recipes/ppStack.config (revision 31509) +++ /branches/eam_branches/ipp-20110505/ippconfig/recipes/ppStack.config (revision 31510) @@ -93,5 +93,5 @@ OUTPUT.NOCOMP BOOL FALSE # use filerules that make conconpressed outputs -OUTPUT.LOGFLUX BOOL FALSE +OUTPUT.LOGFLUX BOOL FALSE # choose a log-scaling for output images OUTPUT.REPLICATE BOOL TRUE Index: /branches/eam_branches/ipp-20110505/ippconfig/recipes/psphot.config =================================================================== --- /branches/eam_branches/ipp-20110505/ippconfig/recipes/psphot.config (revision 31509) +++ /branches/eam_branches/ipp-20110505/ippconfig/recipes/psphot.config (revision 31510) @@ -413,8 +413,8 @@ PSPHOT.STACK.USE.RAW BOOL F # perform photometry & morphology analysis on the raw image @PSPHOT.STACK.TARGET.PSF.FWHM F32 8.0 10.0 # FWHM of target PSF (if NOT AUTO sized; pixels) - RADIAL_APERTURES BOOL T # calculate flux in circular radial apertures? + RADIAL_APERTURES BOOL F # calculate flux in circular radial apertures? RADIAL_APERTURES_SN_LIM F32 0.0 # S/N limit for radial aperture calculation - OUTPUT.FORMAT STR PS1_SV1 - # OUTPUT.FORMAT STR PS1_V3 +# OUTPUT.FORMAT STR PS1_SV1 + OUTPUT.FORMAT STR PS1_V3 # CONSTANT_PHOTOMETRIC_WEIGHTS BOOL TRUE @@ -429,4 +429,43 @@ PSF_MODEL STR PS_MODEL_PS1_V1 EXT_MODEL STR PS_MODEL_SERSIC +END + +# 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 +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 +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 + POISSON.ERRORS.PHOT.LMM BOOL TRUE + + PSF_APERTURE_SCALE F32 4.5 + PSF_REF_RADIUS F32 35 END Index: /branches/eam_branches/ipp-20110505/ippconfig/recipes/reductionClasses.mdc =================================================================== --- /branches/eam_branches/ipp-20110505/ippconfig/recipes/reductionClasses.mdc (revision 31509) +++ /branches/eam_branches/ipp-20110505/ippconfig/recipes/reductionClasses.mdc (revision 31510) @@ -163,4 +163,31 @@ BACKGROUND_PPBACKGROUND STR BACKGROUND BACKGROUND_PSWARP STR BACKGROUND +END + +# basic science analysis +APTEST_V1 METADATA + CHIP_PPIMAGE STR CHIP + CHIP_PSPHOT STR APTEST_V1 + PSASTRO STR DEFAULT_RECIPE + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 +END + +# basic science analysis +APTEST_V2 METADATA + CHIP_PPIMAGE STR CHIP + CHIP_PSPHOT STR APTEST_V2 + PSASTRO STR DEFAULT_RECIPE + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 +END + +# basic science analysis +APTEST_V3 METADATA + CHIP_PPIMAGE STR CHIP + CHIP_PSPHOT STR APTEST_V3 + PSASTRO STR DEFAULT_RECIPE + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 END