Index: trunk/ippconfig/gpc1/camera.config =================================================================== --- trunk/ippconfig/gpc1/camera.config (revision 36360) +++ trunk/ippconfig/gpc1/camera.config (revision 36375) @@ -139,4 +139,5 @@ CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT? CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT? + CMF.XGAL STR {CHIP.NAME}.xgal # use .PSF and .EXT? CMF.DETEFF STR {CHIP.NAME}.deteff Index: trunk/ippconfig/recipes/filerules-mef.mdc =================================================================== --- trunk/ippconfig/recipes/filerules-mef.mdc (revision 36360) +++ trunk/ippconfig/recipes/filerules-mef.mdc (revision 36375) @@ -86,4 +86,5 @@ PSPHOT.PSF.LOAD INPUT @FILES CHIP PSF PSPHOT.INPUT.CMF INPUT @FILES CHIP CMF +PSPHOT.INPUT.CFF INPUT @FILES CHIP CFF PSPHOT.INPUT.TEXT INPUT @FILES CHIP SRCTEXT PSPHOT.EXPNUM INPUT @FILES CHIP MASK @@ -247,4 +248,5 @@ PSPHOT.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.cmf CMF NONE CHIP TRUE SPLIT PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF NONE CHIP TRUE MEF +PSPHOT.OUTPUT.CFF OUTPUT {OUTPUT}.cff CFF NONE CHIP TRUE MEF PSPHOT.PSF.RAW.SAVE OUTPUT {OUTPUT}.psf PSF NONE CHIP TRUE MEF PSPHOT.PSF.SKY.SAVE OUTPUT {OUTPUT}.psf PSF NONE CHIP TRUE MEF Index: trunk/ippconfig/recipes/filerules-simple.mdc =================================================================== --- trunk/ippconfig/recipes/filerules-simple.mdc (revision 36360) +++ trunk/ippconfig/recipes/filerules-simple.mdc (revision 36375) @@ -57,4 +57,5 @@ PSPHOT.PSF.LOAD INPUT @FILES CHIP PSF PSPHOT.INPUT.CMF INPUT @FILES CHIP CMF +PSPHOT.INPUT.CFF INPUT @FILES CHIP CFF PSPHOT.INPUT.TEXT INPUT @FILES CHIP SRCTEXT PSPHOT.EXPNUM INPUT @FILES CHIP MASK @@ -209,4 +210,5 @@ PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf CMF NONE CHIP TRUE NONE PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF NONE CHIP TRUE NONE +PSPHOT.OUTPUT.CFF OUTPUT {OUTPUT}.cff CFF NONE CHIP TRUE NONE PSPHOT.PSF.RAW.SAVE OUTPUT {OUTPUT}.psf PSF NONE FPA TRUE NONE PSPHOT.PSF.SKY.SAVE OUTPUT {OUTPUT}.psf PSF NONE FPA TRUE NONE Index: trunk/ippconfig/recipes/filerules-split.mdc =================================================================== --- trunk/ippconfig/recipes/filerules-split.mdc (revision 36360) +++ trunk/ippconfig/recipes/filerules-split.mdc (revision 36375) @@ -77,4 +77,5 @@ PSPHOT.PSF.LOAD INPUT @FILES CHIP PSF PSPHOT.INPUT.CMF INPUT @FILES CHIP CMF +PSPHOT.INPUT.CFF INPUT @FILES CHIP CFF PSPHOT.INPUT.TEXT INPUT @FILES CHIP SRCTEXT PSPHOT.EXPNUM INPUT @FILES CHIP EXPNUM @@ -233,4 +234,5 @@ PSPHOT.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.cmf CMF NONE CHIP TRUE NONE PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE MEF +PSPHOT.OUTPUT.CFF OUTPUT {OUTPUT}.cff CFF NONE CHIP TRUE NONE PSPHOT.PSF.RAW.SAVE OUTPUT {OUTPUT}.{CHIP.NAME}.psf PSF NONE CHIP TRUE MEF PSPHOT.PSF.SKY.SAVE OUTPUT {OUTPUT}.psf PSF NONE FPA TRUE MEF Index: trunk/ippconfig/recipes/ppSim.config =================================================================== --- trunk/ippconfig/recipes/ppSim.config (revision 36360) +++ trunk/ippconfig/recipes/ppSim.config (revision 36375) @@ -61,4 +61,5 @@ PSF.THETA F32 0.0 PSF.CONVOLVE BOOL FALSE # generate fake stars with PSF (F), or smooth with PSF (T)? +CONVOLVE.NSIGMA F32 5.0 # smooth image out to NSIGMA * sigma STARS.GRID BOOL FALSE # Add grid of fake stars with constant flux Index: trunk/ippconfig/recipes/psphot.config =================================================================== --- trunk/ippconfig/recipes/psphot.config (revision 36360) +++ trunk/ippconfig/recipes/psphot.config (revision 36375) @@ -1,3 +1,2 @@ - # these options turn on different inputs and/or outputs SAVE.OUTPUT BOOL TRUE @@ -181,4 +180,5 @@ EXT_FIT_MIN_TOL F32 0.01 # Fit tolerance for EXT EXT_FIT_MAX_TOL F32 2.00 # Fit tolerance for EXT +EXT_FIT_NSIGMA_CONV F32 9.00 # Number of sigma for PSF convolved fits # the following is used to require a minimum quality of fit before @@ -189,12 +189,13 @@ # extended source aperture-like measurements -EXTENDED_SOURCE_ANALYSIS BOOL FALSE # perform any of the aperture-like measurements? +EXTENDED_SOURCE_PETROSIAN BOOL FALSE +EXTENDED_SOURCE_ANNULI BOOL FALSE +EXTENDED_SOURCE_RAW_RADIUS BOOL FALSE # use circular (T) or elliptical (F) contours for petrosians? EXTENDED_SOURCE_SN_LIM F32 20.0 -EXTENDED_SOURCE_RAW_RADIUS BOOL FALSE -EXTENDED_SOURCE_PETROSIAN BOOL FALSE -EXTENDED_SOURCE_ISOPHOTAL BOOL FALSE -EXTENDED_SOURCE_ANNULI BOOL FALSE -EXTENDED_SOURCE_KRON BOOL FALSE -PETROSIAN_FOR_STARS BOOL FALSE + +EXT.NSIGMA.LIMIT.USE BOOL TRUE + +EXT.FIT.MIN.GAL.LIMIT F32 10.0 +EXT.FIT.MIN.GAL.LIMIT.USE BOOL FALSE KRON_ITERATIONS S32 2 @@ -208,4 +209,5 @@ EXTENDED_SOURCE_FITS BOOL FALSE # perform the detailed extended sourc fits? EXTENDED_SOURCE_FITS_INTERACTIVE BOOL FALSE # perform the detailed extended sourc fits? +EXTENDED_SOURCE_FITS_POISSON BOOL FALSE # use poisson errors for extended source models EXTENDED_SOURCE_MODELS_SELECTION STR ALL @@ -258,10 +260,6 @@ # Extended source fit parameters EXTENDED_TEST METADATA - EXTENDED_SOURCE_ANALYSIS BOOL TRUE # perform any of the aperture-like measurements? EXTENDED_SOURCE_SN_LIM F32 20.0 EXTENDED_SOURCE_PETROSIAN BOOL TRUE - EXTENDED_SOURCE_ISOPHOTAL BOOL TRUE - EXTENDED_SOURCE_ANNULI BOOL TRUE - EXTENDED_SOURCE_KRON BOOL FALSE END @@ -293,5 +291,5 @@ INTERPOLATE_AP BOOL TRUE -POISSON.ERRORS.PHOT.LMM BOOL TRUE +POISSON.ERRORS.PHOT.LMM BOOL TRUE POISSON.ERRORS.PHOT.LIN BOOL FALSE POISSON.ERRORS.PARAMS BOOL TRUE @@ -408,4 +406,15 @@ END +EXT.ANALYSIS.MAG.LIMITS METADATA + TYPE DATA FILTER.ID MAG.LIMIT + gband DATA g NAN + rband DATA r NAN + iband DATA i NAN + zband DATA z NAN + yband DATA y NAN + wband DATA w NAN + other DATA any NAN +END + # if true keep all matched sources, even if we get a non-finite aperture flux measurement PSPHOT.STACK.KEEP.BAD.MATCHES BOOL F @@ -414,11 +423,21 @@ RADIAL_APERTURES_SN_LIM F32 0.0 # S/N limit for radial aperture calculation +GALAXY_SHAPES BOOL F +GALAXY_SHAPES_FR_MAJOR_MIN F32 0.5 +GALAXY_SHAPES_FR_MAJOR_MAX F32 2.0 +GALAXY_SHAPES_FR_MAJOR_DEL F32 0.1 +GALAXY_SHAPES_FR_MINOR_MIN F32 0.5 +GALAXY_SHAPES_FR_MINOR_MAX F32 2.0 +GALAXY_SHAPES_FR_MINOR_DEL F32 0.1 + + # Extended source fit parameters STACKPHOT METADATA EXTENDED_SOURCE_FITS BOOL TRUE # perform any of the aperture-like measurements? - EXTENDED_SOURCE_ANALYSIS BOOL TRUE # perform any of the aperture-like measurements? EXTENDED_SOURCE_SN_LIM F32 10.0 EXTENDED_SOURCE_PETROSIAN BOOL TRUE EXTENDED_SOURCE_ANNULI BOOL TRUE + EXT.NSIGMA.LIMIT.USE BOOL FALSE + PSPHOT.STACK.MATCH.PSF.SOURCE STR AUTO # which inputs to convolve? (RAW, CNV, AUTO) PSPHOT.STACK.TARGET.PSF.AUTO BOOL F # automatically determine target PSF size? @@ -430,6 +449,5 @@ RADIAL_APERTURES BOOL T # 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 - PETROSIAN_FOR_STARS BOOL FALSE + OUTPUT.FORMAT STR PS1_SV2 # subtract radial profiles for extremely bright stars? @@ -441,4 +459,5 @@ LMM_FIT_CHISQ_CONVERGENCE BOOL FALSE # use the (old) chisq convergence or the new parameter one LMM_FIT_GAIN_FACTOR_MODE S32 2 # there are 3 options to determine the gain factor (0,1,2) + EXT_FIT_MIN_TOL F32 0.1 # Fit tolerance for EXT EXT_FIT_MAX_RADIUS F32 50.0 @@ -446,4 +465,6 @@ EXT_MODEL STR PS_MODEL_QGAUSS PEAKS_NMAX_TOTAL S32 0 # set this to limit the allowed number of peaks - Yields fault instead of avoid memory explosion + + SAVE.RESID BOOL TRUE END @@ -451,8 +472,7 @@ STACKPHOT_TEST METADATA EXTENDED_SOURCE_FITS BOOL F # perform any of the aperture-like measurements? - EXTENDED_SOURCE_ANALYSIS BOOL F # perform any of the aperture-like measurements? EXTENDED_SOURCE_SN_LIM F32 10.0 EXTENDED_SOURCE_PETROSIAN BOOL F - EXTENDED_SOURCE_ANNULI BOOL F + PSPHOT.STACK.MATCH.PSF.SOURCE STR AUTO # which inputs to convolve? (RAW, CNV, AUTO) PSPHOT.STACK.TARGET.PSF.AUTO BOOL F # automatically determine target PSF size? @@ -471,8 +491,7 @@ STACKPHOT_TEST_V1 METADATA EXTENDED_SOURCE_FITS BOOL F # perform any of the aperture-like measurements? - EXTENDED_SOURCE_ANALYSIS BOOL F # perform any of the aperture-like measurements? EXTENDED_SOURCE_SN_LIM F32 20.0 EXTENDED_SOURCE_PETROSIAN BOOL TRUE - EXTENDED_SOURCE_ANNULI BOOL TRUE + PSPHOT.STACK.MATCH.PSF.SOURCE STR AUTO # which inputs to convolve? (RAW, CNV, AUTO) PSPHOT.STACK.TARGET.PSF.AUTO BOOL F # automatically determine target PSF size? @@ -496,8 +515,7 @@ SINGLE_TEST_V1 METADATA EXTENDED_SOURCE_FITS BOOL F # perform any of the aperture-like measurements? - EXTENDED_SOURCE_ANALYSIS BOOL F # perform any of the aperture-like measurements? EXTENDED_SOURCE_SN_LIM F32 20.0 EXTENDED_SOURCE_PETROSIAN BOOL TRUE - EXTENDED_SOURCE_ANNULI BOOL TRUE + PSPHOT.STACK.MATCH.PSF.SOURCE STR AUTO # which inputs to convolve? (RAW, CNV, AUTO) PSPHOT.STACK.TARGET.PSF.AUTO BOOL F # automatically determine target PSF size? @@ -506,9 +524,6 @@ 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 - # CONSTANT_PHOTOMETRIC_WEIGHTS BOOL TRUE - # POISSON.ERRORS.PHOT.LMM BOOL FALSE CONSTANT_PHOTOMETRIC_WEIGHTS BOOL FALSE POISSON.ERRORS.PHOT.LMM BOOL TRUE @@ -625,6 +640,18 @@ # Extended source fit parameters # these models are used for high-quality shape analysis after all sources have been removed + SAVE.RESID BOOL T + EXTENDED_SOURCE_FITS BOOL TRUE # perform the detailed extended sourc fits? - EXT_MODEL STR PS_MODEL_GAUSS + EXT_MODEL STR PS_MODEL_QGAUSS + PSF_MODEL STR PS_MODEL_PS1_V1 + + LMM_FIT_CHISQ_CONVERGENCE BOOL FALSE # use the (old) chisq convergence or the new parameter one + LMM_FIT_GAIN_FACTOR_MODE S32 2 # there are 3 options to determine the gain factor (0,1,2) + EXT_FIT_MIN_TOL F32 0.1 # Fit tolerance for EXT + + # XXX these are only needed if we want to get perfect fits of the synthetic data + PSF_FIT_RADIUS_SCALE F32 3.75 + EXT_FIT_NSIGMA_CONV F32 11 + PSF.RESIDUALS BOOL F # if this is defined, it gives a list of the model names to fit below (ALL or NONE are also valid) @@ -651,2 +678,13 @@ END END + +FULLFORCE_WARP METADATA + GALAXY_SHAPES BOOL TRUE + RADIAL_APERTURES BOOL TRUE + EXTENDED_SOURCE_FITS BOOL TRUE # this casues the xfit extension to be written out + EXTENDED_SOURCE_PETROSIAN BOOL TRUE # I want petrosian mags + SAVE.PSF BOOL FALSE + SAVE.BACKMDL BOOL FALSE + # SAVE.RESID BOOL FALSE + # OUTPUT.FORMAT STR PS1_V3 +END Index: trunk/ippconfig/recipes/reductionClasses.mdc =================================================================== --- trunk/ippconfig/recipes/reductionClasses.mdc (revision 36360) +++ trunk/ippconfig/recipes/reductionClasses.mdc (revision 36375) @@ -172,4 +172,5 @@ PSVIDEOPHOT STR PSVIDEOPHOT STATICSKY_CALIBRATION STR STATICSKY_CAL + FULLFORCE_PSPHOT STR FULLFORCE_WARP END @@ -249,4 +250,5 @@ BACKGROUND_PPBACKGROUND STR BACKGROUND BACKGROUND_PSWARP STR BACKGROUND + FULLFORCE_PSPHOT STR FULLFORCE_WARP END Index: trunk/ippconfig/simple/camera.config =================================================================== --- trunk/ippconfig/simple/camera.config (revision 36360) +++ trunk/ippconfig/simple/camera.config (revision 36375) @@ -61,4 +61,5 @@ CMF.XFIT STR xfit CMF.DETEFF STR deteff + CMF.XGAL STR xgal PSF.HEAD STR hdr Index: trunk/ippconfig/simtest/format.config =================================================================== --- trunk/ippconfig/simtest/format.config (revision 36360) +++ trunk/ippconfig/simtest/format.config (revision 36375) @@ -60,5 +60,5 @@ FPA.LATITUDE F64 20.7070999146 # North Latitude in Degrees FPA.ELEVATION F32 3048.0 # altitude in meters - CELL.SATURATION F32 65535 + CELL.SATURATION F32 1000000 CELL.BAD F32 0 CELL.READDIR S32 1