Index: /trunk/ippconfig/gpc1/ppMerge.config =================================================================== --- /trunk/ippconfig/gpc1/ppMerge.config (revision 29004) +++ /trunk/ippconfig/gpc1/ppMerge.config (revision 29005) @@ -60,4 +60,15 @@ # END +# DARK.ORDINATES METADATA +# TEMP METADATA +# ORDER S32 1 +# RULE STR CHIP.TEMP +# END +# TEMP2 METADATA +# ORDER S32 1 +# RULE STR CHIP.TEMP * CHIP.TEMP +# END +# END + # Ordinates for fitting dark current as function of darktime and fpa temp: # Counts = C0 + (CT0 + CT1*Temp)*exptime Index: /trunk/ippconfig/recipes/ppSim.config =================================================================== --- /trunk/ippconfig/recipes/ppSim.config (revision 29004) +++ /trunk/ippconfig/recipes/ppSim.config (revision 29005) @@ -70,22 +70,23 @@ GALAXY.LUM F32 -0.8 # Stellar luminosity function slope -GALAXY.MAG F32 11.0 # Brightest magnitude for fake stars -GALAXY.DENSITY F32 6.0 # Galaxy density (per square degree) at the brightest magnitude - -GALAXY.RMAJOR.MIN F32 2.0 # Minimum semi-major axis for galaxy models +GALAXY.MAG F32 15.0 # Brightest magnitude for fake stars +GALAXY.DENSITY F32 5.0 # Galaxy density (per square degree) at the brightest magnitude + +GALAXY.RMAJOR.MIN F32 5.0 # Minimum semi-major axis for galaxy models GALAXY.RMAJOR.MAX F32 10.0 # Maximum semi-major axis for galaxy models GALAXY.ARATIO.MIN F32 1.0 # Minimum axis ratio for galaxy models -GALAXY.ARATIO.MAX F32 0.2 # Maximum axis ratio for galaxy models +GALAXY.ARATIO.MAX F32 0.5 # Maximum axis ratio for galaxy models GALAXY.INDEX.MIN F32 0.25 # Minimum Sersic index for galaxy models -GALAXY.INDEX.MAX F32 0.500 # Maximum Sersic index for galaxy models +GALAXY.INDEX.MAX F32 1.000 # Maximum Sersic index for galaxy models GALAXY.THETA.MIN F32 0.0 # Minimum position angle for galaxy models GALAXY.THETA.MAX F32 3.14 # Maximum position angle for galaxy models -GALAXY.GRID BOOL FALSE # Generate a (regular) grid of galaxy models? -GALAXY.GRID.DX S32 200 # Spacing between galaxies in grid in x -GALAXY.GRID.DY S32 200 # Spacing between galaxies in grid in y +GALAXY.GRID BOOL FALSE # Generate a (regular) grid of galaxy models? +GALAXY.GRID.DX S32 100 # Spacing between galaxies in grid in x +GALAXY.GRID.DY S32 200 # Spacing between galaxies in grid in y +GALAXY.GRID.RANDOM BOOL FALSE # randomize shape parameters in grid (or sequence?) GALAXY.MODEL STR PS_MODEL_GAUSS Index: /trunk/ippconfig/recipes/ppSub.config =================================================================== --- /trunk/ippconfig/recipes/ppSub.config (revision 29004) +++ /trunk/ippconfig/recipes/ppSub.config (revision 29005) @@ -15,5 +15,5 @@ SYS.ERR F32 0.1 # Relative systematic error in images SKY.ERR F32 0.0 # Relative systematic error in images -NORM.FRAC F32 0.03 # Fraction of window for normalisation window +NORM.FRAC F32 0.01 # Fraction of window for normalisation window COVAR.FRAC F32 0.01 # Fraction of kernel to truncate before calculating covariance @@ -28,4 +28,6 @@ MASKSTAT.ADVISORY U32 0x080 +INPUT.MATCH.RADIUS F32 20.0 +INPUT.MATCH.MIN.SN F32 10.0 LOW.THRESHOLD F32 4.0 # Mask pixels below this threshold (std dev) Index: /trunk/ippconfig/recipes/psphot.config =================================================================== --- /trunk/ippconfig/recipes/psphot.config (revision 29004) +++ /trunk/ippconfig/recipes/psphot.config (revision 29005) @@ -90,5 +90,15 @@ PSF_FIT_ITER S32 50 # Maximum number of fitting iterations for PSF -PSF_FIT_TOL F32 0.01 # Fit tolerance for PSF +PSF_FIT_MIN_TOL F32 0.01 # Fit tolerance for PSF +PSF_FIT_MAX_TOL F32 2.00 # Fit tolerance for PSF + +PSF_FIT_MIN_VALID_FLUX F32 -100000000.0 # minimum allow flux for fitted source +PSF_FIT_MAX_VALID_FLUX F32 +100000000.0 # maximum allow flux for fitted source + +# the following is used to require a minimum quality of fit before +# stopping based on the tolerance. be careful of using this in +# conjunction with non-poisson errors (POISSON.ERRORS.LMM) or with +# pooly determined errors +PSF_FIT_MAX_CHISQ F32 20.00 # require chisq / DOF to reach this level before giving up # PSF model parameters : choose the PSF model @@ -113,4 +123,5 @@ PSF.FAKE.ALLOW BOOL FALSE # Allow use of fake PSFs when having trouble? +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 @@ -138,5 +149,5 @@ # this model is used for approximate subtraction in the main object analysis step -EXT_MODEL STR PS_MODEL_QGAUSS +EXT_MODEL STR PS_MODEL_SERSIC EXT_FIT_NSIGMA F32 1 # significance for pixel included in fit EXT_FIT_PADDING F32 5 # extra annulus to use for fit @@ -145,5 +156,12 @@ EXT_FIT_ITER S32 20 # Maximum number of fitting iterations for EXT -EXT_FIT_TOL F32 0.01 # Fit tolerance for EXT +EXT_FIT_MIN_TOL F32 0.01 # Fit tolerance for EXT +EXT_FIT_MAX_TOL F32 2.00 # Fit tolerance for EXT + +# the following is used to require a minimum quality of fit before +# stopping based on the tolerance. be careful of using this in +# conjunction with non-poisson errors (POISSON.ERRORS.LMM) or with +# pooly determined errors +EXT_FIT_MAX_CHISQ F32 20.00 # require chisq / DOF to reach this level before giving up # extended source aperture-like measurements @@ -224,5 +242,5 @@ PCM_BOX_SIZE S32 8 -NOISE.FACTOR F32 5.0 +NOISE.FACTOR F32 10.0 NOISE.SIZE F32 2.0 @@ -343,5 +361,4 @@ DIFF_STATS BOOL TRUE # Calculate diff-specific stats OUTPUT.FORMAT STR PS1_DV1 # Format of output file - END Index: /trunk/ippconfig/simtest/format.config =================================================================== --- /trunk/ippconfig/simtest/format.config (revision 29004) +++ /trunk/ippconfig/simtest/format.config (revision 29005) @@ -69,6 +69,6 @@ CELL.X0 S32 0 CELL.Y0 S32 0 - CELL.XSIZE S32 1024 - CELL.YSIZE S32 1024 + CELL.XSIZE S32 1000 + CELL.YSIZE S32 1000 CELL.XWINDOW S32 0 CELL.YWINDOW S32 0