Index: trunk/ippconfig/mcshort/camera.config =================================================================== --- trunk/ippconfig/mcshort/camera.config (revision 8892) +++ trunk/ippconfig/mcshort/camera.config (revision 8893) @@ -6,6 +6,6 @@ RAW STR mcshort/format_raw.config SPLICE STR mcshort/format_spliced.config + SPLIT STR mcshort/format_split.config END - # Description of camera --- all the chips and the cells that comprise them @@ -50,8 +50,118 @@ +# 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 RECIPES METADATA - PHASE2 STR phase2_template.config # Phase 2 recipe details - PSPHOT STR psphot_template.config # psphot details - PPMERGE STR ppMerge_template.config # ppMerge + # Recipes for ppImage + PPIMAGE STR megacam/ppImage.config # Default: all (normal) options on + PPIMAGE_O STR megacam/ppImage_o.config # Overscan only + PPIMAGE_OB STR megacam/ppImage_ob.config # Overscan, bias only + PPIMAGE_OBD STR megacam/ppImage_obd.config # Overscan, bias, dark only + PPIMAGE_OBDF STR megacam/ppImage_obdf.config # Overscan, bias, dark, flat only + PPIMAGE_B STR megacam/ppImage_b.config # Bias only + PPIMAGE_D STR megacam/ppImage_d.config # Dark only + PPIMAGE_F STR megacam/ppImage_f.config # Flat only + PPIMAGE_J STR megacam/ppImage_j.config # JPEG only + + # Recipes for ppMerge + PPMERGE STR ppMerge_template.config # ppMerge recipe + PPMERGE_BIAS STR megacam/ppMerge_bias.config + PPMERGE_DARK STR megacam/ppMerge_dark.config + PPMERGE_FLAT STR megacam/ppMerge_flat.config + + # Other recipes + PSPHOT STR megacam/psphot.config # psphot details + PSASTRO STR megacam/psastro.config # psastro details + PPSTATS STR megacam/ppStats.config # ppStats recipe + PPSTATS_PHASE0 STR megacam/ppStats_phase0.config # ppStats recipe for phase 0 END + +FILERULES METADATA + ### Redirections + PSASTRO.INPUT STR PSASTRO.INPUT.CMP + PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMP + PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMF + + ### 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 + PPARITH.INPUT INPUT @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP IMAGE + + ### 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 + + ### 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.DARK 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 + + PSASTRO.INPUT.CMP INPUT @FILES NONE NONE PHU CHIP CMP + PSASTRO.INPUT.CMF INPUT @FILES NONE SMPDATA PHU CHIP CMF + + ### 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.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.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 + + 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 + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp NONE NONE PHU CHIP CHIP CMP TRUE NONE + + PPARITH.OUTPUT OUTPUT {OUTPUT} {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE NONE + +END Index: trunk/ippconfig/mcshort/format_raw.config =================================================================== --- trunk/ippconfig/mcshort/format_raw.config (revision 8892) +++ trunk/ippconfig/mcshort/format_raw.config (revision 8893) @@ -97,5 +97,4 @@ CELLS METADATA left METADATA # Left amplifier - CELL.NAME STR LeftSide CELL.BIASSEC.SOURCE STR HEADER CELL.TRIMSEC.SOURCE STR HEADER @@ -107,5 +106,4 @@ END right METADATA # Right amplifier - CELL.NAME STR RightSide CELL.BIASSEC.SOURCE STR HEADER CELL.TRIMSEC.SOURCE STR HEADER @@ -329,12 +327,2 @@ CELL.Y0 STR FORTRAN END - - - -# How to get the supplementary stuff: mask and weight -SUPPLEMENTARY METADATA - MASK.SOURCE STR FILE # Source type for mask: EXT | FILE - MASK.NAME STR %a_mask.fits # Name for mask extension or filename - WEIGHT.SOURCE STR FILE # Source type for weight: EXT | FILE - WEIGHT.NAME STR %a_weight.fits # Name for weight extension or filename -END Index: trunk/ippconfig/mcshort/format_spliced.config =================================================================== --- trunk/ippconfig/mcshort/format_spliced.config (revision 8892) +++ trunk/ippconfig/mcshort/format_spliced.config (revision 8893) @@ -62,5 +62,4 @@ CELLS METADATA left METADATA - CELL.NAME STR LeftSide CELL.BIASSEC.SOURCE STR HEADER CELL.TRIMSEC.SOURCE STR HEADER @@ -73,5 +72,4 @@ right METADATA - CELL.NAME STR RightSide CELL.BIASSEC.SOURCE STR HEADER CELL.TRIMSEC.SOURCE STR HEADER @@ -96,5 +94,5 @@ CELL.DARKTIME STR DARKTIME CELL.READNOISE STR RDNOISE -# CELL.SATURATION STR SATURATE + CELL.SATURATION STR SATURATE CELL.TIME STR MJD-OBS CELL.XBIN STR CCDBIN1 @@ -110,5 +108,4 @@ CELL.YPARITY S32 1 CELL.Y0 S32 0 - CELL.SATURATION F32 45000 # PPMERGE.SCALE F32 1.0 # PPMERGE.ZERO F32 0.0 Index: trunk/ippconfig/mcshort/format_split.config =================================================================== --- trunk/ippconfig/mcshort/format_split.config (revision 8893) +++ trunk/ippconfig/mcshort/format_split.config (revision 8893) @@ -0,0 +1,288 @@ +# "mcshort" is a MegaCam camera with only the central six chips --- it's faster than the entire FPA. +# The spliced MecaCam data is stored in single extensions for each chip + +# How to recognise this type +RULE METADATA + TELESCOP STR CFHT 3.6m + DETECTOR STR MegaCam +END + +FILE METADATA + # How to read this data + 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 # An extension keyword for unique identifie + CONTENT STR {CHIP.NAME} # Key to the CONTENTS menu +END + +# What's in the FITS file? +CONTENTS METADATA + # Extension name, chip name:component cell +# ccd00 STR ccd00:LeftAmp:left ccd00:RightAmp:right +# ccd01 STR ccd01:LeftAmp:left ccd01:RightAmp:right +# ccd02 STR ccd02:LeftAmp:left ccd02:RightAmp:right +# ccd03 STR ccd03:LeftAmp:left ccd03:RightAmp:right +# ccd04 STR ccd04:LeftAmp:left ccd04:RightAmp:right +# ccd05 STR ccd05:LeftAmp:left ccd05:RightAmp:right +# ccd06 STR ccd06:LeftAmp:left ccd06:RightAmp:right +# ccd07 STR ccd07:LeftAmp:left ccd07:RightAmp:right +# ccd08 STR ccd08:LeftAmp:left ccd08:RightAmp:right +# ccd09 STR ccd09:LeftAmp:left ccd09:RightAmp:right +# ccd10 STR ccd10:LeftAmp:left ccd10:RightAmp:right +# ccd11 STR ccd11:LeftAmp:left ccd11:RightAmp:right + ccd12 STR ccd12:LeftAmp:left ccd12:RightAmp:right + ccd13 STR ccd13:LeftAmp:left ccd13:RightAmp:right + ccd14 STR ccd14:LeftAmp:left ccd14:RightAmp:right +# ccd15 STR ccd15:LeftAmp:left ccd15:RightAmp:right +# ccd16 STR ccd16:LeftAmp:left ccd16:RightAmp:right +# ccd17 STR ccd17:LeftAmp:left ccd17:RightAmp:right +# ccd18 STR ccd18:LeftAmp:left ccd18:RightAmp:right +# ccd19 STR ccd19:LeftAmp:left ccd19:RightAmp:right +# ccd20 STR ccd20:LeftAmp:left ccd20:RightAmp:right + ccd21 STR ccd21:LeftAmp:left ccd21:RightAmp:right + ccd22 STR ccd22:LeftAmp:left ccd22:RightAmp:right + ccd23 STR ccd23:LeftAmp:left ccd23:RightAmp:right +# ccd24 STR ccd24:LeftAmp:left ccd24:RightAmp:right +# ccd25 STR ccd25:LeftAmp:left ccd25:RightAmp:right +# ccd26 STR ccd26:LeftAmp:left ccd26:RightAmp:right +# ccd27 STR ccd27:LeftAmp:left ccd27:RightAmp:right +# ccd28 STR ccd28:LeftAmp:left ccd28:RightAmp:right +# ccd29 STR ccd29:LeftAmp:left ccd29:RightAmp:right +# ccd30 STR ccd30:LeftAmp:left ccd30:RightAmp:right +# ccd31 STR ccd31:LeftAmp:left ccd31:RightAmp:right +# ccd32 STR ccd32:LeftAmp:left ccd32:RightAmp:right +# ccd33 STR ccd33:LeftAmp:left ccd33:RightAmp:right +# ccd34 STR ccd34:LeftAmp:left ccd34:RightAmp:right +# ccd35 STR ccd35:LeftAmp:left ccd35:RightAmp:right +END + +# Specify the cells +CELLS METADATA + left METADATA + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC STR BSECA + CELL.TRIMSEC STR TSECA + CELL.X0 S32 0 + CELL.GAIN.SOURCE STR HEADER + CELL.GAIN STR GAINA + END + + right METADATA + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC STR BSECB + CELL.TRIMSEC STR TSECB + CELL.X0 S32 1024 + CELL.GAIN.SOURCE STR HEADER + CELL.GAIN STR GAINB + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.NAME STR EXPNUM + FPA.AIRMASS STR AIRMASS + FPA.FILTER STR FILTER + FPA.POSANGLE STR ROTANGLE + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR RADECSYS + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.READNOISE STR RDNOISE + CELL.SATURATION STR SATURATE + CELL.TIME STR MJD-OBS + CELL.XBIN STR CCDBIN1 + CELL.YBIN STR CCDBIN2 +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + CELL.READDIR S32 1 # Cell is read in x direction + CELL.BAD S32 0 + CELL.TIMESYS STR UTC + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CELL.Y0 S32 0 +# PPMERGE.SCALE F32 1.0 +# PPMERGE.ZERO F32 0.0 + CHIP.X0.DEPEND STR CHIP.NAME + CHIP.X0 METADATA +# ccd00 S32 +# ccd01 S32 +# ccd02 S32 +# ccd03 S32 +# ccd04 S32 +# ccd05 S32 +# ccd06 S32 +# ccd07 S32 +# ccd08 S32 +# ccd09 S32 +# ccd10 S32 +# ccd11 S32 + ccd12 S32 0 + ccd13 S32 2048 + ccd14 S32 4096 +# ccd15 S32 +# ccd16 S32 +# ccd17 S32 +# ccd18 S32 +# ccd19 S32 +# ccd20 S32 + ccd21 S32 0 + ccd22 S32 2048 + ccd23 S32 4096 +# ccd24 S32 +# ccd25 S32 +# ccd26 S32 +# ccd27 S32 +# ccd28 S32 +# ccd29 S32 +# ccd30 S32 +# ccd31 S32 +# ccd32 S32 +# ccd33 S32 +# ccd34 S32 +# ccd35 S32 + END + CHIP.Y0.DEPEND STR CHIP.NAME + CHIP.Y0 METADATA +# ccd00 S32 +# ccd01 S32 +# ccd02 S32 +# ccd03 S32 +# ccd04 S32 +# ccd05 S32 +# ccd06 S32 +# ccd07 S32 +# ccd08 S32 +# ccd09 S32 +# ccd10 S32 +# ccd11 S32 + ccd12 S32 9223 + ccd13 S32 9223 + ccd14 S32 9223 +# ccd15 S32 +# ccd16 S32 +# ccd17 S32 +# ccd18 S32 +# ccd19 S32 +# ccd20 S32 + ccd21 S32 0 + ccd22 S32 0 + ccd23 S32 0 +# ccd24 S32 +# ccd25 S32 +# ccd26 S32 +# ccd27 S32 +# ccd28 S32 +# ccd29 S32 +# ccd30 S32 +# ccd31 S32 +# ccd32 S32 +# ccd33 S32 +# ccd34 S32 +# ccd35 S32 + END + CHIP.XPARITY.DEPEND STR CHIP.NAME + CHIP.XPARITY METADATA +# ccd00 S32 +# ccd01 S32 +# ccd02 S32 +# ccd03 S32 +# ccd04 S32 +# ccd05 S32 +# ccd06 S32 +# ccd07 S32 +# ccd08 S32 +# ccd09 S32 +# ccd10 S32 +# ccd11 S32 + ccd12 S32 1 + ccd13 S32 1 + ccd14 S32 1 +# ccd15 S32 +# ccd16 S32 +# ccd17 S32 +# ccd18 S32 +# ccd19 S32 +# ccd20 S32 + ccd21 S32 1 + ccd22 S32 1 + ccd23 S32 1 +# ccd24 S32 +# ccd25 S32 +# ccd26 S32 +# ccd27 S32 +# ccd28 S32 +# ccd29 S32 +# ccd30 S32 +# ccd31 S32 +# ccd32 S32 +# ccd33 S32 +# ccd34 S32 +# ccd35 S32 + END + CHIP.YPARITY.DEPEND STR CHIP.NAME + CHIP.YPARITY METADATA +# ccd00 S32 +# ccd01 S32 +# ccd02 S32 +# ccd03 S32 +# ccd04 S32 +# ccd05 S32 +# ccd06 S32 +# ccd07 S32 +# ccd08 S32 +# ccd09 S32 +# ccd10 S32 +# ccd11 S32 + ccd12 S32 -1 + ccd13 S32 -1 + ccd14 S32 -1 +# ccd15 S32 +# ccd16 S32 +# ccd17 S32 +# ccd18 S32 +# ccd19 S32 +# ccd20 S32 + ccd21 S32 1 + ccd22 S32 1 + ccd23 S32 1 +# ccd24 S32 +# ccd25 S32 +# ccd26 S32 +# ccd27 S32 +# ccd28 S32 +# ccd29 S32 +# ccd30 S32 +# ccd31 S32 +# ccd32 S32 +# ccd33 S32 +# ccd34 S32 +# ccd35 S32 + END +END + + +# How to translation PS concepts into database lookups +DATABASE METADATA + TYPE dbEntry TABLE COLUMN GIVENDBCOL GIVENPS +# CELL.GAIN dbEntry Camera gain chipId,cellId CHIP.NAME,CELL.NAME +# CELL.READNOISE dbEntry Camera readNoise chipId,cellId CHIP.NAME,CELL.NAME + +# A database entry refers to a particular column (COLUMN) in a +# particular table (TABLE), given certain PS concepts (GIVENPS) that +# match certain database columns (GIVENDBCOL). +END + + +# Where there might be some ambiguity, specify the format +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + CELL.TIME STR MJD +END +