Index: branches/sc_branches/trunkTest/ippconfig/recipes/filerules-split.mdc =================================================================== --- branches/sc_branches/trunkTest/ippconfig/recipes/filerules-split.mdc (revision 28957) +++ branches/sc_branches/trunkTest/ippconfig/recipes/filerules-split.mdc (revision 29060) @@ -209,4 +209,5 @@ PSPHOT.STACK.OUTPUT.VARIANCE OUTPUT {OUTPUT}.{FILE.ID}.wt.fits VARIANCE NONE FPA TRUE NONE PSPHOT.STACK.OUTPUT OUTPUT {OUTPUT}.{FILE.ID}.cmf CMF NONE FPA TRUE NONE +PSPHOT.STACK.CONFIG OUTPUT {OUTPUT}.psphotStack.mdc TEXT NONE FPA TRUE NONE SOURCE.PLOT.RAW.MOMENTS OUTPUT {OUTPUT}.{CHIP.NAME}.mnt.png KAPA NONE CHIP TRUE NONE Index: branches/sc_branches/trunkTest/ippconfig/recipes/fitstypes.mdc =================================================================== --- branches/sc_branches/trunkTest/ippconfig/recipes/fitstypes.mdc (revision 28957) +++ branches/sc_branches/trunkTest/ippconfig/recipes/fitstypes.mdc (revision 29060) @@ -107,4 +107,6 @@ BSCALE F32 0.1 # Disk is stored as 1/10th sec BZERO F32 3276.8 # Store unsigned zero as zero + # switch to NONE to work around ticket 1411 + #COMPRESSION STR NONE COMPRESSION STR GZIP TILE.X S32 0 Index: branches/sc_branches/trunkTest/ippconfig/recipes/nightly_science.config =================================================================== --- branches/sc_branches/trunkTest/ippconfig/recipes/nightly_science.config (revision 28957) +++ branches/sc_branches/trunkTest/ippconfig/recipes/nightly_science.config (revision 29060) @@ -37,4 +37,73 @@ FILTERS STR z.00000 FILTERS STR y.00000 + +UNRECOVERABLE_QUALITY MULTI +UNRECOVERABLE_QUALITY S16 4007 + +MACRO_DEFINITIONS MULTI +#MACRO_DEFINITIONS METADATA +# PROC_MODE STR check_chips +# MACRO STR echo survey.del.destreak @LABEL@ +#END +MACRO_DEFINITIONS METADATA + PROC_MODE STR queue_chips + MACRO STR survey.del.destreak @LABEL@ +END +MACRO_DEFINITIONS METADATA + PROC_MODE STR confirm_stacks + MACRO STR survey.add.destreak @LABEL@ /data/ipp053.0/gpc1_destreak +END +#MACRO_DEFINITIONS METADATA +# PROC_MODE STR check_confirm_stacks +# MACRO STR echo survey.add.destreak @LABEL@ /data/ipp053.0/gpc1_destreak +#END +# MACRO_DEFINITIONS METADATA +# PROC_MODE STR clean_old +# MACRO STR +# END +# MACRO_DEFINITIONS METADATA +# PROC_MODE STR check_registration +# MACRO STR +# END +# MACRO_DEFINITIONS METADATA +# PROC_MODE STR define_burntool +# MACRO STR +# END +# MACRO_DEFINITIONS METADATA +# PROC_MODE STR queue_burntool +# MACRO STR +# END +# MACRO_DEFINITIONS METADATA +# PROC_MODE STR check_stacks +# MACRO STR +# END +# MACRO_DEFINITIONS METADATA +# PROC_MODE STR queue_stacks +# MACRO STR +# END +# MACRO_DEFINITIONS METADATA +# PROC_MODE STR check_sweetspot +# MACRO STR +# END +# MACRO_DEFINITIONS METADATA +# PROC_MODE STR queue_sweetspot +# MACRO STR +# END +# MACRO_DEFINITIONS METADATA +# PROC_MODE STR check_dqstats +# MACRO STR +# END +# MACRO_DEFINITIONS METADATA +# PROC_MODE STR queue_dqstats +# MACRO STR +# END +# MACRO_DEFINITIONS METADATA +# PROC_MODE STR check_detrends +# MACRO STR +# END +# MACRO_DEFINITIONS METADATA +# PROC_MODE STR queue_detrends +# MACRO STR +# END TARGETS MULTI Index: branches/sc_branches/trunkTest/ippconfig/recipes/ppSim.config =================================================================== --- branches/sc_branches/trunkTest/ippconfig/recipes/ppSim.config (revision 28957) +++ branches/sc_branches/trunkTest/ippconfig/recipes/ppSim.config (revision 29060) @@ -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: branches/sc_branches/trunkTest/ippconfig/recipes/ppSub.config =================================================================== --- branches/sc_branches/trunkTest/ippconfig/recipes/ppSub.config (revision 28957) +++ branches/sc_branches/trunkTest/ippconfig/recipes/ppSub.config (revision 29060) @@ -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) @@ -57,5 +59,5 @@ INNER S32 5 # Inner half-size for SPAM and FRIES kernels RINGS.ORDER S32 2 # Polynomial order for RINGS kernels -PENALTY F32 1.0 # Penalty for wideness +PENALTY F32 16.0 # Penalty for wideness BIN1 S32 4 # Binning factor for first level BIN2 S32 4 # Binning factor for second level Index: branches/sc_branches/trunkTest/ippconfig/recipes/psphot.config =================================================================== --- branches/sc_branches/trunkTest/ippconfig/recipes/psphot.config (revision 28957) +++ branches/sc_branches/trunkTest/ippconfig/recipes/psphot.config (revision 29060) @@ -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 @@ -170,5 +188,7 @@ #PGAUSS_PSF EXTENDED_SOURCE_MODEL PS_MODEL_PGAUSS 20.0 TRUE #QGAUSS_PSF EXTENDED_SOURCE_MODEL PS_MODEL_QGAUSS 20.0 TRUE - SERSIC_PSF EXTENDED_SOURCE_MODEL PS_MODEL_SERSIC 20.0 TRUE + EXP_PCM EXTENDED_SOURCE_MODEL PS_MODEL_EXP 20.0 TRUE + DEV_PCM EXTENDED_SOURCE_MODEL PS_MODEL_DEV 20.0 TRUE + SER_PCM EXTENDED_SOURCE_MODEL PS_MODEL_SERSIC 20.0 TRUE END @@ -224,5 +244,5 @@ PCM_BOX_SIZE S32 8 -NOISE.FACTOR F32 5.0 +NOISE.FACTOR F32 10.0 NOISE.SIZE F32 2.0 @@ -307,10 +327,9 @@ # 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 20.0 EXTENDED_SOURCE_PETROSIAN BOOL TRUE - EXTENDED_SOURCE_ISOPHOTAL BOOL FALSE EXTENDED_SOURCE_ANNULI BOOL TRUE - EXTENDED_SOURCE_KRON 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? @@ -319,4 +338,8 @@ RADIAL_APERTURES_SN_LIM F32 0.0 # S/N limit for radial aperture calculation OUTPUT.FORMAT STR PS1_SV1 + + EXT_FIT_MAX_RADIUS F32 50.0 + PSF_MODEL STR PS_MODEL_GAUSS + EXT_MODEL STR PS_MODEL_SERSIC END @@ -343,5 +366,4 @@ DIFF_STATS BOOL TRUE # Calculate diff-specific stats OUTPUT.FORMAT STR PS1_DV1 # Format of output file - END