Index: branches/eam_branches/20090715/ippconfig/recipes/psphot.config =================================================================== --- branches/eam_branches/20090715/ippconfig/recipes/psphot.config (revision 25655) +++ branches/eam_branches/20090715/ippconfig/recipes/psphot.config (revision 25656) @@ -15,6 +15,4 @@ # the zero point is used to set a basic scale for DVO -# XXX it may not currently be read : double check this (EAM) -ZERO_POINT F32 25.000 # zero point used by DVO ZERO_PT F32 25.000 # zero point used by DVO @@ -54,15 +52,14 @@ # parameters to control the selection of the peak in the Sx,Sy plane MOMENTS_SCALE F32 0.25 -MOMENTS_SN_MIN F32 10.0 # min S/N to measure moments +MOMENTS_SN_MIN F32 0.0 # min S/N to measure moments (default: measure all objects) MOMENTS_SX_MAX F32 50.0 MOMENTS_SY_MAX F32 50.0 MOMENTS_AR_MAX F32 1.5 # maximum axial ratio: 1 / AR < (sx / sy) < AR -MOMENTS_MIN_PIXEL_SN F32 0.0 # XXX caution on this: too high and we will excessively clip -MOMENTS_GAUSS_SIGMA F32 4.0 # XXX TEST THIS: sigma in pixels (should be >> seeing equiv) +MOMENTS_GAUSS_SIGMA F32 4.0 # XXX this is now autoscaled # basic object statistics SKY_INNER_RADIUS F32 15 # square annulus for local sky measurement SKY_OUTER_RADIUS F32 25 # square annulus for local sky measurement -PSF_MOMENTS_RADIUS F32 3 # calculate initial source moments with this radius +PSF_MOMENTS_RADIUS F32 3 # XXX this is now autoscaled PSF_SN_LIM F32 50 # minimum S/N for stars used for PSF model PSF_MAX_NSTARS S32 200 # limit number of stars used for PSF model @@ -84,6 +81,4 @@ PSF_MODEL STR PS_MODEL_GAUSS # PSF_MODEL STR PS_MODEL_PGAUSS -# PSF_MODEL STR PS_MODEL_QGAUSS -# PSF_MODEL STR PS_MODEL_TGAUSS # not well tested, not very successful # PSF.TREND.MASK must be a 2D polynomial @@ -102,18 +97,16 @@ PSF.FAKE.ALLOW BOOL FALSE # Allow use of fake PSFs when having trouble? -PSF_FIT_RADIUS F32 15.0 # fitting radius for test PSF model +PSF_FIT_RADIUS F32 15.0 # XXX this is now autoscaled PSF_REF_RADIUS F32 25.0 # aperture magnitudes are scaled via - # curve-of-growth to this radius + # curve-of-growth to this radius PSF_FIT_RADIUS_SCALE F32 7.0 # fitting radius for test PSF model PSF_APERTURE_SCALE F32 4.5 # fitting radius for test PSF model - # PSF-like source model parameters PSF_FIT_NSIGMA F32 1.0 # significance for pixel included in fit PSF_FIT_PADDING F32 2.0 # extra annulus to use for fit -PSF_SHAPE_NSIGMA F32 3.0 # max significance for shape variation PSF_MIN_SN F32 2.0 # reject objects below this significance -PSF_MAX_CHI F32 50.0 # reject objects worse that this +PSF_MAX_CHI F32 50.0 # reject objects worse than this FULL_FIT_SN_LIM F32 50.0 @@ -126,5 +119,5 @@ PSF.RESIDUALS.STATISTIC STR ROBUST_MEDIAN # statistic to use for generating the residual PSF.RESIDUALS.SPATIAL_ORDER S32 0 # fit spatial variations of the residuals at this order (0,1) -PSF.RESIDUALS.PIX.SN F32 5.0 # keep this pixel if residual is more significant than this +PSF.RESIDUALS.PIX.SN F32 0.0 # keep this pixel if residual is more significant than this PSF.RESIDUALS.RADIUS F32 8.0 # keep this pixel if residual is more significant than this @@ -135,4 +128,5 @@ EXT_FIT_PADDING F32 5 # extra annulus to use for fit EXT_MOMENTS_RADIUS F32 31 +EXT_FIT_MAX_RADIUS F32 128 # non-sensical to fit objects larger than the background mesh EXT_FIT_ITER S32 20 # Maximum number of fitting iterations for EXT @@ -187,7 +181,7 @@ # APTREND STR NONE, CONSTANT, SKYBIAS, SKYSAT, XY_LIN, SKY_XY_LIN, SKYSAT_XY_LIN, ALL -MEASURE.APTREND BOOL FALSE ### Gene says there's bugs in this part +MEASURE.APTREND BOOL TRUE APTREND STR CONSTANT -AP_MIN_SN F32 25.0 +AP_MIN_SN F32 0.0 # measure apMags for all sources by default APTREND.NSTAR.MIN S32 5 APTREND.ORDER.MAX S32 5 @@ -206,6 +200,5 @@ IGNORE_GROWTH BOOL FALSE -# CONSTANT_PHOTOMETRIC_WEIGHTS BOOL TRUE # Should the photometric code [currently only ensemblePSF] refuse to weight each pixel by it's significance? -CONSTANT_PHOTOMETRIC_WEIGHTS BOOL FALSE # Should the photometric code [currently only ensemblePSF] refuse to weight each pixel by it's significance? +CONSTANT_PHOTOMETRIC_WEIGHTS BOOL FALSE INTERPOLATE_AP BOOL TRUE @@ -219,5 +212,5 @@ NOISE.SIZE F32 2.0 -USE_FOOTPRINTS BOOL F # use new pmFootprint peak packaging +USE_FOOTPRINTS BOOL TRUE # use new pmFootprint peak packaging FOOTPRINT_NPIXMIN S32 5 # Minimum size of a pmFootprint FOOTPRINT_NSIGMA_LIMIT F32 20 # threshold for bright pmFootprint detection