Index: /trunk/ippconfig/lbc_red/filerules.mdc =================================================================== --- /trunk/ippconfig/lbc_red/filerules.mdc (revision 19393) +++ /trunk/ippconfig/lbc_red/filerules.mdc (revision 19394) @@ -87,4 +87,5 @@ PPIMAGE.OUT.MK.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK NONE CHIP TRUE SPLIT PPIMAGE.OUT.WT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT NONE CHIP TRUE SPLIT +PPIMAGE.CONFIG OUTPUT {OUTPUT}.{CHIP.NAME}.ppImage.mdc TEXT NONE CHIP TRUE NONE PPIMAGE.CHIP.MEF OUTPUT {OUTPUT}.ch.fits IMAGE NONE CHIP TRUE MEF @@ -144,12 +145,15 @@ PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE NONE +PSWARP.CONFIG OUTPUT {OUTPUT}.pswarp.mdc TEXT NONE FPA TRUE NONE PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK NONE FPA TRUE NONE PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE +PPSUB.CONFIG OUTPUT {OUTPUT}.ppSub.mdc TEXT NONE FPA TRUE NONE PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK NONE FPA TRUE NONE PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE +PPSTACK.CONFIG OUTPUT {OUTPUT}.ppStack.mdc TEXT NONE FPA TRUE NONE PPSTAMP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE Index: /trunk/ippconfig/recipes/filerules-mef.mdc =================================================================== --- /trunk/ippconfig/recipes/filerules-mef.mdc (revision 19393) +++ /trunk/ippconfig/recipes/filerules-mef.mdc (revision 19394) @@ -127,4 +127,5 @@ PPIMAGE.OUTPUT.DETMASK OUTPUT {OUTPUT}.fits IMAGE MASK CHIP TRUE MEF PPIMAGE.OUTPUT.RESID OUTPUT {OUTPUT}.b0.fits IMAGE COMP_SUB CHIP TRUE MEF +PPIMAGE.CONFIG OUTPUT {OUTPUT}.{CHIP.NAME}.ppImage.mdc TEXT NONE CHIP TRUE NONE PPIMAGE.CHIP.MEF OUTPUT {OUTPUT}.ch.fits IMAGE COMP_IMG CHIP TRUE MEF @@ -150,4 +151,5 @@ PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE MEF + ## note: these use the same output naming convention since they are used for different ppMerge runs PPMERGE.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK NONE CHIP TRUE NONE @@ -197,4 +199,5 @@ PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE COMP_IMG FPA TRUE NONE PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE COMP_IMG FPA TRUE NONE +PSWARP.CONFIG OUTPUT {OUTPUT}.pswarp.mdc TEXT NONE FPA TRUE NONE SKYCELL.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE @@ -205,4 +208,5 @@ PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_WT FPA TRUE NONE PPSUB.OUTPUT.KERNELS OUTPUT {OUTPUT}.subkernel SUBKERNEL NONE FPA TRUE NONE +PPSUB.CONFIG OUTPUT {OUTPUT}.ppSub.mdc TEXT NONE FPA TRUE NONE PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE @@ -210,4 +214,5 @@ PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_WT FPA TRUE NONE PPSTACK.TARGET.PSF OUTPUT {OUTPUT}.target.psf PSF NONE CHIP TRUE NONE +PPSTACK.CONFIG OUTPUT {OUTPUT}.ppStack.mdc TEXT NONE FPA TRUE NONE PPSTAMP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE Index: /trunk/ippconfig/recipes/filerules-simple.mdc =================================================================== --- /trunk/ippconfig/recipes/filerules-simple.mdc (revision 19393) +++ /trunk/ippconfig/recipes/filerules-simple.mdc (revision 19394) @@ -90,4 +90,5 @@ PPIMAGE.OUTPUT.DETMASK OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE PPIMAGE.OUTPUT.RESID OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE +PPIMAGE.CONFIG OUTPUT {OUTPUT}.ppImage.mdc TEXT NONE FPA TRUE NONE PPIMAGE.CHIP OUTPUT {OUTPUT}.ch.fits IMAGE NONE FPA TRUE SIMPLE @@ -105,4 +106,5 @@ PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE + ## note: these use the same output naming convention since they are used for different ppMerge runs @@ -150,4 +152,5 @@ PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE NONE +PSWARP.CONFIG OUTPUT {OUTPUT}.pswarp.mdc TEXT NONE FPA TRUE NONE SKYCELL.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE @@ -158,4 +161,5 @@ PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE PPSUB.OUTPUT.KERNELS OUTPUT {OUTPUT}.subkernel SUBKERNEL NONE FPA TRUE NONE +PPSUB.CONFIG OUTPUT {OUTPUT}.ppSub.mdc TEXT NONE FPA TRUE NONE PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE @@ -163,4 +167,5 @@ PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.weight.fits WEIGHT NONE FPA TRUE NONE PPSTACK.TARGET.PSF OUTPUT {OUTPUT}.target.psf PSF NONE CHIP TRUE NONE +PPSTACK.CONFIG OUTPUT {OUTPUT}.ppStack.mdc TEXT NONE FPA TRUE NONE PPSTAMP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMPLE Index: /trunk/ippconfig/recipes/filerules-split.mdc =================================================================== --- /trunk/ippconfig/recipes/filerules-split.mdc (revision 19393) +++ /trunk/ippconfig/recipes/filerules-split.mdc (revision 19394) @@ -93,4 +93,5 @@ PPIMAGE.OUTPUT.DETMASK OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE DET_MASK CHIP TRUE NONE PPIMAGE.OUTPUT.RESID OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE COMP_SUB CHIP TRUE NONE +PPIMAGE.CONFIG OUTPUT {OUTPUT}.{CHIP.NAME}.ppImage.mdc TEXT NONE CHIP TRUE NONE #PPIMAGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE NONE @@ -162,4 +163,5 @@ PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE NONE +PSWARP.CONFIG OUTPUT {OUTPUT}.pswarp.mdc TEXT NONE FPA TRUE NONE SKYCELL.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE @@ -170,4 +172,5 @@ PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_WT FPA TRUE NONE PPSUB.OUTPUT.KERNELS OUTPUT {OUTPUT}.subkernel SUBKERNEL NONE FPA TRUE NONE +PPSUB.CONFIG OUTPUT {OUTPUT}.ppSub.mdc TEXT NONE FPA TRUE NONE PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE @@ -175,5 +178,6 @@ PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_WT FPA TRUE NONE PPSTACK.TARGET.PSF OUTPUT {OUTPUT}.target.psf PSF NONE CHIP TRUE NONE - +PPSTACK.CONFIG OUTPUT {OUTPUT}.ppStack.mdc TEXT NONE FPA TRUE NONE + PPSTAMP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE PPSTAMP.CHIP OUTPUT {OUTPUT}.ch.fits IMAGE NONE CHIP FALSE MEF Index: /trunk/ippconfig/system.config =================================================================== --- /trunk/ippconfig/system.config (revision 19393) +++ /trunk/ippconfig/system.config (revision 19394) @@ -66,9 +66,2 @@ ADDSTAR STR recipes/addstar.config # addstar to dvodb END - -# File naming rules for configuration dumps -CONFIG.DUMP METADATA - FPA STR {OUTPUT}.{PROGRAM}.{TIMESTAMP}.mdc - CHIP STR {OUTPUT}.{CHIP.NAME}.{PROGRAM}.{TIMESTAMP}.mdc - CELL STR {OUTPUT}.{CHIP.NAME}.{CELL.NAME}.{PROGRAM}.{TIMESTAMP}.mdc -END