Index: /trunk/ippconfig/isp/camera.config =================================================================== --- /trunk/ippconfig/isp/camera.config (revision 9071) +++ /trunk/ippconfig/isp/camera.config (revision 9072) @@ -50,28 +50,28 @@ ### input file definitions - TYPE INPUT FILENAME.RULE FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.TYPE DATA.LEVEL - PPIMAGE.INPUT INPUT none.fits NONE NONE NONE IMAGE FPA + TYPE INPUT FILENAME.RULE FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.TYPE DATA.LEVEL + PPIMAGE.INPUT INPUT none.fits NONE NONE NONE IMAGE FPA - PPARITH.INPUT INPUT none.fits NONE NONE NONE IMAGE FPA + PPARITH.INPUT INPUT none.fits NONE NONE NONE IMAGE FPA - PPIMAGE.BIAS INPUT bias_isp_1_0.fit NONE NONE NONE IMAGE CHIP - PPIMAGE.DARK INPUT dark_isp_2_0.fit NONE NONE NONE IMAGE CHIP - PPIMAGE.FLAT INPUT flat_isp_3_0.fit NONE NONE NONE IMAGE CHIP - PPIMAGE.MASK INPUT mask.fits NONE NONE NONE IMAGE CHIP + PPIMAGE.BIAS INPUT ISP.bias.1.0.isp.fits NONE NONE NONE IMAGE CHIP + PPIMAGE.DARK INPUT ISP.dark.2.0.isp.fits NONE NONE NONE IMAGE CHIP + PPIMAGE.FLAT INPUT ISP.flat.3.0.isp.fits NONE NONE NONE IMAGE CHIP + PPIMAGE.MASK INPUT mask.fits NONE NONE NONE IMAGE CHIP - PSPHOT.INPUT INPUT none.fits NONE NONE NONE IMAGE CHIP + PSPHOT.INPUT INPUT none.fits NONE NONE NONE IMAGE CHIP - PSASTRO.INPUT.CMP INPUT none.fits NONE NONE PHU CMP CHIP - PSASTRO.INPUT.CMF INPUT none.fits NONE SMPDATA PHU CMF CHIP + PSASTRO.INPUT.CMP INPUT none.fits NONE NONE PHU CMP CHIP + PSASTRO.INPUT.CMF INPUT none.fits NONE SMPDATA PHU CMF CHIP ### output file definitions TYPE OUTPUT FILENAME.RULE FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.TYPE FILE.LEVEL DATA.LEVEL FILE.SAVE FILE.FORMAT - PPIMAGE.OUTPUT OUTPUT {OUTPUT}.isp.fit NONE NONE NONE IMAGE FPA FPA TRUE NONE - PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.ch.fit NONE NONE NONE IMAGE FPA FPA TRUE ISP - PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fit NONE NONE NONE IMAGE FPA FPA TRUE ISP - PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fit NONE NONE NONE IMAGE FPA FPA TRUE ISP + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.isp.fits NONE NONE NONE IMAGE FPA FPA TRUE NONE + PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.ch.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP - PPIMAGE.BIN1 OUTPUT {OUTPUT}.isp.b1.fit NONE NONE NONE IMAGE FPA FPA TRUE ISP - PPIMAGE.BIN2 OUTPUT {OUTPUT}.isp.b2.fit NONE NONE NONE IMAGE FPA FPA TRUE ISP + PPIMAGE.BIN1 OUTPUT {OUTPUT}.isp.b1.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP + PPIMAGE.BIN2 OUTPUT {OUTPUT}.isp.b2.fits NONE NONE NONE IMAGE FPA FPA TRUE ISP PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg -greyscale RANGE -5:20 JPEG FPA FPA TRUE ISP PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg -greyscale FRACTION 0.50:2.00 JPEG FPA FPA TRUE ISP Index: /trunk/ippconfig/mcshort/camera.config =================================================================== --- /trunk/ippconfig/mcshort/camera.config (revision 9071) +++ /trunk/ippconfig/mcshort/camera.config (revision 9072) @@ -122,7 +122,7 @@ ### use these entries to get the detrend images from specific files PPIMAGE.MASK INPUT mask.mef.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE - PPIMAGE.BIAS INPUT bias_{CHIP.NAME}_1_0.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE - PPIMAGE.DARK INPUT dark_{CHIP.NAME}_2_0.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE - PPIMAGE.FLAT INPUT flat_{CHIP.NAME}_3_0.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE + PPIMAGE.BIAS INPUT MegaCam.bias.1.0.{CHIP.NAME}.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE + PPIMAGE.DARK INPUT MegaCam.dark.2.0.{CHIP.NAME}.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE + PPIMAGE.FLAT INPUT MegaCam.flat.3.0.{CHIP.NAME}.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE ### use these entries to get the detrend images from the database @@ -139,11 +139,11 @@ ### 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}.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE NONE - PPIMAGE.BIN1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE MCSHORT_CHIP:MOSAIC - PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE MCSHORT_CHIP:MOSAIC + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE 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.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE MCSHORT_CHIP:MOSAIC - PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fit NONE NONE NONE FPA FPA IMAGE TRUE MCSHORT_FPA:MOSAIC - PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fit 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 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.JPEG1 OUTPUT {OUTPUT}.b1.jpg -greyscale RANGE -5:20 FPA FPA JPEG TRUE MCSHORT_FPA:MOSAIC Index: /trunk/ippconfig/mcshort_fpa/camera.config =================================================================== --- /trunk/ippconfig/mcshort_fpa/camera.config (revision 9071) +++ /trunk/ippconfig/mcshort_fpa/camera.config (revision 9072) @@ -73,6 +73,6 @@ PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE MOSAIC - PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fit NONE NONE NONE FPA FPA IMAGE TRUE MOSAIC - PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fit NONE NONE NONE FPA FPA IMAGE TRUE MOSAIC + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fit NONE NONE NONE FPA FPA IMAGE FALSE MOSAIC + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fit NONE NONE NONE FPA FPA IMAGE FALSE MOSAIC PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg -greyscale RANGE -5:20 FPA FPA JPEG TRUE NONE