Index: /trunk/ippconfig/megacam/camera.config =================================================================== --- /trunk/ippconfig/megacam/camera.config (revision 7639) +++ /trunk/ippconfig/megacam/camera.config (revision 7640) @@ -72,13 +72,13 @@ ### 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.mef.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE + PPIMAGE.BIAS INPUT bias.mef.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE PPIMAGE.DARK INPUT dark.mef.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE - #PPIMAGE.FLAT INPUT flat.mef.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE + PPIMAGE.FLAT INPUT flat.mef.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE ### use these entries to get the detrend images from the database #PPIMAGE.MASK INPUT @DETDB {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE - PPIMAGE.BIAS INPUT @DETDB fpa fpa NONE CHIP IMAGE + #PPIMAGE.BIAS INPUT @DETDB fpa fpa NONE CHIP IMAGE #PPIMAGE.DARK INPUT @DETDB {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE - PPIMAGE.FLAT INPUT @DETDB {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE + #PPIMAGE.FLAT INPUT @DETDB {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE PSPHOT.INPUT INPUT @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP IMAGE @@ -93,10 +93,11 @@ PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.mos.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE MEGACAM_CHIP:MOSAIC - PPIMAGE.OUTPUT.FPA OUTPUT {OUTPUT}.mos.fit {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE MEGACAM_FPAMOSAIC:MOSAIC + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fit {CHIP.NAME} {CHIP.NAME} NONE FPA FPA IMAGE TRUE MEGACAM_FPA:MOSAIC + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fit {CHIP.NAME} {CHIP.NAME} NONE FPA FPA IMAGE TRUE MEGACAM_FPA:MOSAIC - PPIMAGE.BIN1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE SPLIT - PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE SPLIT - PPIMAGE.JPEG1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.jpg -greyscale RANGE -5:20 CHIP CHIP JPEG TRUE SPLIT - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.jpg -greyscale FRACTION 0.50:2.00 CHIP CHIP JPEG TRUE SPLIT + 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}.{CHIP.NAME}.b1.jpg -greyscale RANGE -5:20 CHIP CHIP JPEG TRUE MEGACAM_FPA:MOSAIC + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.jpg -greyscale FRACTION 0.50:2.00 CHIP CHIP JPEG TRUE MEGACAM_FPA:MOSAIC PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICE @@ -109,6 +110,6 @@ 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}.{CELL.NAME}.cmp NONE NONE PHU CELL CELL CMP TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp NONE NONE PHU CHIP CHIP CMP TRUE NONE - PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.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/megacam/phase2.config =================================================================== --- /trunk/ippconfig/megacam/phase2.config (revision 7639) +++ /trunk/ippconfig/megacam/phase2.config (revision 7640) @@ -12,9 +12,15 @@ FRINGE BOOL FALSE # Fringe subtraction PHOTOM BOOL FALSE # Source identification and photometry -ASTROM BOOL FALSE # Astrometry -BIN1.FITS BOOL FALSE -BIN2.FITS BOOL FALSE -BIN1.JPEG BOOL FALSE -BIN2.JPEG BOOL FALSE +ASTROM.CHIP BOOL FALSE # Astrometry +ASTROM.MOSAIC BOOL FALSE # Astrometry + +BASE.FITS BOOL TRUE # Save base detrended image? +CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? +FPA1.FITS BOOL TRUE # Save 1st binned fpa image? +FPA2.FITS BOOL TRUE # Save 2nd binned fpa image? +BIN1.FITS BOOL TRUE # Save 1st binned chip image? +BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? +BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? # Non-linearity correction Index: /trunk/ippconfig/megacam_chipmosaic/format_mosaic.config =================================================================== --- /trunk/ippconfig/megacam_chipmosaic/format_mosaic.config (revision 7639) +++ /trunk/ippconfig/megacam_chipmosaic/format_mosaic.config (revision 7640) @@ -12,7 +12,9 @@ FILE METADATA # How to read this data - PHU STR FPA # The FITS file represents an entire FPA - EXTENSIONS STR CHIP # The extensions represent chips + PHU STR CHIP # The FITS file represents an entire FPA + EXTENSIONS STR NONE # The extensions represent chips FPA.NAME STR EXPNUM # A PHU keyword for unique identifier + CHIP.NAME STR EXTNAME # A PHU keyword for unique identifier + CONTENT STR {CHIP.NAME} # A string to index the CONTENTS menu; required because EXT=NONE END Index: /trunk/ippconfig/megacam_fpamosaic/format_mosaic.config =================================================================== --- /trunk/ippconfig/megacam_fpamosaic/format_mosaic.config (revision 7639) +++ /trunk/ippconfig/megacam_fpamosaic/format_mosaic.config (revision 7640) @@ -56,4 +56,6 @@ CELL.XPARITY S32 1 CELL.YPARITY S32 1 + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 CHIP.X0 S32 0 CHIP.X0 S32 0