Index: /trunk/ippconfig/megacam/camera.config =================================================================== --- /trunk/ippconfig/megacam/camera.config (revision 7723) +++ /trunk/ippconfig/megacam/camera.config (revision 7724) @@ -51,4 +51,35 @@ END +# move this elsewhere? we need a lookup table to go from filter ID to abstract name +FILTER.ID METADATA + u.MP9301 STR u + g.MP9401 STR g + r.MP9601 STR r + i.MP9701 STR i + z.MP9801 STR z + Zp STR z + Zprime STR z + Ha.MP7605 STR Ha + Halpha STR Ha + Haalpha.on STR Ha + HaOFF.MP7604 STR HaOff + + CN.MP780 STR CN + cn.MP7803 STR CN + CN.MP7803 STR CN + + TiO.MP77 STR TiO + tio.MP7701 STR TiO + TiO.MP7701 STR TiO + NB920 STR NB920 + + B2F STR B2F + Bj STR Bj + Vj STR Vj + Rj STR Rj + Ij STR Ij + Hb STR Hb + HbOff STR HbOff +END # Recipe options @@ -64,5 +95,5 @@ PSASTRO.INPUT STR PSASTRO.INPUT.CMP PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMP - PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMP + PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMF ### input file definitions @@ -98,6 +129,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}.{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 + 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 PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICE Index: /trunk/ippconfig/megacam/format_raw.config =================================================================== --- /trunk/ippconfig/megacam/format_raw.config (revision 7723) +++ /trunk/ippconfig/megacam/format_raw.config (revision 7724) @@ -329,6 +329,4 @@ END - - # How to get the supplementary stuff: mask and weight SUPPLEMENTARY METADATA Index: /trunk/ippconfig/megacam/format_spliced.config =================================================================== --- /trunk/ippconfig/megacam/format_spliced.config (revision 7723) +++ /trunk/ippconfig/megacam/format_spliced.config (revision 7724) @@ -99,4 +99,5 @@ # Default PS concepts that may be specified by value DEFAULTS METADATA + FPA.CAMERA STR MEGACAM CELL.READDIR S32 1 # Cell is read in x direction CELL.BAD S32 0 Index: /trunk/ippconfig/megacam/phase2.config =================================================================== --- /trunk/ippconfig/megacam/phase2.config (revision 7723) +++ /trunk/ippconfig/megacam/phase2.config (revision 7724) @@ -6,11 +6,11 @@ NONLIN BOOL FALSE # Non-linearity correction -OVERSCAN BOOL FALSE # Overscan subtraction -BIAS BOOL FALSE # Bias subtraction +OVERSCAN BOOL TRUE # Overscan subtraction +BIAS BOOL TRUE # Bias subtraction DARK BOOL FALSE # Dark subtraction -FLAT BOOL FALSE # Flat-field normalisation +FLAT BOOL TRUE # Flat-field normalisation FRINGE BOOL FALSE # Fringe subtraction PHOTOM BOOL FALSE # Source identification and photometry -ASTROM.CHIP BOOL FALSE # Astrometry +ASTROM.CHIP BOOL FALSE ASTROM.MOSAIC BOOL FALSE # Astrometry @@ -21,6 +21,6 @@ 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? +BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? +BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? # Non-linearity correction @@ -80,2 +80,4 @@ BIN2.XBIN S32 64 BIN2.YBIN S32 64 + +PHOTCODE.RULE STR {CAMERA}.{FILTER.ID}.{CHIP.N} Index: /trunk/ippconfig/megacam_alternate/camera.config =================================================================== --- /trunk/ippconfig/megacam_alternate/camera.config (revision 7723) +++ /trunk/ippconfig/megacam_alternate/camera.config (revision 7724) @@ -19,275 +19,49 @@ FILERULES METADATA - PSASTRO.INPUT STR PSASTRO.INPUT.CMP - PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMP + PPIMAGE.OUTPUT STR PPIMAGE.OUTPUT.SPL + PSASTRO.INPUT STR PSASTRO.INPUT.CMP + PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMP + PSPHOT.OUTPUT STR PSPHOT.OUTPUT.RAW - PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMP + ### input file definitions + TYPE INPUT FILENAME.RULE FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA DATA.LEVEL FILE.TYPE + PPIMAGE.INPUT INPUT @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP IMAGE - PPIMAGE.INPUT METADATA - FILENAME.RULE STR @FILES - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CELL.NAME} - EXTNAME.XTRA STR NONE - FILE.DEPTH STR FPA - DATA.DEPTH STR FPA - FILE.TYPE STR IMAGE - FILE.MODE STR READ - END - PPIMAGE.OUTPUT METADATA - FILENAME.RULE STR {OUTPUT}.{CHIP.NAME}.fits - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CHIP.NAME} - EXTNAME.XTRA STR NONE - FILE.DEPTH STR FPA - DATA.DEPTH STR FPA - FILE.TYPE STR IMAGE - FILE.MODE STR WRITE - END - PPIMAGE.BIN1 METADATA - FILENAME.RULE STR {OUTPUT}.{CHIP.NAME}.bin1.fits - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CHIP.NAME} - EXTNAME.XTRA STR NONE - FILE.DEPTH STR FPA - DATA.DEPTH STR FPA - FILE.TYPE STR IMAGE - FILE.MODE STR WRITE - FILE.FORMAT STR SIMPLE - END - PPIMAGE.BIN2 METADATA - FILENAME.RULE STR {OUTPUT}.{CHIP.NAME}.bin2.fits - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CHIP.NAME} - EXTNAME.XTRA STR NONE - FILE.DEPTH STR FPA - DATA.DEPTH STR FPA - FILE.TYPE STR IMAGE - FILE.MODE STR WRITE - FILE.FORMAT STR SIMPLE - END - PPIMAGE.JPEG1 METADATA - FILENAME.RULE STR {OUTPUT}.{CHIP.NAME}.bin1.jpg - FILENAME.XTRA STR -greyscale - EXTNAME.RULE STR RANGE - EXTNAME.XTRA STR -5:20 - FILE.DEPTH STR FPA - DATA.DEPTH STR FPA - FILE.TYPE STR JPEG - FILE.MODE STR WRITE - FILE.FORMAT STR SIMPLE - END - PPIMAGE.JPEG2 METADATA - FILENAME.RULE STR {OUTPUT}.{CHIP.NAME}.bin2.jpg - FILENAME.XTRA STR rainbow - EXTNAME.RULE STR FRACTION - EXTNAME.XTRA STR 0.50:2.00 - FILE.DEPTH STR FPA - DATA.DEPTH STR FPA - FILE.TYPE STR JPEG - FILE.MODE STR WRITE - FILE.FORMAT STR SIMPLE - END + ### use these entries to get the detrend images from specific files + PPIMAGE.MASK INPUT @DETDB {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE + PPIMAGE.BIAS INPUT @DETDB {CHIP.NAME} {CHIP.NAME} 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.BIAS METADATA - FILENAME.RULE STR bias.fits - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CHIP.NAME} - EXTNAME.XTRA STR NONE - FILE.DEPTH STR FPA - DATA.DEPTH STR FPA - FILE.TYPE STR IMAGE - FILE.MODE STR WRITE - END - PPIMAGE.DARK METADATA - FILENAME.RULE STR dark.fits - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CHIP.NAME} - EXTNAME.XTRA STR NONE - FILE.DEPTH STR FPA - DATA.DEPTH STR FPA - FILE.TYPE STR IMAGE - FILE.MODE STR WRITE - END - PPIMAGE.FLAT METADATA - FILENAME.RULE STR flat.fits - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CHIP.NAME} - EXTNAME.XTRA STR NONE - FILE.DEPTH STR FPA - DATA.DEPTH STR FPA - FILE.TYPE STR IMAGE - FILE.MODE STR WRITE - END - PPIMAGE.MASK METADATA - FILENAME.RULE STR mask.fits - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CHIP.NAME} - EXTNAME.XTRA STR NONE - FILE.DEPTH STR FPA - DATA.DEPTH STR FPA - FILE.TYPE STR IMAGE - FILE.MODE STR WRITE - END + PSPHOT.INPUT INPUT @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP IMAGE - PSPHOT.INPUT METADATA - FILENAME.RULE STR @FILES - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CELL.NAME} - EXTNAME.XTRA STR NONE - FILE.DEPTH STR FPA - DATA.DEPTH STR FPA - FILE.TYPE STR IMAGE - FILE.MODE STR READ - END + PSASTRO.INPUT.CMP INPUT @FILES NONE NONE PHU CHIP CMP + PSASTRO.INPUT.CMF INPUT @FILES NONE SMPDATA PHU CHIP CMF - PSPHOT.RESID METADATA - FILENAME.RULE STR {OUTPUT}.res.fits - FILENAME.XTRA STR NONE - EXTNAME.RULE STR {CELL.NAME} - EXTNAME.XTRA STR {CELL.NAME} - FILE.DEPTH STR FPA - DATA.DEPTH STR FPA - FILE.TYPE STR IMAGE - FILE.MODE STR WRITE - END + ### 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.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE NONE + PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.fit {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE NONE - PSPHOT.BACKGND METADATA - FILENAME.RULE STR {OUTPUT}.bck.fits - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CELL.NAME} - EXTNAME.XTRA STR {CELL.NAME} - FILE.DEPTH STR FPA - DATA.DEPTH STR FPA - FILE.TYPE STR IMAGE - FILE.MODE STR WRITE - FILE.FORMAT STR SIMPLE - END + PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.mos.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE MEGACAM_CHIP: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 - PSPHOT.BACKSUB METADATA - FILENAME.RULE STR {OUTPUT}.sub.fits - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CELL.NAME} - EXTNAME.XTRA STR {CELL.NAME} - FILE.DEPTH STR FPA - DATA.DEPTH STR FPA - FILE.TYPE STR IMAGE - FILE.MODE STR WRITE - FILE.FORMAT STR SIMPLE - END + 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 - PSPHOT.BACKMDL METADATA - FILENAME.RULE STR {OUTPUT}.mdl.fits - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CELL.NAME} - EXTNAME.XTRA STR {CELL.NAME} - FILE.DEPTH STR FPA - DATA.DEPTH STR FPA - FILE.TYPE STR IMAGE - FILE.MODE STR WRITE - FILE.FORMAT STR SIMPLE - END + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE {CELL.NAME} {CELL.NAME} FPA FPA IMAGE TRUE SIMPLE + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits NONE {CELL.NAME} {CELL.NAME} FPA FPA IMAGE TRUE SIMPLE + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits NONE {CELL.NAME} {CELL.NAME} FPA FPA IMAGE TRUE SIMPLE + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits NONE {CELL.NAME} {CELL.NAME} FPA FPA IMAGE TRUE SIMPLE - PSPHOT.PSF.SAVE METADATA - FILENAME.RULE STR {OUTPUT}.{CHIP.NAME}.psf.txt - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CELL.NAME} - EXTNAME.XTRA STR {CELL.NAME} - FILE.DEPTH STR READOUT - DATA.DEPTH STR READOUT - FILE.TYPE STR PSF - FILE.MODE STR WRITE - END - PSPHOT.PSF.LOAD METADATA - FILENAME.RULE STR {OUTPUT}.{CHIP.NAME}.psf.txt - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CELL.NAME} - EXTNAME.XTRA STR {CELL.NAME} - FILE.DEPTH STR CELL - DATA.DEPTH STR CELL - FILE.TYPE STR PSF - FILE.MODE STR READ - END + 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 METADATA - FILENAME.RULE STR {OUTPUT}.{CHIP.NAME} - FILENAME.XTRA STR NONE - EXTNAME.RULE STR NONE - EXTNAME.XTRA STR PHU - FILE.DEPTH STR FPA - DATA.DEPTH STR FPA - FILE.TYPE STR RAW - FILE.MODE STR WRITE - END - PSPHOT.OUTPUT.SX METADATA - FILENAME.RULE STR {OUTPUT}.sx - FILENAME.XTRA STR NONE - EXTNAME.RULE STR NONE - EXTNAME.XTRA STR PHU - FILE.DEPTH STR FPA - DATA.DEPTH STR FPA - FILE.TYPE STR SX - FILE.MODE STR WRITE - END - PSPHOT.OUTPUT.OBJ METADATA - FILENAME.RULE STR {OUTPUT}.obj - FILENAME.XTRA STR NONE - EXTNAME.RULE STR NONE - EXTNAME.XTRA STR PHU - FILE.DEPTH STR FPA - DATA.DEPTH STR FPA - FILE.TYPE STR OBJ - FILE.MODE STR WRITE - END - PSPHOT.OUTPUT.CMP METADATA - FILENAME.RULE STR {OUTPUT}.cmp - FILENAME.XTRA STR NONE - EXTNAME.RULE STR NONE - EXTNAME.XTRA STR PHU - FILE.DEPTH STR FPA - DATA.DEPTH STR FPA - FILE.TYPE STR CMP - FILE.MODE STR WRITE - END - PSPHOT.OUTPUT.CMF METADATA - FILENAME.RULE STR {OUTPUT}.cmf - FILENAME.XTRA STR NONE - EXTNAME.RULE STR SMPDATA - EXTNAME.XTRA STR PHU - FILE.DEPTH STR FPA - DATA.DEPTH STR FPA - FILE.TYPE STR CMF - FILE.MODE STR WRITE - END - - PSASTRO.INPUT.CMP METADATA - FILENAME.RULE STR @FILES - FILENAME.XTRA STR NONE - EXTNAME.RULE STR NONE - EXTNAME.XTRA STR PHU - FILE.DEPTH STR FPA - DATA.DEPTH STR FPA - FILE.TYPE STR CMP - FILE.MODE STR READ - END - PSASTRO.INPUT.CMF METADATA - FILENAME.RULE STR @FILES - FILENAME.XTRA STR NONE - EXTNAME.RULE STR SMPDATA - EXTNAME.XTRA STR PHU - FILE.DEPTH STR FPA - DATA.DEPTH STR FPA - FILE.TYPE STR CMF - FILE.MODE STR READ - END - - PSASTRO.OUTPUT.CMP METADATA - FILENAME.RULE STR {OUTPUT}.smp - FILENAME.XTRA STR NONE - EXTNAME.RULE STR NONE - EXTNAME.XTRA STR PHU - FILE.DEPTH STR FPA - DATA.DEPTH STR FPA - FILE.TYPE STR CMP - FILE.MODE STR WRITE - END + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp NONE NONE PHU CHIP CHIP CMP TRUE NONE END Index: /trunk/ippconfig/megacam_alternate/format.config =================================================================== --- /trunk/ippconfig/megacam_alternate/format.config (revision 7723) +++ /trunk/ippconfig/megacam_alternate/format.config (revision 7724) @@ -3,5 +3,5 @@ # How to identify this type RULE METADATA -# RUNID STR 03BH11 + RUNID STR 03BH11 DETECTOR STR MegaCam SIMPLE BOOL TRUE Index: /trunk/ippconfig/megacam_chipmosaic/camera.config =================================================================== --- /trunk/ippconfig/megacam_chipmosaic/camera.config (revision 7723) +++ /trunk/ippconfig/megacam_chipmosaic/camera.config (revision 7724) @@ -47,4 +47,35 @@ END +# move this elsewhere? we need a lookup table to go from filter ID to abstract name +FILTER.ID METADATA + u.MP9301 STR u + g.MP9401 STR g + r.MP9601 STR r + i.MP9701 STR i + z.MP9801 STR z + Zp STR z + Zprime STR z + Ha.MP7605 STR Ha + Halpha STR Ha + Haalpha.on STR Ha + HaOFF.MP7604 STR HaOff + + CN.MP780 STR CN + cn.MP7803 STR CN + CN.MP7803 STR CN + + TiO.MP77 STR TiO + tio.MP7701 STR TiO + TiO.MP7701 STR TiO + NB920 STR NB920 + + B2F STR B2F + Bj STR Bj + Vj STR Vj + Rj STR Rj + Ij STR Ij + Hb STR Hb + HbOff STR HbOff +END # Recipe options