Index: /trunk/ippconfig/megacam/format_spliced.config =================================================================== --- /trunk/ippconfig/megacam/format_spliced.config (revision 10090) +++ /trunk/ippconfig/megacam/format_spliced.config (revision 10091) @@ -118,6 +118,4 @@ CHIP.X0.DEPEND STR CHIP.NAME CHIP.X0 METADATA - CHIP.X0.DEPEND STR CHIP.NAME - CHIP.X0 METADATA ccd00 S32 0 ccd01 S32 2048 Index: /trunk/ippconfig/megacam/format_split.config =================================================================== --- /trunk/ippconfig/megacam/format_split.config (revision 10090) +++ /trunk/ippconfig/megacam/format_split.config (revision 10091) @@ -1,3 +1,4 @@ -# The split MecaCam data is stored in single file for each chip +# "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 @@ -7,16 +8,16 @@ END -# How to read this dataF 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 the FPA name - CHIP.NAME STR EXTNAME # A PHU keyword for the chip name - CONTENT STR {CHIP.NAME} # A string to index the CONTENTS menu; required because EXT=NONE + 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 - # Chip name, components + # Extension name, chip name:component cell ccd00 STR ccd00:LeftAmp:left ccd00:RightAmp:right ccd01 STR ccd01:LeftAmp:left ccd01:RightAmp:right @@ -65,4 +66,6 @@ CELL.TRIMSEC STR TSECA CELL.X0 S32 0 + CELL.GAIN.SOURCE STR HEADER + CELL.GAIN STR GAINA END @@ -73,4 +76,6 @@ CELL.TRIMSEC STR TSECB CELL.X0 S32 1024 + CELL.GAIN.SOURCE STR HEADER + CELL.GAIN STR GAINB END END @@ -86,4 +91,7 @@ FPA.RADECSYS STR RADECSYS FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR CMMTOBS + FPA.TIME STR MJD-OBS + FPA.TIMESYS STR TIMESYS FPA.ALT STR TELALT FPA.AZ STR TELAZ @@ -91,8 +99,8 @@ CELL.EXPOSURE STR EXPTIME CELL.DARKTIME STR DARKTIME - CELL.GAIN STR GAIN CELL.READNOISE STR RDNOISE CELL.SATURATION STR SATURATE CELL.TIME STR MJD-OBS + CELL.TIMESYS STR TIMESYS CELL.XBIN STR CCDBIN1 CELL.YBIN STR CCDBIN2 @@ -103,9 +111,7 @@ 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 - CHIP.X0.DEPEND STR CHIP.NAME CHIP.X0 METADATA @@ -186,43 +192,5 @@ ccd35 S32 0 END - CHIP.XPARITY.DEPEND STR CHIP.NAME - CHIP.XPARITY METADATA - ccd00 S32 1 - ccd01 S32 1 - ccd02 S32 1 - ccd03 S32 1 - ccd04 S32 1 - ccd05 S32 1 - ccd06 S32 1 - ccd07 S32 1 - ccd08 S32 1 - ccd09 S32 1 - ccd10 S32 1 - ccd11 S32 1 - ccd12 S32 1 - ccd13 S32 1 - ccd14 S32 1 - ccd15 S32 1 - ccd16 S32 1 - ccd17 S32 1 - ccd18 S32 1 - ccd19 S32 1 - ccd20 S32 1 - ccd21 S32 1 - ccd22 S32 1 - ccd23 S32 1 - ccd24 S32 1 - ccd25 S32 1 - ccd26 S32 1 - ccd27 S32 1 - ccd28 S32 1 - ccd29 S32 1 - ccd30 S32 1 - ccd31 S32 1 - ccd32 S32 1 - ccd33 S32 1 - ccd34 S32 1 - ccd35 S32 1 - END + CHIP.XPARITY S32 1 CHIP.YPARITY.DEPEND STR CHIP.NAME CHIP.YPARITY METADATA @@ -283,4 +251,6 @@ FPA.RA STR HOURS FPA.DEC STR DEGREES + FPA.TIME STR MJD CELL.TIME STR MJD END + Index: /trunk/ippconfig/megacam_fpamosaic/camera.config =================================================================== --- /trunk/ippconfig/megacam_fpamosaic/camera.config (revision 10090) +++ /trunk/ippconfig/megacam_fpamosaic/camera.config (revision 10091) @@ -15,191 +15,89 @@ # Recipe options RECIPES METADATA - PHASE2 STR megacam/phase2.config # Phase 2 recipe details - PPMERGE STR ppMerge_template.config # ppMerge recipe - PSPHOT STR megacam/psphot.config # psphot details + # Recipes for ppImage + PPIMAGE STR megacam/ppImage.config # Default: all (normal) options on + PPIMAGE_O STR megacam/ppImage_o.config # Overscan + PPIMAGE_OB STR megacam/ppImage_ob.config # Overscan, bias + PPIMAGE_OBD STR megacam/ppImage_obd.config # Overscan, bias, dark + PPIMAGE_OBDS STR megacam/ppImage_obds.config # Overscan, bias, dark, shutter, flat + PPIMAGE_OBDSF STR megacam/ppImage_obdsf.config # Overscan, bias, dark, shutter, flat + PPIMAGE_OBDSFR STR megacam/ppImage_obdsfr.config # Overscan, bias, dark, shutter, flat, fringe + PPIMAGE_B STR megacam/ppImage_b.config # Bias only + PPIMAGE_D STR megacam/ppImage_d.config # Dark only + PPIMAGE_S STR megacam/ppImage_n.config # NOTHING --- no need for shutter yet + PPIMAGE_F STR megacam/ppImage_f.config # Flat only + PPIMAGE_R STR megacam/ppImage_r.config # Fringe only + PPIMAGE_J1 STR megacam/ppImage_j1.config # JPEG only; binning 1 + PPIMAGE_J2 STR megacam/ppImage_j2.config # JPEG only; binning 2 + PPIMAGE_N STR megacam/ppImage_n.config # Nothing significant; binning 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 + PPMERGE_FRINGE STR megacam/ppMerge_fringe.config + + # Other recipes + PSPHOT STR megacam/psphot.config # psphot details + PSASTRO STR megacam/psastro.config # psastro details + PPSTATS STR megacam/ppStats.config # ppStats recipe END FILERULES METADATA - PPIMAGE.INPUT METADATA - FILENAME.RULE STR @FILES - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CELL.NAME} - EXTNAME.XTRA STR NONE - FILE.DEPTH STR CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR IMAGE - FILE.MODE STR READ - END - PPIMAGE.OUTPUT METADATA - FILENAME.RULE STR {OUTPUT}.fits - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CHIP.NAME} - EXTNAME.XTRA STR NONE - FILE.DEPTH STR CHIP - DATA.DEPTH STR CHIP - 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 CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR IMAGE - FILE.MODE STR WRITE - FILE.FORMAT STR SPLIT - 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 CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR IMAGE - FILE.MODE STR WRITE - FILE.FORMAT STR SPLIT - END + ### Redirections + PSASTRO.INPUT STR PSASTRO.INPUT.CMP + PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMP + PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMF - 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 CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR IMAGE - FILE.MODE STR READ - 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 CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR IMAGE - FILE.MODE STR READ - 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 CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR IMAGE - FILE.MODE STR READ - 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 CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR IMAGE - FILE.MODE STR READ - END + ### 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 - PSPHOT.INPUT METADATA - FILENAME.RULE STR @FILES - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CELL.NAME} - EXTNAME.XTRA STR NONE - FILE.DEPTH STR CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR IMAGE - FILE.MODE STR READ - END + ### 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 - # an indirect rule allows multiple, related output definitions - PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMP -# PSPHOT.OUTPUT STR PSPHOT.OUTPUT.RAW + ### 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.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 CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR IMAGE - FILE.MODE STR WRITE - END + PSPHOT.INPUT INPUT @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP IMAGE -# PSPHOT.BACKSUB METADATA -# FILENAME.RULE STR {OUTPUT}.sub.fits -# FILENAME.XTRA STR {CHIP.NAME} -# EXTNAME.RULE STR {CELL.NAME} -# EXTNAME.XTRA STR {CELL.NAME} -# OPEN.DEPTH STR CELL -# WRITE.DEPTH STR CELL -# FILETYPE STR IMAGE -# END + PSASTRO.INPUT.CMP INPUT @FILES NONE NONE PHU CHIP CMP + PSASTRO.INPUT.CMF INPUT @FILES NONE SMPDATA PHU CHIP CMF - PSPHOT.BACKGND METADATA - FILENAME.RULE STR {OUTPUT}.bck.fits - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CELL.NAME} - EXTNAME.XTRA STR {CELL.NAME} - OPEN.DEPTH STR CELL - WRITE.DEPTH STR CELL - FILE.TYPE STR IMAGE - FILE.MODE STR WRITE - FILE.FORMAT STR SPLIT - 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 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 NONE + PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE NONE - PSPHOT.OUTPUT.RAW METADATA - FILENAME.RULE STR {OUTPUT} - FILENAME.XTRA STR NONE - EXTNAME.RULE STR NONE - EXTNAME.XTRA STR PHU - FILE.DEPTH STR CHIP - DATA.DEPTH STR CHIP - 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 CHIP - DATA.DEPTH STR CHIP - 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 CHIP - DATA.DEPTH STR CHIP - 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 CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR CMP - FILE.MODE STR WRITE - END - PSPHOT.OUTPUT.CMF METADATA - FILENAME.RULE STR {OUTPUT}.{CHIP.NAME}.cmf - FILENAME.XTRA STR NONE - EXTNAME.RULE STR SMPDATA - EXTNAME.XTRA STR PHU - FILE.DEPTH STR CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR CMF - FILE.MODE STR WRITE - END + 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 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 + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg -greyscale FRACTION 0.50:2.00 FPA FPA JPEG TRUE NONE + + 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}.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE NONE + END Index: /trunk/ippconfig/megacam_fpamosaic/format_mosaic.config =================================================================== --- /trunk/ippconfig/megacam_fpamosaic/format_mosaic.config (revision 10090) +++ /trunk/ippconfig/megacam_fpamosaic/format_mosaic.config (revision 10091) @@ -4,8 +4,5 @@ RULE METADATA TELESCOP STR CFHT 3.6m - DETECTOR STR MegaCam - EXTEND BOOL T - NEXTEND S32 36 - MOSAIC STR FPA + DETECTOR STR MegaCam Mosaicked:FPA END @@ -39,4 +36,9 @@ FPA.DEC STR DEC FPA.RADECSYS STR RADECSYS + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR CMMTOBS + FPA.ALT STR TELALT + FPA.AZ STR TELAZ + CHIP.TEMP STR DETTEM CELL.EXPOSURE STR EXPTIME CELL.DARKTIME STR DARKTIME