Index: trunk/ippconfig/recipes/filerules-mef.mdc =================================================================== --- trunk/ippconfig/recipes/filerules-mef.mdc (revision 34512) +++ trunk/ippconfig/recipes/filerules-mef.mdc (revision 34528) @@ -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 @@ -220,4 +234,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 @@ -234,10 +249,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: trunk/ippconfig/recipes/filerules-simple.mdc =================================================================== --- trunk/ippconfig/recipes/filerules-simple.mdc (revision 34512) +++ trunk/ippconfig/recipes/filerules-simple.mdc (revision 34528) @@ -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 @@ -195,4 +197,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 @@ -213,11 +216,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: trunk/ippconfig/recipes/filerules-split.mdc =================================================================== --- trunk/ippconfig/recipes/filerules-split.mdc (revision 34512) +++ trunk/ippconfig/recipes/filerules-split.mdc (revision 34528) @@ -131,4 +131,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 @@ -214,4 +215,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 @@ -235,8 +237,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 @@ -333,4 +344,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