Index: /branches/czw_branch/20130702/ippconfig/gpc1/ppStack.config =================================================================== --- /branches/czw_branch/20130702/ippconfig/gpc1/ppStack.config (revision 36090) +++ /branches/czw_branch/20130702/ippconfig/gpc1/ppStack.config (revision 36091) @@ -63,5 +63,5 @@ PSF.INPUT.THRESH F32 10.0 PSF.INPUT.ASYMMETRY F32 0.2 - PSF.TARGET.AS.MAX BOOL TRUE + PSF.TARGET.AS.MAX BOOL TRUE MATCH.REJ F32 4.0 SAFE BOOL F @@ -125,4 +125,60 @@ END +STACK_NIGHTLY_1DG METADATA # Typically MD 8 input nightly stacks and using 1DG convolution + OUTPUT.NOCOMP BOOL FALSE + OUTPUT.LOGFLUX BOOL FALSE + PSF.TARGET.AS.MAX BOOL TRUE + PSF.TARGET.AS.MAX.EPSILON F32 0.1 +END + +STACK_MD_REF_1DG METADATA ## revised config for MD refstacks vs PS1_REFERENCE above after ppStack mods 5/03/13 + OUTPUT.NOCOMP BOOL TRUE + OUTPUT.LOGFLUX BOOL FALSE + OUTPUT.REPLICATE BOOL TRUE + STACK.TYPE STR DEEP_STACK ## needed? + PSF.INPUT.CLIP.SIMPLE BOOL True + PSF.INPUT.MAX F32 6.0 # never really want >6 pixels in refstack + PSF.INPUT.CLIP.NSIGMA F32 1.0 # sample typically on rising side of distribution (set even smaller?) + PSF.INPUT.THRESH F32 NAN + PSF.INPUT.ASYMMETRY F32 NAN + MATCH.REJ F32 4.0 # need ot tune? + SAFE BOOL FALSE + PSF.TARGET.AS.MAX BOOL TRUE # Set the target PSF FWHM as the maximum of accepted input FWHM values. + PSF.TARGET.AS.MAX.EPSILON F32 0.1 # Amount to set the target PSF FWHM larger than the maximum input. Target = eps + max(input) +END + +STACK_MD_DEEP_1DG METADATA ## revised config for MD deepstack above after ppStack mods 5/03/13 + OUTPUT.NOCOMP BOOL TRUE + OUTPUT.LOGFLUX BOOL FALSE + OUTPUT.REPLICATE BOOL TRUE + STACK.TYPE STR DEEP_STACK + PSF.INPUT.CLIP.SIMPLE BOOL True + PSF.INPUT.MAX F32 10.0 + PSF.INPUT.CLIP.NSIGMA F32 100.0 + PSF.INPUT.THRESH F32 NAN + PSF.INPUT.ASYMMETRY F32 NAN + MATCH.REJ F32 4.0 # need ot tune? + SAFE BOOL FALSE + PSF.TARGET.AS.MAX BOOL TRUE + PSF.TARGET.AS.MAX.EPSILON F32 0.1 +END + +STACK_ALLDEEP_1DG METADATA # no cuts, everything in changes after ppStack mods 5/03/13 + OUTPUT.NOCOMP BOOL TRUE + OUTPUT.LOGFLUX BOOL FALSE + OUTPUT.REPLICATE BOOL TRUE + STACK.TYPE STR DEEP_STACK + PSF.INPUT.CLIP.SIMPLE BOOL True + PSF.INPUT.MAX F32 100.0 + PSF.INPUT.CLIP.NSIGMA F32 100.0 + PSF.INPUT.THRESH F32 NAN + PSF.INPUT.ASYMMETRY F32 NAN + MATCH.REJ F32 4.0 # need ot tune? + SAFE BOOL FALSE + PSF.TARGET.AS.MAX BOOL TRUE + PSF.TARGET.AS.MAX.EPSILON F32 0.1 +END + + # Recipe overrides for STACK STACKPHOT METADATA Index: /branches/czw_branch/20130702/ippconfig/gpc1/psphot.config =================================================================== --- /branches/czw_branch/20130702/ippconfig/gpc1/psphot.config (revision 36090) +++ /branches/czw_branch/20130702/ippconfig/gpc1/psphot.config (revision 36091) @@ -54,4 +54,14 @@ PSPHOT.EXT.DIFF.ALTERNATE.THRESH F32 1.25 + # XXX enable these when MOPS is ready + # LMM_FIT_CHISQ_CONVERGENCE BOOL FALSE + # LMM_FIT_GAIN_FACTOR_MODE S32 2 + # PSF_FIT_MIN_TOL F32 0.2 + # EXT_FIT_MIN_TOL F32 0.2 + # PSF_FIT_ITER S32 20 + # EXT_FIT_ITER S32 20 + # FOOTPRINT_CULL_NSIGMA_DELTA F32 10 + # FOOTPRINT_CULL_NSIGMA_MIN F32 2 + PSPHOT.EXT.FIT.ALL.SOURCES BOOL TRUE PSPHOT.EXT.FIT.ALL.THRESH F32 1000 Index: /branches/czw_branch/20130702/ippconfig/recipes/filerules-split.mdc =================================================================== --- /branches/czw_branch/20130702/ippconfig/recipes/filerules-split.mdc (revision 36090) +++ /branches/czw_branch/20130702/ippconfig/recipes/filerules-split.mdc (revision 36091) @@ -280,4 +280,8 @@ PSASTRO.OUT.ORIGINAL.CMF.MEF OUTPUT {OUTPUT}.smf.original CMF NONE FPA TRUE MEF +# XXX need to use CHIP for tc3 tests, but why? +#PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG CHIP TRUE NONE +#PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK COMP_MASK CHIP TRUE NONE +#PSWARP.OUTPUT.VARIANCE OUTPUT {OUTPUT}.wt.fits VARIANCE COMP_WT CHIP TRUE NONE PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK COMP_MASK FPA TRUE NONE @@ -327,4 +331,5 @@ PPSTACK.OUTPUT.EXP OUTPUT {OUTPUT}.exp.fits IMAGE EXP FPA TRUE NONE +PPSTACK.OUTPUT.EXP.NOCOMP OUTPUT {OUTPUT}.exp.fits IMAGE NONE FPA TRUE NONE PPSTACK.OUTPUT.EXPNUM OUTPUT {OUTPUT}.num.fits MASK EXPNUM FPA TRUE NONE PPSTACK.OUTPUT.EXPWT.COMP OUTPUT {OUTPUT}.expwt.fits VARIANCE EXP FPA TRUE NONE @@ -337,4 +342,5 @@ PPSTACK.UNCONV.VARIANCE.NOCOMP OUTPUT {OUTPUT}.unconv.wt.fits VARIANCE NONE FPA TRUE NONE PPSTACK.UNCONV.EXP OUTPUT {OUTPUT}.unconv.exp.fits IMAGE EXP FPA TRUE NONE +PPSTACK.UNCONV.EXP.NOCOMP OUTPUT {OUTPUT}.unconv.exp.fits IMAGE NONE FPA TRUE NONE PPSTACK.UNCONV.EXPNUM OUTPUT {OUTPUT}.unconv.num.fits MASK EXPNUM FPA TRUE NONE PPSTACK.UNCONV.EXPWT.COMP OUTPUT {OUTPUT}.unconv.expwt.fits VARIANCE EXP FPA TRUE NONE Index: /branches/czw_branch/20130702/ippconfig/recipes/nightly_science.config =================================================================== --- /branches/czw_branch/20130702/ippconfig/recipes/nightly_science.config (revision 36090) +++ /branches/czw_branch/20130702/ippconfig/recipes/nightly_science.config (revision 36091) @@ -3,5 +3,5 @@ MODE STR CHIP COMMAND STR chiptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@ - RETENTION_TIME U16 21 + RETENTION_TIME U16 7 END CLEAN_MODES METADATA @@ -14,5 +14,5 @@ MODE STR DIFF COMMAND STR difftool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@ - RETENTION_TIME S16 21 + RETENTION_TIME S16 7 END CLEAN_MODES METADATA @@ -238,5 +238,5 @@ TESS STR RINGS.V3 OBSMODE STR OSS - STACKABLE BOOL TRUE + STACKABLE BOOL FALSE DIFFABLE BOOL TRUE REDUCTION STR SWEETSPOT @@ -249,5 +249,5 @@ TESS STR RINGS.V3 OBSMODE STR ESS - STACKABLE BOOL TRUE + STACKABLE BOOL FALSE DIFFABLE BOOL TRUE REDUCTION STR SWEETSPOT @@ -260,5 +260,5 @@ TESS STR RINGS.V3 OBSMODE STR MSS - STACKABLE BOOL TRUE + STACKABLE BOOL FALSE DIFFABLE BOOL TRUE REDUCTION STR SWEETSPOT Index: /branches/czw_branch/20130702/ippconfig/recipes/ppStack.config =================================================================== --- /branches/czw_branch/20130702/ippconfig/recipes/ppStack.config (revision 36090) +++ /branches/czw_branch/20130702/ippconfig/recipes/ppStack.config (revision 36091) @@ -98,4 +98,5 @@ PSF.TARGET.AS.MAX.EPSILON F32 0.1 # Amount to set the target PSF FWHM larger than the maximum input. Target = eps + max(input) + TEMP.IMAGE STR conv.im.fits # Suffix for temporary convolved images TEMP.MASK STR conv.mk.fits # Suffix for temporary convolved masks @@ -175,4 +176,16 @@ END +STACK_MD_REF_1DG METADATA +END + +STACK_MD_DEEP_1DG METADATA +END + +STACK_ALLDEEP_1DG METADATA +END + +STACK_NIGHTLY_1DG METADATA + STACK.TYPE STR NIGHTLY_STACK +END Index: /branches/czw_branch/20130702/ippconfig/recipes/ppSub.config =================================================================== --- /branches/czw_branch/20130702/ippconfig/recipes/ppSub.config (revision 36090) +++ /branches/czw_branch/20130702/ippconfig/recipes/ppSub.config (revision 36091) @@ -56,5 +56,5 @@ PENALTY F32 1.0 # 4.0e-6 for the updated code from 2010.09.19 BIN1 S32 16 # Binning factor for first level -BIN2 S32 16 # Binning factor for second level +BIN2 S32 16 # Binning factor for second level OPTIMUM BOOL FALSE # Derive optimum parameters for ISIS and GUNK kernels Index: /branches/czw_branch/20130702/ippconfig/recipes/psphot.config =================================================================== --- /branches/czw_branch/20130702/ippconfig/recipes/psphot.config (revision 36090) +++ /branches/czw_branch/20130702/ippconfig/recipes/psphot.config (revision 36091) @@ -207,4 +207,5 @@ # these models are used for high-quality shape analysis after all sources have been removed 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_MODELS_SELECTION STR ALL @@ -438,4 +439,7 @@ POISSON.ERRORS.PHOT.LMM BOOL TRUE + 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_MAX_RADIUS F32 50.0 PSF_MODEL STR PS_MODEL_PS1_V1 @@ -622,5 +626,5 @@ # these models are used for high-quality shape analysis after all sources have been removed EXTENDED_SOURCE_FITS BOOL TRUE # perform the detailed extended sourc fits? - EXT_MODEL STR PS_MODEL_EXP + EXT_MODEL STR PS_MODEL_GAUSS # if this is defined, it gives a list of the model names to fit below (ALL or NONE are also valid) Index: /branches/czw_branch/20130702/ippconfig/recipes/reductionClasses.mdc =================================================================== --- /branches/czw_branch/20130702/ippconfig/recipes/reductionClasses.mdc (revision 36090) +++ /branches/czw_branch/20130702/ippconfig/recipes/reductionClasses.mdc (revision 36091) @@ -577,4 +577,12 @@ END +NIGHTLY_STACK_1DG METADATA + STACK_PPSTACK STR STACK_NIGHTLY_1DG + STACK_PPSUB STR STACK_1DG + STACK_PSPHOT STR STACK + STACKPHOT_PSPHOT STR STACKPHOT + STATICSKY_CALIBRATION STR STATICSKY_NIGHTCAL +END + # deep stacks DEEP_STACK METADATA @@ -615,5 +623,5 @@ MD_REF_STACK_1DG METADATA - STACK_PPSTACK STR STACK_MD_REF + STACK_PPSTACK STR STACK_MD_REF_1DG STACK_PPSUB STR STACK_1DG STACK_PSPHOT STR STACK @@ -635,5 +643,5 @@ MD_DEEP_STACK_1DG METADATA - STACK_PPSTACK STR STACK_MD_DEEP + STACK_PPSTACK STR STACK_MD_DEEP_1DG STACK_PPSUB STR STACK_1DG STACK_PSPHOT STR STACK @@ -668,4 +676,14 @@ STATICSKY_CALIBRATION STR STATICSKY_DEEPCAL END + +ALLDEEP_STACK_1DG METADATA + STACK_PPSTACK STR STACK_ALLDEEP_1DG + STACK_PPSUB STR STACK_1DG + STACK_PSPHOT STR STACK + STACKPHOT_PSPHOT STR STACKPHOT + STATICSKY_CALIBRATION STR STATICSKY_DEEPCAL +END + + TESTSTACK METADATA