Index: /trunk/ippconfig/ctio_mosaic2/camera.config =================================================================== --- /trunk/ippconfig/ctio_mosaic2/camera.config (revision 11368) +++ /trunk/ippconfig/ctio_mosaic2/camera.config (revision 11369) @@ -101,13 +101,13 @@ PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CELL MASK FALSE NONE PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CELL WEIGHT FALSE NONE - PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE CTIO_MOSAIC2_CHIP:MOSAIC - PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE CTIO_MOSAIC2_CHIP:MOSAIC + PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE NONE + PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE NONE - PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.chip.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE CTIO_MOSAIC2_CHIP:MOSAIC - PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.fpa1.fits NONE NONE NONE FPA FPA IMAGE TRUE CTIO_MOSAIC2_FPA:MOSAIC - PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.fpa2.fits NONE NONE NONE FPA FPA IMAGE TRUE CTIO_MOSAIC2_FPA:MOSAIC + PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.chip.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE NONE + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.fpa1.fits NONE NONE NONE FPA FPA IMAGE TRUE NONE + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.fpa2.fits NONE NONE NONE FPA FPA IMAGE TRUE NONE - PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg NONE NONE NONE FPA FPA JPEG TRUE CTIO_MOSAIC2_FPA:MOSAIC - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg NONE NONE NONE FPA FPA JPEG TRUE CTIO_MOSAIC2_FPA:MOSAIC + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg NONE NONE NONE FPA FPA JPEG TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg NONE NONE NONE FPA FPA JPEG TRUE NONE PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE RAW Index: /trunk/ippconfig/mcshort/camera.config =================================================================== --- /trunk/ippconfig/mcshort/camera.config (revision 11368) +++ /trunk/ippconfig/mcshort/camera.config (revision 11369) @@ -5,5 +5,5 @@ FORMATS METADATA RAW STR mcshort/format_raw.config - SPLICE STR mcshort/format_spliced.config + SPLICED STR mcshort/format_spliced.config SPLIT STR mcshort/format_split.config END @@ -159,21 +159,22 @@ ### output file definitions TYPE OUTPUT FILENAME.RULE FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.LEVEL DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT - PPIMAGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE NONE +# PPIMAGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE NONE + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE SPLICED PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mask.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP MASK FALSE NONE PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP WEIGHT FALSE NONE - PPIMAGE.BIN1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE MCSHORT_CHIP:MOSAIC - PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE MCSHORT_CHIP:MOSAIC + PPIMAGE.BIN1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE NONE + PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE NONE - PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE MCSHORT_CHIP:MOSAIC - PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits NONE NONE NONE FPA FPA IMAGE TRUE MCSHORT_FPA:MOSAIC - PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits NONE NONE NONE FPA FPA IMAGE TRUE MCSHORT_FPA:MOSAIC + PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE NONE + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits NONE NONE NONE FPA FPA IMAGE TRUE NONE + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits NONE NONE NONE FPA FPA IMAGE TRUE NONE - PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg NONE NONE NONE FPA FPA JPEG TRUE MCSHORT_FPA:MOSAIC - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg NONE NONE NONE FPA FPA JPEG TRUE MCSHORT_FPA:MOSAIC + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg NONE NONE NONE FPA FPA JPEG TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg NONE NONE NONE FPA FPA JPEG TRUE NONE - PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICE - PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICE - PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICE - PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICE + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICED + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICED + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICED + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICED PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} NONE NONE PHU CHIP CHIP RAW TRUE NONE