Index: /trunk/ippconfig/ctio_mosaic2/camera.config =================================================================== --- /trunk/ippconfig/ctio_mosaic2/camera.config (revision 10884) +++ /trunk/ippconfig/ctio_mosaic2/camera.config (revision 10885) @@ -108,19 +108,19 @@ PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.fpa2.fits NONE NONE NONE FPA FPA IMAGE TRUE CTIO_MOSAIC2_FPA:MOSAIC - PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg -greyscale RANGE -5:10 FPA FPA JPEG TRUE CTIO_MOSAIC2_FPA:MOSAIC - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg -greyscale RANGE -5:10 FPA FPA JPEG TRUE CTIO_MOSAIC2_FPA:MOSAIC + 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 - PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE RAW - PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE RAW - PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE RAW - PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE RAW + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE RAW + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE RAW + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE RAW + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE RAW - PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} NONE NONE PHU CHIP CHIP RAW TRUE NONE - PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx NONE NONE PHU CHIP CHIP SX TRUE NONE - PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj NONE NONE PHU CHIP CHIP OBJ TRUE NONE - PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf NONE SMPDATA PHU CHIP CHIP CMF TRUE NONE - PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp NONE NONE PHU CHIP CHIP CMP TRUE NONE + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} NONE NONE PHU CHIP CHIP RAW TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx NONE NONE PHU CHIP CHIP SX TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj NONE NONE PHU CHIP CHIP OBJ TRUE NONE + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf NONE SMPDATA PHU CHIP CHIP CMF TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp NONE NONE PHU CHIP CHIP CMP TRUE NONE - PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp NONE NONE PHU CHIP CHIP CMP TRUE NONE + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp NONE NONE PHU CHIP CHIP CMP TRUE NONE END Index: /trunk/ippconfig/ctio_mosaic2/ppImage.config =================================================================== --- /trunk/ippconfig/ctio_mosaic2/ppImage.config (revision 10884) +++ /trunk/ippconfig/ctio_mosaic2/ppImage.config (revision 10885) @@ -108,2 +108,3 @@ FRINGE BOOL TRUE # Fringe subtraction END + Index: /trunk/ippconfig/ctio_mosaic2_chip/camera.config =================================================================== --- /trunk/ippconfig/ctio_mosaic2_chip/camera.config (revision 10884) +++ /trunk/ippconfig/ctio_mosaic2_chip/camera.config (revision 10885) @@ -108,6 +108,6 @@ PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits NONE NONE NONE FPA FPA IMAGE TRUE CTIO_MOSAIC2_FPA:MOSAIC - PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg -greyscale RANGE -5:20 FPA FPA JPEG TRUE CTIO_MOSAIC2_FPA:MOSAIC - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg -greyscale FRACTION 0.50:2.00 FPA FPA JPEG TRUE CTIO_MOSAIC2_FPA:MOSAIC + 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 PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE {CELL.NAME} {CELL.NAME} FPA CHIP IMAGE TRUE MOSAIC Index: /trunk/ippconfig/ctio_mosaic2_fpa/camera.config =================================================================== --- /trunk/ippconfig/ctio_mosaic2_fpa/camera.config (revision 10884) +++ /trunk/ippconfig/ctio_mosaic2_fpa/camera.config (revision 10885) @@ -100,6 +100,6 @@ PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits NONE NONE NONE FPA FPA IMAGE TRUE NONE - PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg -greyscale RANGE -5:20 FPA FPA JPEG TRUE NONE - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg -greyscale FRACTION 0.50:2.00 FPA FPA JPEG TRUE NONE + 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 Index: /trunk/ippconfig/isp/camera.config =================================================================== --- /trunk/ippconfig/isp/camera.config (revision 10884) +++ /trunk/ippconfig/isp/camera.config (revision 10885) @@ -111,4 +111,6 @@ 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.fits NONE NONE NONE IMAGE FPA FPA TRUE NONE + PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits NONE NONE NONE MASK FPA FPA FALSE NONE + PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits NONE NONE NONE WEIGHT FPA FPA FALSE 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 @@ -117,6 +119,6 @@ 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 + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg NONE NONE NONE JPEG FPA FPA TRUE ISP + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg NONE NONE NONE JPEG FPA FPA TRUE ISP PPARITH.OUTPUT OUTPUT {OUTPUT} NONE NONE NONE IMAGE FPA FPA TRUE NONE @@ -154,10 +156,6 @@ # extname.xtra: used to construct output EXTNAME keys (CMF HEAD) -# extname.rule: used to carry classID to DetDB +# extname.rule: used to carry classID to DetDB (internal) # filename.xtra: used to carry detID to DetDB (internal) # filename.xtra: used to carry arglist name (internal) - -# filename.xtra: used to define the JPEG colormap -# extname.rule: used to define the JPEG scaling method -# extname.xtra: used to carry arguments of JPEG scaling method Index: /trunk/ippconfig/mcshort/camera.config =================================================================== --- /trunk/ippconfig/mcshort/camera.config (revision 10884) +++ /trunk/ippconfig/mcshort/camera.config (revision 10885) @@ -188,6 +188,6 @@ 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 - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg -greyscale FRACTION 0.50:2.00 FPA FPA JPEG TRUE MCSHORT_FPA:MOSAIC + 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 PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICE Index: /trunk/ippconfig/mcshort_chip/camera.config =================================================================== --- /trunk/ippconfig/mcshort_chip/camera.config (revision 10884) +++ /trunk/ippconfig/mcshort_chip/camera.config (revision 10885) @@ -149,6 +149,6 @@ PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fit 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 - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg -greyscale FRACTION 0.50:2.00 FPA FPA JPEG TRUE MCSHORT_FPA:MOSAIC + 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 PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICE Index: /trunk/ippconfig/mcshort_fpa/camera.config =================================================================== --- /trunk/ippconfig/mcshort_fpa/camera.config (revision 10884) +++ /trunk/ippconfig/mcshort_fpa/camera.config (revision 10885) @@ -85,6 +85,6 @@ 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 - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg -greyscale FRACTION 0.50:2.00 FPA FPA JPEG TRUE NONE + 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 Index: /trunk/ippconfig/megacam/camera.config =================================================================== --- /trunk/ippconfig/megacam/camera.config (revision 10884) +++ /trunk/ippconfig/megacam/camera.config (revision 10885) @@ -176,19 +176,19 @@ PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits NONE NONE NONE FPA FPA IMAGE TRUE MEGACAM_FPA:MOSAIC - PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg -greyscale RANGE -5:20 FPA FPA JPEG TRUE MEGACAM_FPA:MOSAIC - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg -greyscale FRACTION 0.50:2.00 FPA FPA JPEG TRUE MEGACAM_FPA:MOSAIC + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg NONE NONE NONE FPA FPA JPEG TRUE MEGACAM_FPA:MOSAIC + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg NONE NONE NONE FPA FPA JPEG TRUE MEGACAM_FPA:MOSAIC - 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 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.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} NONE NONE PHU CHIP CHIP RAW TRUE NONE - PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx NONE NONE PHU CHIP CHIP SX TRUE NONE - PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj NONE NONE PHU CHIP CHIP OBJ TRUE NONE - PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf NONE SMPDATA PHU CHIP CHIP CMF TRUE NONE - PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp NONE NONE PHU CHIP CHIP CMP TRUE NONE + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} NONE NONE PHU CHIP CHIP RAW TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx NONE NONE PHU CHIP CHIP SX TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj NONE NONE PHU CHIP CHIP OBJ TRUE NONE + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf NONE SMPDATA PHU CHIP CHIP CMF TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp NONE NONE PHU CHIP CHIP CMP TRUE NONE - PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp NONE NONE PHU CHIP CHIP CMP TRUE NONE + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp NONE NONE PHU CHIP CHIP CMP TRUE NONE # split version of mosaiced-chip output: Index: /trunk/ippconfig/megacam_alternate/camera.config =================================================================== --- /trunk/ippconfig/megacam_alternate/camera.config (revision 10884) +++ /trunk/ippconfig/megacam_alternate/camera.config (revision 10885) @@ -50,6 +50,6 @@ PPIMAGE.BIN1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE MEGACAM_CHIP:MOSAIC PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE MEGACAM_CHIP:MOSAIC - PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg -greyscale RANGE -5:20 FPA FPA JPEG TRUE MEGACAM_FPA:MOSAIC - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg -greyscale FRACTION 0.50:2.00 FPA FPA JPEG TRUE MEGACAM_FPA:MOSAIC + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg NONE NONE NONE FPA FPA JPEG TRUE MEGACAM_FPA:MOSAIC + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg NONE NONE NONE FPA FPA JPEG TRUE MEGACAM_FPA:MOSAIC PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE {CELL.NAME} {CELL.NAME} FPA FPA IMAGE TRUE SIMPLE Index: /trunk/ippconfig/megacam_chipmosaic/camera.config =================================================================== --- /trunk/ippconfig/megacam_chipmosaic/camera.config (revision 10884) +++ /trunk/ippconfig/megacam_chipmosaic/camera.config (revision 10885) @@ -133,6 +133,6 @@ PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits NONE NONE NONE FPA FPA IMAGE TRUE MEGACAM_FPA:MOSAIC - PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg -greyscale RANGE -5:20 FPA FPA JPEG TRUE MEGACAM_FPA:MOSAIC - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg -greyscale FRACTION 0.50:2.00 FPA FPA JPEG TRUE MEGACAM_FPA:MOSAIC + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg NONE NONE NONE FPA FPA JPEG TRUE MEGACAM_FPA:MOSAIC + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg NONE NONE NONE FPA FPA JPEG TRUE MEGACAM_FPA:MOSAIC PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICE Index: /trunk/ippconfig/megacam_detrended/camera.config =================================================================== --- /trunk/ippconfig/megacam_detrended/camera.config (revision 10884) +++ /trunk/ippconfig/megacam_detrended/camera.config (revision 10885) @@ -76,6 +76,6 @@ PPIMAGE.BIN1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fit NONE NONE NONE CHIP CHIP IMAGE TRUE SPLIT PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fit NONE NONE NONE CHIP CHIP IMAGE TRUE SPLIT - PPIMAGE.JPEG1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.jpg -greyscale RANGE -5:20 FPA CHIP JPEG TRUE SPLIT - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.jpg -greyscale FRACTION 0.50:2.00 FPA CHIP JPEG TRUE SPLIT + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.jpg NONE NONE NONE FPA CHIP JPEG TRUE SPLIT + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.jpg NONE NONE NONE FPA CHIP JPEG TRUE SPLIT PSPHOT.RESID OUTPUT {OUTPUT}.res.fits {CHIP.NAME} {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICED @@ -91,5 +91,5 @@ PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.xmp NONE NONE PHU FPA CHIP CMP TRUE NONE - PSASTRO.OUTPUT.CMF OUTPUT {OUTPUT}.xmp NONE {CHIP.NAME}.hdr {CHIP.NAME}.cmf FPA CHIP CMF TRUE NONE + PSASTRO.OUTPUT.CMF OUTPUT {OUTPUT}.xmp NONE {CHIP.NAME}.hdr {CHIP.NAME}.cmf FPA CHIP CMF TRUE NONE END Index: /trunk/ippconfig/megacam_fpamosaic/camera.config =================================================================== --- /trunk/ippconfig/megacam_fpamosaic/camera.config (revision 10884) +++ /trunk/ippconfig/megacam_fpamosaic/camera.config (revision 10885) @@ -68,6 +68,6 @@ 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 - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg -greyscale FRACTION 0.50:2.00 FPA FPA JPEG TRUE NONE + 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 Index: /trunk/ippconfig/recipes/ppImage.config =================================================================== --- /trunk/ippconfig/recipes/ppImage.config (revision 10884) +++ /trunk/ippconfig/recipes/ppImage.config (revision 10885) @@ -50,4 +50,18 @@ BIN2.YBIN S32 16 +PPIMAGE.JPEG1 METADATA + COLORMAP STR -greyscale + SCALE.MODE STR RANGE + SCALE.MIN F32 -5.0 + SCALE.MAX F32 20.0 +END + +PPIMAGE.JPEG2 METADATA + COLORMAP STR +greyscale + SCALE.MODE STR FRACTION + SCALE.MIN STR 0.50 + SCALE.MAX STR 2.00 +END + PHOTCODE.RULE STR {CAMERA}.{FILTER.ID}.{CHIP.N} Index: /trunk/ippconfig/simple/camera.config =================================================================== --- /trunk/ippconfig/simple/camera.config (revision 10884) +++ /trunk/ippconfig/simple/camera.config (revision 10885) @@ -83,6 +83,6 @@ PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fit NONE NONE NONE IMAGE FPA FPA TRUE SIMPLE - PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg -greyscale RANGE -5:20 JPEG FPA FPA TRUE SIMPLE - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg -greyscale FRACTION 0.50:2.00 JPEG FPA FPA TRUE SIMPLE + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg NONE NONE NONE JPEG FPA FPA TRUE SIMPLE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg NONE NONE NONE JPEG FPA FPA TRUE SIMPLE PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1.fit NONE NONE NONE IMAGE FPA FPA TRUE SIMPLE PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2.fit NONE NONE NONE IMAGE FPA FPA TRUE SIMPLE Index: /trunk/ippconfig/ucam/camera.config =================================================================== --- /trunk/ippconfig/ucam/camera.config (revision 10884) +++ /trunk/ippconfig/ucam/camera.config (revision 10885) @@ -108,6 +108,6 @@ PPIMAGE.BIN1.OUTPUT OUTPUT {OUTPUT}.b1.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP FPA IMAGE TRUE UCAM_MOSAIC:MOSAIC PPIMAGE.BIN2.OUTPUT OUTPUT {OUTPUT}.b2.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP FPA IMAGE TRUE UCAM_MOSAIC:MOSAIC - PPIMAGE.JPEG1.OUTPUT OUTPUT {OUTPUT}.b1.jpg -greyscale RANGE -5:20 FPA FPA JPEG TRUE UCAM_MOSAIC:MOSAIC - PPIMAGE.JPEG2.OUTPUT OUTPUT {OUTPUT}.b2.jpg -greyscale FRACTION 0.50:2.00 FPA FPA JPEG TRUE UCAM_MOSAIC:MOSAIC + PPIMAGE.JPEG1.OUTPUT OUTPUT {OUTPUT}.b1.jpg NONE NONE NONE FPA FPA JPEG TRUE UCAM_MOSAIC:MOSAIC + PPIMAGE.JPEG2.OUTPUT OUTPUT {OUTPUT}.b2.jpg NONE NONE NONE FPA FPA JPEG TRUE UCAM_MOSAIC:MOSAIC PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICE Index: /trunk/ippconfig/ucam_mosaic/camera.config =================================================================== --- /trunk/ippconfig/ucam_mosaic/camera.config (revision 10884) +++ /trunk/ippconfig/ucam_mosaic/camera.config (revision 10885) @@ -108,6 +108,6 @@ PPIMAGE.BIN1.OUTPUT OUTPUT {OUTPUT}.b1.fit NONE NONE NONE CHIP FPA IMAGE TRUE UCAM_MOSAIC:MOSAIC PPIMAGE.BIN2.OUTPUT OUTPUT {OUTPUT}.b2.fit NONE NONE NONE CHIP FPA IMAGE TRUE UCAM_MOSAIC:MOSAIC - PPIMAGE.JPEG1.OUTPUT OUTPUT {OUTPUT}.b1.jpg -greyscale RANGE -5:20 FPA FPA JPEG TRUE NONE - PPIMAGE.JPEG2.OUTPUT OUTPUT {OUTPUT}.b2.jpg -greyscale FRACTION 0.50:2.00 FPA FPA JPEG TRUE NONE + PPIMAGE.JPEG1.OUTPUT OUTPUT {OUTPUT}.b1.jpg NONE NONE NONE FPA FPA JPEG TRUE NONE + PPIMAGE.JPEG2.OUTPUT 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