Index: branches/czw_branch/20120906/ippconfig/gpc1/psastro.config =================================================================== --- branches/czw_branch/20120906/ippconfig/gpc1/psastro.config (revision 34628) +++ branches/czw_branch/20120906/ippconfig/gpc1/psastro.config (revision 34772) @@ -408,9 +408,11 @@ PSASTRO.GRID.NRAW.MAX S32 2000 PSASTRO.GRID.NREF.MAX S32 2000 - PSASTRO.MIN.INST.MAG.RAW F32 -20.0 - PSASTRO.MAX.INST.MAG.RAW F32 -15.0 - PSASTRO.GRID.MIN.INST.MAG.RAW F32 -20.0 + PSASTRO.MIN.INST.MAG.RAW F32 -19.0 + PSASTRO.MAX.INST.MAG.RAW F32 -14.0 + PSASTRO.GRID.MIN.INST.MAG.RAW F32 -19.0 PSASTRO.GRID.MAX.INST.MAG.RAW F32 -15.0 - DVO.GETSTAR.MIN.MAG.INST F32 -13.0 -END - + DVO.GETSTAR.MIN.MAG.INST F32 -19.0 + DVO.GETSTAR.MIN.MAG F32 16.0 + +END + Index: branches/czw_branch/20120906/ippconfig/isp/psastro.config =================================================================== --- branches/czw_branch/20120906/ippconfig/isp/psastro.config (revision 34628) +++ branches/czw_branch/20120906/ippconfig/isp/psastro.config (revision 34772) @@ -56,13 +56,13 @@ # single-chip radius match in pixels PSASTRO.MATCH.RADIUS F32 15 -PSASTRO.MATCH.RADIUS.N0 F32 15 -PSASTRO.MATCH.RADIUS.N1 F32 10 -PSASTRO.MATCH.RADIUS.N2 F32 15 -PSASTRO.MATCH.RADIUS.N3 F32 0 -PSASTRO.MATCH.RADIUS.N4 F32 0 -PSASTRO.MATCH.RADIUS.N5 F32 0 +PSASTRO.MATCH.RADIUS.N0 F32 30 +PSASTRO.MATCH.RADIUS.N1 F32 15 +PSASTRO.MATCH.RADIUS.N2 F32 10 +PSASTRO.MATCH.RADIUS.N3 F32 6 +PSASTRO.MATCH.RADIUS.N4 F32 3 +PSASTRO.MATCH.RADIUS.N5 F32 3 PSASTRO.MATCH.RADIUS.N6 F32 0 PSASTRO.MATCH.RADIUS.N7 F32 0 -PSASTRO.MATCH.FIT.NITER S32 1 +PSASTRO.MATCH.FIT.NITER S32 5 # pmAstromMatchFit @@ -70,4 +70,8 @@ PSASTRO.CHIP.NITER S32 3 # fit clipping iterations PSASTRO.CHIP.NSIGMA F32 3 # fit clipping sigmas + + + + PSASTRO.MAX.ERROR F32 10.0 # max error in pixels Index: branches/czw_branch/20120906/ippconfig/recipes/filerules-mef.mdc =================================================================== --- branches/czw_branch/20120906/ippconfig/recipes/filerules-mef.mdc (revision 34628) +++ branches/czw_branch/20120906/ippconfig/recipes/filerules-mef.mdc (revision 34772) @@ -88,4 +88,18 @@ PSPHOT.INPUT.TEXT INPUT @FILES CHIP SRCTEXT PSPHOT.EXPNUM INPUT @FILES CHIP MASK + +## files used by psphotStack +PSPHOT.STACK.INPUT.RAW INPUT @FILES CHIP IMAGE +PSPHOT.STACK.MASK.RAW INPUT @FILES CHIP MASK +PSPHOT.STACK.VARIANCE.RAW INPUT @FILES CHIP VARIANCE +PSPHOT.STACK.EXPNUM.RAW INPUT @FILES CHIP EXPNUM +PSPHOT.STACK.PSF.RAW INPUT @FILES CHIP PSF +PSPHOT.STACK.INPUT.CNV INPUT @FILES CHIP IMAGE +PSPHOT.STACK.MASK.CNV INPUT @FILES CHIP MASK +PSPHOT.STACK.VARIANCE.CNV INPUT @FILES CHIP VARIANCE +PSPHOT.STACK.EXPNUM.CNV INPUT @FILES CHIP EXPNUM +PSPHOT.STACK.PSF.CNV INPUT @FILES CHIP PSF +PSPHOT.STACK.SOURCES INPUT @FILES FPA CMF + ## files used by psastro @@ -222,4 +236,5 @@ PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE NONE CHIP FALSE MEF PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE NONE CHIP FALSE MEF +PSPHOT.BACKMDL.STDEV OUTPUT {OUTPUT}.mdl.std.fits IMAGE NONE CHIP FALSE MEF PSPHOT.BACKMDL.MEF OUTPUT {OUTPUT}.mdl.fits IMAGE NONE CHIP FALSE MEF @@ -236,10 +251,28 @@ PSPHOT.SKY.CONFIG OUTPUT {OUTPUT}.psphot.mdc TEXT NONE FPA TRUE NONE - # outputs for psphotStack: -PSPHOT.CHISQ.IMAGE OUTPUT {OUTPUT}.{CHIP.NAME}.chisq.im.fits IMAGE NONE FPA TRUE SIMPLE -PSPHOT.CHISQ.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.chisq.mk.fits MASK NONE FPA TRUE SIMPLE -PSPHOT.CHISQ.VARIANCE OUTPUT {OUTPUT}.{CHIP.NAME}.chisq.wt.fits VARIANCE NONE FPA TRUE SIMPLE -PSPHOT.STACK.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.sky.{FILE.ID}.cmf CMF NONE FPA TRUE NONE +PSPHOT.CHISQ.IMAGE OUTPUT {OUTPUT}.chisq.im.fits IMAGE NONE FPA TRUE NONE +PSPHOT.CHISQ.MASK OUTPUT {OUTPUT}.chisq.mk.fits MASK NONE FPA TRUE NONE +PSPHOT.CHISQ.VARIANCE OUTPUT {OUTPUT}.chisq.wt.fits VARIANCE NONE FPA TRUE NONE +PSPHOT.STACK.OUTPUT.IMAGE OUTPUT {OUTPUT}.stk.{FILE.ID}.im.fits IMAGE NONE FPA TRUE NONE +PSPHOT.STACK.OUTPUT.MASK OUTPUT {OUTPUT}.stk.{FILE.ID}.mk.fits MASK NONE FPA TRUE NONE +PSPHOT.STACK.OUTPUT.VARIANCE OUTPUT {OUTPUT}.stk.{FILE.ID}.wt.fits VARIANCE NONE FPA TRUE NONE +PSPHOT.STACK.OUTPUT OUTPUT {OUTPUT}.stk.{FILE.ID}.cmf CMF NONE FPA TRUE NONE +PSPHOT.STACK.PSF.SAVE OUTPUT {OUTPUT}.stk.{FILE.ID}.psf PSF NONE FPA TRUE NONE +PSPHOT.STACK.BACKMDL OUTPUT {OUTPUT}.stk.{FILE.ID}.mdl.fits IMAGE NONE FPA TRUE NONE +PSPHOT.STACK.BACKMDL.STDEV OUTPUT {OUTPUT}.stk.{FILE.ID}.mdl.sdv.fits IMAGE NONE FPA TRUE NONE + +PSPHOT.STACK.CONFIG OUTPUT {OUTPUT}.psphotStack.mdc TEXT NONE FPA TRUE NONE + +PSPHOT.STACK.RESID OUTPUT {OUTPUT}.stk.{FILE.ID}.res.fits IMAGE COMP_SUB FPA TRUE NONE +PSPHOT.STACK.BACKGND OUTPUT {OUTPUT}.stk.{FILE.ID}.bck.fits IMAGE COMP_IMG FPA TRUE NONE +PSPHOT.STACK.BACKSUB OUTPUT {OUTPUT}.stk.{FILE.ID}.sub.fits IMAGE COMP_SUB FPA TRUE NONE + +# old outputs for psphotStack: +# I think these are wrong +#PSPHOT.CHISQ.IMAGE OUTPUT {OUTPUT}.{CHIP.NAME}.chisq.im.fits IMAGE NONE FPA TRUE SIMPLE +#PSPHOT.CHISQ.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.chisq.mk.fits MASK NONE FPA TRUE SIMPLE +#PSPHOT.CHISQ.VARIANCE OUTPUT {OUTPUT}.{CHIP.NAME}.chisq.wt.fits VARIANCE NONE FPA TRUE SIMPLE +#PSPHOT.STACK.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.sky.{FILE.ID}.cmf CMF NONE FPA TRUE NONE SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.mnt.png KAPA NONE FPA TRUE NONE Index: branches/czw_branch/20120906/ippconfig/recipes/filerules-simple.mdc =================================================================== --- branches/czw_branch/20120906/ippconfig/recipes/filerules-simple.mdc (revision 34628) +++ branches/czw_branch/20120906/ippconfig/recipes/filerules-simple.mdc (revision 34772) @@ -64,8 +64,10 @@ PSPHOT.STACK.MASK.RAW INPUT @FILES CHIP MASK PSPHOT.STACK.VARIANCE.RAW INPUT @FILES CHIP VARIANCE +PSPHOT.STACK.EXPNUM.RAW INPUT @FILES CHIP MASK PSPHOT.STACK.PSF.RAW INPUT @FILES CHIP PSF PSPHOT.STACK.INPUT.CNV INPUT @FILES CHIP IMAGE PSPHOT.STACK.MASK.CNV INPUT @FILES CHIP MASK PSPHOT.STACK.VARIANCE.CNV INPUT @FILES CHIP VARIANCE +PSPHOT.STACK.EXPNUM.CNV INPUT @FILES CHIP MASK PSPHOT.STACK.PSF.CNV INPUT @FILES CHIP PSF PSPHOT.STACK.SOURCES INPUT @FILES FPA CMF @@ -197,4 +199,5 @@ PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE NONE FPA TRUE SIMPLE PSPHOT.BACKMDL.MEF OUTPUT {OUTPUT}.mdl.fits IMAGE NONE FPA TRUE SIMPLE +PSPHOT.BACKMDL.STDEV OUTPUT {OUTPUT}.mdl.std.fits IMAGE NONE FPA TRUE SIMPLE PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT} RAW NONE FPA TRUE NONE @@ -215,11 +218,19 @@ # outputs for psphotStack: -PSPHOT.CHISQ.IMAGE OUTPUT {OUTPUT}.chisq.im.fits IMAGE NONE FPA TRUE NONE -PSPHOT.CHISQ.MASK OUTPUT {OUTPUT}.chisq.mk.fits MASK NONE FPA TRUE NONE -PSPHOT.CHISQ.VARIANCE OUTPUT {OUTPUT}.chisq.wt.fits VARIANCE NONE FPA TRUE NONE +PSPHOT.CHISQ.IMAGE OUTPUT {OUTPUT}.chisq.im.fits IMAGE NONE FPA TRUE NONE +PSPHOT.CHISQ.MASK OUTPUT {OUTPUT}.chisq.mk.fits MASK NONE FPA TRUE NONE +PSPHOT.CHISQ.VARIANCE OUTPUT {OUTPUT}.chisq.wt.fits VARIANCE NONE FPA TRUE NONE PSPHOT.STACK.OUTPUT.IMAGE OUTPUT {OUTPUT}.stk.{FILE.ID}.im.fits IMAGE NONE FPA TRUE NONE PSPHOT.STACK.OUTPUT.MASK OUTPUT {OUTPUT}.stk.{FILE.ID}.mk.fits MASK NONE FPA TRUE NONE PSPHOT.STACK.OUTPUT.VARIANCE OUTPUT {OUTPUT}.stk.{FILE.ID}.wt.fits VARIANCE NONE FPA TRUE NONE PSPHOT.STACK.OUTPUT OUTPUT {OUTPUT}.stk.{FILE.ID}.cmf CMF NONE FPA TRUE NONE +PSPHOT.STACK.PSF.SAVE OUTPUT {OUTPUT}.stk.{FILE.ID}.psf PSF NONE FPA TRUE NONE +PSPHOT.STACK.BACKMDL OUTPUT {OUTPUT}.stk.{FILE.ID}.mdl.fits IMAGE NONE FPA TRUE NONE +PSPHOT.STACK.BACKMDL.STDEV OUTPUT {OUTPUT}.stk.{FILE.ID}.mdl.sdv.fits IMAGE NONE FPA TRUE NONE +PSPHOT.STACK.BACKGND OUTPUT {OUTPUT}.stk.{FILE.ID}.bck.fits IMAGE COMP_IMG FPA TRUE NONE +PSPHOT.STACK.BACKSUB OUTPUT {OUTPUT}.stk.{FILE.ID}.sub.fits IMAGE COMP_SUB FPA TRUE NONE +PSPHOT.STACK.RESID OUTPUT {OUTPUT}.stk.{FILE.ID}.res.fits IMAGE COMP_SUB FPA TRUE NONE +PSPHOT.STACK.CONFIG OUTPUT {OUTPUT}.psphotStack.mdc TEXT NONE FPA TRUE NONE + SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.mnt.png KAPA NONE FPA TRUE NONE Index: branches/czw_branch/20120906/ippconfig/recipes/filerules-split.mdc =================================================================== --- branches/czw_branch/20120906/ippconfig/recipes/filerules-split.mdc (revision 34628) +++ branches/czw_branch/20120906/ippconfig/recipes/filerules-split.mdc (revision 34772) @@ -133,4 +133,5 @@ PPSTAMP.INPUT.MASK INPUT @FILES CHIP MASK PPSTAMP.INPUT.VARIANCE INPUT @FILES CHIP VARIANCE +PPSTAMP.INPUT.SOURCES INPUT @FILES CHIP CMF # files used by pparith @@ -216,4 +217,5 @@ PSPHOT.BACKSUB OUTPUT {OUTPUT}.{CHIP.NAME}.sub.fits IMAGE COMP_SUB CHIP TRUE NONE PSPHOT.BACKMDL OUTPUT {OUTPUT}.{CHIP.NAME}.mdl.fits IMAGE NONE CHIP TRUE NONE +PSPHOT.BACKMDL.STDEV OUTPUT {OUTPUT}.{CHIP.NAME}.mdl.std.fits IMAGE NONE CHIP TRUE NONE PSPHOT.BACKMDL.MEF OUTPUT {OUTPUT}.mdl.fits IMAGE NONE CHIP TRUE NONE @@ -237,8 +239,17 @@ PSPHOT.CHISQ.MASK OUTPUT {OUTPUT}.chisq.mk.fits MASK NONE FPA TRUE NONE PSPHOT.CHISQ.VARIANCE OUTPUT {OUTPUT}.chisq.wt.fits VARIANCE NONE FPA TRUE NONE -PSPHOT.STACK.OUTPUT.IMAGE OUTPUT {OUTPUT}.stk.{FILE.ID}.im.fits IMAGE NONE FPA TRUE NONE -PSPHOT.STACK.OUTPUT.MASK OUTPUT {OUTPUT}.stk.{FILE.ID}.mk.fits MASK NONE FPA TRUE NONE -PSPHOT.STACK.OUTPUT.VARIANCE OUTPUT {OUTPUT}.stk.{FILE.ID}.wt.fits VARIANCE NONE FPA TRUE NONE -PSPHOT.STACK.OUTPUT OUTPUT {OUTPUT}.stk.{FILE.ID}.cmf CMF NONE FPA TRUE NONE + +PSPHOT.STACK.OUTPUT.IMAGE OUTPUT {OUTPUT}.stk.{FILE.ID}.im.fits IMAGE NONE FPA TRUE NONE +PSPHOT.STACK.OUTPUT.MASK OUTPUT {OUTPUT}.stk.{FILE.ID}.mk.fits MASK NONE FPA TRUE NONE +PSPHOT.STACK.OUTPUT.VARIANCE OUTPUT {OUTPUT}.stk.{FILE.ID}.wt.fits VARIANCE NONE FPA TRUE NONE +PSPHOT.STACK.OUTPUT OUTPUT {OUTPUT}.stk.{FILE.ID}.cmf CMF NONE FPA TRUE NONE + +PSPHOT.STACK.PSF.SAVE OUTPUT {OUTPUT}.stk.{FILE.ID}.psf PSF NONE FPA TRUE NONE +PSPHOT.STACK.BACKMDL OUTPUT {OUTPUT}.stk.{FILE.ID}.mdl.fits IMAGE NONE FPA TRUE NONE + +PSPHOT.STACK.BACKMDL.STDEV OUTPUT {OUTPUT}.stk.{FILE.ID}.mdl.sdv.fits IMAGE NONE FPA TRUE NONE +PSPHOT.STACK.BACKGND OUTPUT {OUTPUT}.stk.{FILE.ID}.bck.fits IMAGE COMP_IMG FPA TRUE NONE +PSPHOT.STACK.BACKSUB OUTPUT {OUTPUT}.stk.{FILE.ID}.sub.fits IMAGE COMP_SUB FPA TRUE NONE +PSPHOT.STACK.RESID OUTPUT {OUTPUT}.stk.{FILE.ID}.res.fits IMAGE COMP_SUB FPA TRUE NONE PSPHOT.STACK.CONFIG OUTPUT {OUTPUT}.psphotStack.mdc TEXT NONE FPA TRUE NONE @@ -338,4 +349,5 @@ PPSTAMP.OUTPUT.VARIANCE.NOCOMP OUTPUT {OUTPUT}.wt.fits VARIANCE NONE FPA TRUE NONE PPSTAMP.OUTPUT.JPEG OUTPUT {OUTPUT}.jpg JPEG NONE FPA TRUE NONE +PPSTAMP.OUTPUT.SOURCES OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE # mosaic image used for making stamps of raw images. Not saved. PPSTAMP.CHIP OUTPUT {OUTPUT}.ch.fits IMAGE NONE CHIP FALSE MEF Index: branches/czw_branch/20120906/ippconfig/recipes/nightly_science.config =================================================================== --- branches/czw_branch/20120906/ippconfig/recipes/nightly_science.config (revision 34628) +++ branches/czw_branch/20120906/ippconfig/recipes/nightly_science.config (revision 34772) @@ -7,6 +7,6 @@ CLEAN_MODES METADATA MODE STR WARP -# COMMAND STR warptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@ - COMMAND STR true + COMMAND STR warptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@ +# COMMAND STR true RETENTION_TIME U16 7 END @@ -79,4 +79,10 @@ DIFFABLE BOOL FALSE DIST S16 30 + # bump the retention times for the time being + CHIP S16 60 + WARP S16 60 + DIFF S16 60 + CHIPBG S16 60 + WARPBG S16 60 END TARGETS METADATA @@ -211,7 +217,7 @@ REDUCTION STR STS_DATASET # bump the retention times for the time being - CHIP S16 7 - WARP S16 7 - DIFF S16 7 + CHIP S16 60 + WARP S16 60 + DIFF S16 60 END TARGETS METADATA Index: branches/czw_branch/20120906/ippconfig/recipes/ppStack.config =================================================================== --- branches/czw_branch/20120906/ippconfig/recipes/ppStack.config (revision 34628) +++ branches/czw_branch/20120906/ippconfig/recipes/ppStack.config (revision 34772) @@ -103,4 +103,6 @@ STACK.TYPE STR DEEP_STACK +DEFAULT.EXPTIME F32 NAN + # Recipe overrides for STACK STACK METADATA Index: branches/czw_branch/20120906/ippconfig/recipes/ppSub.config =================================================================== --- branches/czw_branch/20120906/ippconfig/recipes/ppSub.config (revision 34628) +++ branches/czw_branch/20120906/ippconfig/recipes/ppSub.config (revision 34772) @@ -90,12 +90,8 @@ # Recipe overrides for DIFF DIFF METADATA -END - -# Difference of two warps -WARPWARP METADATA - DUAL BOOL TRUE # Dual convolution? +# DUAL BOOL TRUE # Dual convolution? INVERSE BOOL TRUE # Generate inverse subtraction? PHOTOMETRY BOOL TRUE # Perform photometry? - + NOCONVOLVE BOOL TRUE # CZW REMOVE THIS! # penalty of 1.0 # DUAL convolution is more sensitive to the number of kernels @@ -112,8 +108,29 @@ END +# Difference of two warps +WARPWARP METADATA + DUAL BOOL TRUE # Dual convolution? + INVERSE BOOL TRUE # Generate inverse subtraction? + PHOTOMETRY BOOL TRUE # Perform photometry? + + # penalty of 1.0 + # DUAL convolution is more sensitive to the number of kernels + # do not provide as many orders as for SINGLE + # @ISIS.WIDTHS F32 2.4 5.0 10.0 # Gaussian kernel FWHM values + @ISIS.WIDTHS F32 1.5 3.0 6.0 # Gaussian kernel FWHM values + # @ISIS.WIDTHS F32 2.0 3.0 5.0 # Gaussian kernel FWHM values + # @ISIS.WIDTHS F32 2.1 4.2 8.4 # Gaussian kernel FWHM values + @ISIS.ORDERS S32 2 2 2 # Polynomial orders for ISIS kernels + + SCALE.REF F32 5.0 # FWHM reference for kernel parameter scaling + KERNEL.SIZE S32 15 # Kernel half-size (pixels) + STAMP.FOOTPRINT S32 15 # Size of stamps (pixels) +END + # Difference of warp - stack WARPSTACK METADATA DUAL BOOL FALSE # Dual convolution? INVERSE BOOL FALSE # Generate inverse subtraction? + NOCONVOLVE BOOL TRUE # CZW REMOVE THIS! PHOTOMETRY BOOL TRUE # Perform photometry? CONVOLVE.TARGET STR SINGLE2 # convolution direction Index: branches/czw_branch/20120906/ippconfig/recipes/psphot.config =================================================================== --- branches/czw_branch/20120906/ippconfig/recipes/psphot.config (revision 34628) +++ branches/czw_branch/20120906/ippconfig/recipes/psphot.config (revision 34772) @@ -75,4 +75,7 @@ DEBLEND_SKY_NSIGMA F32 10.0 DEBLEND_MIN_SATURATION F32 40000.0 + +# subtract radial profiles for extremely bright stars? +SUBTRACT_SATSTAR_PROFILE BOOL F # parameters to control the selection of the peak in the Sx,Sy plane @@ -193,6 +196,4 @@ KRON_ITERATIONS S32 2 -KRON_APPLY_WEIGHT BOOL FALSE -KRON_APPLY_WINDOW BOOL FALSE KRON_SMOOTH BOOL TRUE # smooth pixels before measuring kron radii KRON_SMOOTH_SIGMA F32 1.7 @@ -286,5 +287,6 @@ # psphotFitSourcesLinear has 3 options for the weighting: CONSTANT, # IMAGE_VAR, MODEL_VAR the first of these used to be folded into the -# boolean CONSTANT_PHOTOMETRIC_WEIGHTS above. +# boolean CONSTANT_PHOTOMETRIC_WEIGHTS above (so if _MODE set, then +# it overrides). LINEAR_FIT_VARIANCE_MODE STR CONSTANT @@ -414,4 +416,7 @@ PETROSIAN_FOR_STARS BOOL FALSE + # subtract radial profiles for extremely bright stars? + SUBTRACT_SATSTAR_PROFILE BOOL T + CONSTANT_PHOTOMETRIC_WEIGHTS BOOL TRUE POISSON.ERRORS.PHOT.LMM BOOL TRUE @@ -519,7 +524,13 @@ STACKPHOT_SINGLE METADATA - PSPHOT.STACK.USE.RAW BOOL F # since false perform photometry & morphology analysis on the convolved images + # while not used by psphot directly, staticsky.pl uses to decide if single filter calls psphot with convolved or unconvolved/raw input. + PSPHOT.STACK.USE.RAW BOOL T # if false perform photometry & morphology analysis on the convolved images + # NOTE: if PSPHOT.STACK.USE.RAW is set to False, KRON.SMOOTH should be + # set to false as well in order to get the best MOMENTS_R1 measurement. + KRON_SMOOTH BOOL T # smooth before kron radius measurement + # default is T and won't work here SAVE.BACKMDL BOOL F END + # Recipe overrides for CHIP @@ -547,5 +558,5 @@ DIFF METADATA DIFF_STATS BOOL TRUE # Calculate diff-specific stats - OUTPUT.FORMAT STR PS1_DV2 # Format of output file + OUTPUT.FORMAT STR PS1_DV3 # Format of output file # Extended source fit parameters @@ -564,5 +575,5 @@ PEAKS_NSIGMA_LIMIT_2 F32 4.0 # peak significance threshold DIFF_STATS BOOL TRUE # Calculate diff-specific stats - OUTPUT.FORMAT STR PS1_DV2 # Format of output file + OUTPUT.FORMAT STR PS1_DV3 # Format of output file # Extended source fit parameters Index: branches/czw_branch/20120906/ippconfig/recipes/reductionClasses.mdc =================================================================== --- branches/czw_branch/20120906/ippconfig/recipes/reductionClasses.mdc (revision 34628) +++ branches/czw_branch/20120906/ippconfig/recipes/reductionClasses.mdc (revision 34772) @@ -260,4 +260,28 @@ STACK_PSPHOT STR STACK DIFF_PPSUB STR DIFF + DIFF_PSPHOT STR SSTF_DIFF + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + FAKEPHOT STR FAKEPHOT + ADDSTAR STR ADDSTAR + PSASTRO STR DEFAULT_RECIPE + STACKPHOT_PSPHOT STR STACKPHOT + STACKPHOT_PPSUB STR STACKPHOT + STACKPHOT_PPSTACK STR STACKPHOT + STACKPHOT_SINGLE_PSPHOT STR STACKPHOT_SINGLE + BACKGROUND_PPBACKGROUND STR BACKGROUND + BACKGROUND_PSWARP STR BACKGROUND + PSVIDEOPHOT STR PSVIDEOPHOT +END + +# Sweetspot reduction class +SWEETSPOT_WS METADATA + CHIP_PPIMAGE STR CHIP + CHIP_PSPHOT STR CHIP + WARP_PSWARP STR WARP + STACK_PPSTACK STR QUICKSTACK + STACK_PPSUB STR STACK + STACK_PSPHOT STR STACK + DIFF_PPSUB STR WARPSTACK DIFF_PSPHOT STR SSTF_DIFF JPEG_BIN1 STR PPIMAGE_J1