Index: /branches/pap_branch_080320/ippconfig/cfh12k/filerules-mef.mdc =================================================================== --- /branches/pap_branch_080320/ippconfig/cfh12k/filerules-mef.mdc (revision 17158) +++ /branches/pap_branch_080320/ippconfig/cfh12k/filerules-mef.mdc (revision 17159) @@ -39,4 +39,9 @@ PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE PPIMAGE.SHUTTER INPUT @DETDB CHIP IMAGE + +## Files used by ppMerge +PPMERGE.INPUT INPUT @FILES CHIP IMAGE +PPMERGE.INPUT.MASK INPUT @FILES CHIP MASK +PPMERGE.INPUT.WEIGHT INPUT @FILES CHIP WEIGHT ## files used to build and apply the flat-field correction images @@ -114,5 +119,12 @@ PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE -PPMERGE.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE MEF +PPMERGE.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK NONE CHIP TRUE NONE +PPMERGE.OUTPUT.BIAS OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE +PPMERGE.OUTPUT.DARK OUTPUT {OUTPUT}.fits DARK NONE CHIP TRUE NONE +PPMERGE.OUTPUT.SHUTTER OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE +PPMERGE.OUTPUT.FLAT OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE +PPMERGE.OUTPUT.FRINGE OUTPUT {OUTPUT}.fits FRINGE NONE CHIP TRUE NONE +PPMERGE.OUTPUT.SIGMA OUTPUT {OUTPUT}.sigma.fits IMAGE NONE CHIP TRUE NONE +PPMERGE.OUTPUT.COUNT OUTPUT {OUTPUT}.count.fits IMAGE NONE CHIP TRUE NONE DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE NONE CHIP TRUE MEF Index: /branches/pap_branch_080320/ippconfig/ctio_mosaic2/camera.config =================================================================== --- /branches/pap_branch_080320/ippconfig/ctio_mosaic2/camera.config (revision 17158) +++ /branches/pap_branch_080320/ippconfig/ctio_mosaic2/camera.config (revision 17159) @@ -258,4 +258,9 @@ PPIMAGE.SHUTTER INPUT @DETDB CHIP IMAGE + ## Files used by ppMerge + PPMERGE.INPUT INPUT @FILES CHIP IMAGE + PPMERGE.INPUT.MASK INPUT @FILES CHIP MASK + PPMERGE.INPUT.WEIGHT INPUT @FILES CHIP WEIGHT + ## files used to build and apply the flat-field correction images DVOCORR.INPUT INPUT @FILES CHIP IMAGE @@ -298,6 +303,6 @@ PPSTAMP.INPUT INPUT @FILES CHIP IMAGE - PPARITH.INPUT.IMAGE INPUT @FILES CHIP IMAGE - PPARITH.INPUT.MASK INPUT @FILES CHIP MASK + PPARITH.INPUT.IMAGE INPUT @FILES CHIP IMAGE + PPARITH.INPUT.MASK INPUT @FILES CHIP MASK ### output file definitions @@ -329,5 +334,12 @@ PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE - PPMERGE.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE MEF + PPMERGE.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK NONE CHIP TRUE NONE + PPMERGE.OUTPUT.BIAS OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE + PPMERGE.OUTPUT.DARK OUTPUT {OUTPUT}.fits DARK NONE CHIP TRUE NONE + PPMERGE.OUTPUT.SHUTTER OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE + PPMERGE.OUTPUT.FLAT OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE + PPMERGE.OUTPUT.FRINGE OUTPUT {OUTPUT}.fits FRINGE NONE CHIP TRUE NONE + PPMERGE.OUTPUT.SIGMA OUTPUT {OUTPUT}.sigma.fits IMAGE NONE CHIP TRUE NONE + PPMERGE.OUTPUT.COUNT OUTPUT {OUTPUT}.count.fits IMAGE NONE CHIP TRUE NONE DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE NONE CHIP TRUE MEF @@ -380,6 +392,6 @@ PPSIM.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE SPLIT - PPARITH.OUTPUT.IMAGE OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE - PPARITH.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK NONE CHIP TRUE NONE + PPARITH.OUTPUT.IMAGE OUTPUT {OUTPUT}.fits IMAGE COMP_POS CHIP TRUE NONE + PPARITH.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK COMP_MASK CHIP TRUE NONE LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT NONE CHIP TRUE NONE Index: /branches/pap_branch_080320/ippconfig/esowfi/filerules-mef.mdc =================================================================== --- /branches/pap_branch_080320/ippconfig/esowfi/filerules-mef.mdc (revision 17158) +++ /branches/pap_branch_080320/ippconfig/esowfi/filerules-mef.mdc (revision 17159) @@ -19,4 +19,9 @@ PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE PPIMAGE.SHUTTER INPUT @DETDB CHIP IMAGE + +## Files used by ppMerge +PPMERGE.INPUT INPUT @FILES CHIP IMAGE +PPMERGE.INPUT.MASK INPUT @FILES CHIP MASK +PPMERGE.INPUT.WEIGHT INPUT @FILES CHIP WEIGHT ## files used to build and apply the flat field correction images @@ -76,5 +81,12 @@ PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE CHIP TRUE SPLIT -PPMERGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE FPA TRUE NONE +PPMERGE.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK CHIP TRUE NONE +PPMERGE.OUTPUT.BIAS OUTPUT {OUTPUT}.fits IMAGE CHIP TRUE NONE +PPMERGE.OUTPUT.DARK OUTPUT {OUTPUT}.fits DARK CHIP TRUE NONE +PPMERGE.OUTPUT.SHUTTER OUTPUT {OUTPUT}.fits IMAGE CHIP TRUE NONE +PPMERGE.OUTPUT.FLAT OUTPUT {OUTPUT}.fits IMAGE CHIP TRUE NONE +PPMERGE.OUTPUT.FRINGE OUTPUT {OUTPUT}.fits FRINGE CHIP TRUE NONE +PPMERGE.OUTPUT.SIGMA OUTPUT {OUTPUT}.sigma.fits IMAGE CHIP TRUE NONE +PPMERGE.OUTPUT.COUNT OUTPUT {OUTPUT}.count.fits IMAGE CHIP TRUE NONE DVOCORR.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE CHIP TRUE SPLIT Index: /branches/pap_branch_080320/ippconfig/gpc1/filerules.mdc =================================================================== --- /branches/pap_branch_080320/ippconfig/gpc1/filerules.mdc (revision 17158) +++ /branches/pap_branch_080320/ippconfig/gpc1/filerules.mdc (revision 17159) @@ -16,4 +16,9 @@ PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE PPIMAGE.MASK INPUT @DETDB CHIP MASK + +## Files used by ppMerge +PPMERGE.INPUT INPUT @FILES CHIP IMAGE +PPMERGE.INPUT.MASK INPUT @FILES CHIP MASK +PPMERGE.INPUT.WEIGHT INPUT @FILES CHIP WEIGHT ## files used by psphot @@ -77,5 +82,12 @@ PPIMAGE.STATS OUTPUT {OUTPUT}.{CHIP.NAME}.stats STATS NONE CHIP TRUE NONE -PPMERGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE NONE +PPMERGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.fits MASK NONE CHIP TRUE NONE +PPMERGE.OUTPUT.BIAS OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE NONE +PPMERGE.OUTPUT.DARK OUTPUT {OUTPUT}.{CHIP.NAME}.fits DARK NONE CHIP TRUE NONE +PPMERGE.OUTPUT.SHUTTER OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE NONE +PPMERGE.OUTPUT.FLAT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE NONE +PPMERGE.OUTPUT.FRINGE OUTPUT {OUTPUT}.{CHIP.NAME}.fits FRINGE NONE CHIP TRUE NONE +PPMERGE.OUTPUT.SIGMA OUTPUT {OUTPUT}.sigma.fits IMAGE NONE CHIP TRUE NONE +PPMERGE.OUTPUT.COUNT OUTPUT {OUTPUT}.count.fits IMAGE NONE CHIP TRUE NONE DVOCORR.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE NONE CHIP TRUE NONE Index: /branches/pap_branch_080320/ippconfig/isp/camera.config =================================================================== --- /branches/pap_branch_080320/ippconfig/isp/camera.config (revision 17158) +++ /branches/pap_branch_080320/ippconfig/isp/camera.config (revision 17159) @@ -214,4 +214,9 @@ PPIMAGE.SHUTTER INPUT @DETDB FPA IMAGE + ## Files used by ppMerge + PPMERGE.INPUT INPUT @FILES CHIP IMAGE + PPMERGE.INPUT.MASK INPUT @FILES CHIP MASK + PPMERGE.INPUT.WEIGHT INPUT @FILES CHIP WEIGHT + ## files used to build and apply the flat-field correction images DVOCORR.INPUT INPUT @FILES FPA IMAGE @@ -259,5 +264,12 @@ PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE - PPMERGE.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE + PPMERGE.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK NONE CHIP TRUE NONE + PPMERGE.OUTPUT.BIAS OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE + PPMERGE.OUTPUT.DARK OUTPUT {OUTPUT}.fits DARK NONE CHIP TRUE NONE + PPMERGE.OUTPUT.SHUTTER OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE + PPMERGE.OUTPUT.FLAT OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE + PPMERGE.OUTPUT.FRINGE OUTPUT {OUTPUT}.fits FRINGE NONE CHIP TRUE NONE + PPMERGE.OUTPUT.SIGMA OUTPUT {OUTPUT}.sigma.fits IMAGE NONE CHIP TRUE NONE + PPMERGE.OUTPUT.COUNT OUTPUT {OUTPUT}.count.fits IMAGE NONE CHIP TRUE NONE DVOCORR.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE NONE FPA TRUE NONE Index: /branches/pap_branch_080320/ippconfig/megacam/filerules-mef.mdc =================================================================== --- /branches/pap_branch_080320/ippconfig/megacam/filerules-mef.mdc (revision 17158) +++ /branches/pap_branch_080320/ippconfig/megacam/filerules-mef.mdc (revision 17159) @@ -40,4 +40,9 @@ PPIMAGE.SHUTTER INPUT @DETDB CHIP IMAGE +## Files used by ppMerge +PPMERGE.INPUT INPUT @FILES CHIP IMAGE +PPMERGE.INPUT.MASK INPUT @FILES CHIP MASK +PPMERGE.INPUT.WEIGHT INPUT @FILES CHIP WEIGHT + ## files used to build and apply the flat-field correction images DVOCORR.INPUT INPUT @FILES CHIP IMAGE @@ -78,4 +83,5 @@ PPSTACK.INPUT.MASK INPUT @FILES FPA MASK PPSTACK.INPUT.WEIGHT INPUT @FILES FPA WEIGHT +PPSTACK.INPUT.PSF INPUT @FILES CHIP PSF PPSTACK.SOURCES INPUT @FILES FPA CMF @@ -87,20 +93,20 @@ ### output file definitions TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT -PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.b0.fits IMAGE COMP_IMG CHIP TRUE MEF -PPIMAGE.OUT.MK.MEF OUTPUT {OUTPUT}.mk.fits MASK COMP_MASK CHIP TRUE MEF -PPIMAGE.OUT.WT.MEF OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_WT CHIP TRUE MEF +PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.b0.fits IMAGE NONE CHIP TRUE MEF +PPIMAGE.OUT.MK.MEF OUTPUT {OUTPUT}.mk.fits MASK NONE CHIP TRUE MEF +PPIMAGE.OUT.WT.MEF OUTPUT {OUTPUT}.wt.fits WEIGHT NONE CHIP TRUE MEF PPIMAGE.OUTPUT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b0.fits IMAGE NONE CHIP TRUE SPLIT 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.CHIP.MEF OUTPUT {OUTPUT}.ch.fits IMAGE COMP_IMG CHIP TRUE MEF -PPIMAGE.CHIP.MK.MEF OUTPUT {OUTPUT}.ch.mk.fits MASK COMP_MASK CHIP TRUE MEF -PPIMAGE.CHIP.WT.MEF OUTPUT {OUTPUT}.ch.wt.fits WEIGHT COMP_WT CHIP TRUE MEF +PPIMAGE.CHIP.MEF OUTPUT {OUTPUT}.ch.fits IMAGE NONE CHIP TRUE MEF +PPIMAGE.CHIP.MK.MEF OUTPUT {OUTPUT}.ch.mk.fits MASK NONE CHIP TRUE MEF +PPIMAGE.CHIP.WT.MEF OUTPUT {OUTPUT}.ch.wt.fits WEIGHT NONE CHIP TRUE MEF PPIMAGE.CHIP.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE NONE CHIP TRUE SPLIT PPIMAGE.CHIP.MK.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.ch.mk.fits MASK NONE CHIP TRUE SPLIT PPIMAGE.CHIP.WT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.ch.wt.fits WEIGHT NONE CHIP TRUE SPLIT -PPIMAGE.OUTPUT.FPA1.MEF OUTPUT {OUTPUT}.b1.fits IMAGE COMP_IMG FPA TRUE MEF -PPIMAGE.OUTPUT.FPA2.MEF OUTPUT {OUTPUT}.b2.fits IMAGE COMP_IMG FPA TRUE MEF +PPIMAGE.OUTPUT.FPA1.MEF OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE MEF +PPIMAGE.OUTPUT.FPA2.MEF OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE MEF PPIMAGE.OUTPUT.FPA1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE NONE FPA TRUE SPLIT PPIMAGE.OUTPUT.FPA2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE NONE FPA TRUE SPLIT @@ -116,5 +122,12 @@ PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE -PPMERGE.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE MEF +PPMERGE.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK NONE CHIP TRUE NONE +PPMERGE.OUTPUT.BIAS OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE +PPMERGE.OUTPUT.DARK OUTPUT {OUTPUT}.fits DARK NONE CHIP TRUE NONE +PPMERGE.OUTPUT.SHUTTER OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE +PPMERGE.OUTPUT.FLAT OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE +PPMERGE.OUTPUT.FRINGE OUTPUT {OUTPUT}.fits FRINGE NONE CHIP TRUE NONE +PPMERGE.OUTPUT.SIGMA OUTPUT {OUTPUT}.sigma.fits IMAGE NONE CHIP TRUE NONE +PPMERGE.OUTPUT.COUNT OUTPUT {OUTPUT}.count.fits IMAGE NONE CHIP TRUE NONE DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE NONE CHIP TRUE MEF @@ -147,21 +160,21 @@ PSASTRO.OUT.REFSTARS OUTPUT {OUTPUT}.aref.fits ASTROM.REFSTARS NONE FPA TRUE NONE -PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE -PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK COMP_MASK FPA TRUE NONE -PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_WT FPA TRUE NONE -PSWARP.OUTPUT.SOURCES OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE -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.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE +PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK NONE FPA TRUE NONE +PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE +PSWARP.OUTPUT.SOURCES OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE +PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE +PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE NONE SKYCELL.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE SKYCELL.TEMPLATE OUTPUT {OUTPUT}.skycell SKYCELL NONE FPA TRUE NONE -PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE -PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK COMP_MASK FPA TRUE NONE -PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_WT 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 -PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE -PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK COMP_MASK FPA TRUE NONE -PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_WT 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 PPSTAMP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE Index: /branches/pap_branch_080320/ippconfig/megacam/ppMerge.config =================================================================== --- /branches/pap_branch_080320/ippconfig/megacam/ppMerge.config (revision 17158) +++ /branches/pap_branch_080320/ippconfig/megacam/ppMerge.config (revision 17159) @@ -28,5 +28,5 @@ FRACLOW F32 0.1 # Fraction of low pixels to reject immediately NKEEP S32 5 # Minimum number of pixels in stack to keep - WEIGHTS BOOL TRUE # Use image weights? + WEIGHTS BOOL FALSE # Use image weights? COMBINE STR MEAN # Statistic to use for combination: END Index: /branches/pap_branch_080320/ippconfig/recipes/ppMerge.config =================================================================== --- /branches/pap_branch_080320/ippconfig/recipes/ppMerge.config (revision 17158) +++ /branches/pap_branch_080320/ippconfig/recipes/ppMerge.config (revision 17159) @@ -15,6 +15,4 @@ FRINGE.YSMOOTH S32 11 # Number of smoothing regions in y SHUTTER.SIZE S32 128 # Size for shutter measurement regions -SHUTTER.ITER S32 1 # Number of iterations for shutter measurement -SHUTTER.REJECT F32 2 # Rejection limit for shutter measurement MASK.SUSPECT F32 5.0 # Threshold for suspect pixels (sigma) MASK.BAD F32 0.2 # Threshold for bad pixels @@ -93,3 +91,5 @@ # Shutter generation --- already included in default, above PPMERGE_SHUTTER METADATA + REJ F32 2.0 # Rejection threshold (sigma) + ITER S32 1 # Number of rejection iterations END Index: /branches/pap_branch_080320/ippconfig/simmosaic/camera.config =================================================================== --- /branches/pap_branch_080320/ippconfig/simmosaic/camera.config (revision 17158) +++ /branches/pap_branch_080320/ippconfig/simmosaic/camera.config (revision 17159) @@ -236,4 +236,9 @@ PPIMAGE.SHUTTER INPUT @DETDB CELL IMAGE + ## Files used by ppMerge + PPMERGE.INPUT INPUT @FILES CHIP IMAGE + PPMERGE.INPUT.MASK INPUT @FILES CHIP MASK + PPMERGE.INPUT.WEIGHT INPUT @FILES CHIP WEIGHT + ## files used to build and apply the flat-field correction images DVOCORR.INPUT INPUT @FILES CHIP IMAGE @@ -294,5 +299,12 @@ PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE NONE CHIP TRUE SPLIT - PPMERGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE NONE + PPMERGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.fits MASK NONE CHIP TRUE SPLIT + PPMERGE.OUTPUT.BIAS OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE SPLIT + PPMERGE.OUTPUT.DARK OUTPUT {OUTPUT}.{CHIP.NAME}.fits DARK NONE CHIP TRUE SPLIT + PPMERGE.OUTPUT.SHUTTER OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE SPLIT + PPMERGE.OUTPUT.FLAT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE SPLIT + PPMERGE.OUTPUT.FRINGE OUTPUT {OUTPUT}.{CHIP.NAME}.fits FRINGE NONE CHIP TRUE SPLIT + PPMERGE.OUTPUT.SIGMA OUTPUT {OUTPUT}.sigma.fits IMAGE NONE CHIP TRUE NONE + PPMERGE.OUTPUT.COUNT OUTPUT {OUTPUT}.count.fits IMAGE NONE CHIP TRUE NONE DVOCORR.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE NONE CHIP TRUE NONE Index: /branches/pap_branch_080320/ippconfig/simtest/filerules.mdc =================================================================== --- /branches/pap_branch_080320/ippconfig/simtest/filerules.mdc (revision 17158) +++ /branches/pap_branch_080320/ippconfig/simtest/filerules.mdc (revision 17159) @@ -19,4 +19,9 @@ PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE PPIMAGE.MASK INPUT @DETDB CHIP IMAGE + +## Files used by ppMerge +PPMERGE.INPUT INPUT @FILES CHIP IMAGE +PPMERGE.INPUT.MASK INPUT @FILES CHIP MASK +PPMERGE.INPUT.WEIGHT INPUT @FILES CHIP WEIGHT ## files used by psphot @@ -68,5 +73,12 @@ PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE NONE -PPMERGE.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE +PPMERGE.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK NONE CHIP TRUE NONE +PPMERGE.OUTPUT.BIAS OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE +PPMERGE.OUTPUT.DARK OUTPUT {OUTPUT}.fits DARK NONE CHIP TRUE NONE +PPMERGE.OUTPUT.SHUTTER OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE +PPMERGE.OUTPUT.FLAT OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE +PPMERGE.OUTPUT.FRINGE OUTPUT {OUTPUT}.fits FRINGE NONE CHIP TRUE NONE +PPMERGE.OUTPUT.SIGMA OUTPUT {OUTPUT}.sigma.fits IMAGE NONE CHIP TRUE NONE +PPMERGE.OUTPUT.COUNT OUTPUT {OUTPUT}.count.fits IMAGE NONE CHIP TRUE NONE DVOCORR.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE NONE FPA TRUE NONE