Index: /trunk/ippconfig/megacam/format_raw.config =================================================================== --- /trunk/ippconfig/megacam/format_raw.config (revision 10089) +++ /trunk/ippconfig/megacam/format_raw.config (revision 10090) @@ -1,2 +1,3 @@ +# "mcshort" is a MegaCam camera with only the central six chips --- it's faster than the entire FPA. # The raw MegaCam data comes off the telescope with each of the chips stored in extensions of a MEF file. @@ -96,5 +97,4 @@ CELLS METADATA left METADATA # Left amplifier - CELL.NAME STR LeftSide CELL.BIASSEC.SOURCE STR HEADER CELL.TRIMSEC.SOURCE STR HEADER @@ -106,5 +106,4 @@ END right METADATA # Right amplifier - CELL.NAME STR RightSide CELL.BIASSEC.SOURCE STR HEADER CELL.TRIMSEC.SOURCE STR HEADER @@ -127,4 +126,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 @@ -136,4 +138,5 @@ CELL.SATURATION STR SATURATE CELL.TIME STR MJD-OBS + CELL.TIMESYS STR TIMESYS CELL.XBIN STR CCDBIN1 CELL.YBIN STR CCDBIN2 @@ -144,5 +147,4 @@ CELL.READDIR S32 1 # Cell is read in x direction CELL.BAD S32 0 - CELL.TIMESYS STR UTC CELL.YPARITY S32 1 @@ -206,5 +208,5 @@ ccd16 S32 13835 ccd17 S32 13835 - ccd18 S32 4612 + ccd18 S32 13835 ccd19 S32 4612 ccd20 S32 4612 @@ -225,43 +227,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 @@ -328,14 +292,7 @@ FPA.RA STR HOURS FPA.DEC STR DEGREES + FPA.TIME STR MJD CELL.TIME STR MJD CELL.X0 STR FORTRAN 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/megacam/format_spliced.config =================================================================== --- /trunk/ippconfig/megacam/format_spliced.config (revision 10089) +++ /trunk/ippconfig/megacam/format_spliced.config (revision 10090) @@ -1,3 +1,4 @@ -# The spliced MegaCam data is stored in single extensions 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 @@ -9,9 +10,10 @@ END -# How to read this data FILE METADATA + # How to read this data PHU STR FPA # The FITS file represents an entire FPA EXTENSIONS STR CHIP # The extensions represent chips FPA.NAME STR EXPNUM # A PHU keyword for unique identifier + CHIP.NAME STR EXTNAME # An extension keyword for unique identifie END @@ -60,5 +62,4 @@ CELLS METADATA left METADATA - CELL.NAME STR LeftSide CELL.BIASSEC.SOURCE STR HEADER CELL.TRIMSEC.SOURCE STR HEADER @@ -66,8 +67,9 @@ CELL.TRIMSEC STR TSECA CELL.X0 S32 0 + CELL.GAIN.SOURCE STR HEADER + CELL.GAIN STR GAINA END right METADATA - CELL.NAME STR RightSide CELL.BIASSEC.SOURCE STR HEADER CELL.TRIMSEC.SOURCE STR HEADER @@ -75,4 +77,6 @@ CELL.TRIMSEC STR TSECB CELL.X0 S32 1024 + CELL.GAIN.SOURCE STR HEADER + CELL.GAIN STR GAINB END END @@ -88,4 +92,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 @@ -93,8 +100,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,12 +110,12 @@ # Default PS concepts that may be specified by value DEFAULTS METADATA - FPA.CAMERA STR MEGACAM + FPA.TIMESYS STR UTC 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 CHIP.X0.DEPEND STR CHIP.NAME CHIP.X0 METADATA @@ -248,4 +255,5 @@ FPA.RA STR HOURS FPA.DEC STR DEGREES + FPA.TIME STR MJD CELL.TIME STR MJD END Index: /trunk/ippconfig/megacam_chipmosaic/format_mosaic.config =================================================================== --- /trunk/ippconfig/megacam_chipmosaic/format_mosaic.config (revision 10089) +++ /trunk/ippconfig/megacam_chipmosaic/format_mosaic.config (revision 10090) @@ -4,8 +4,5 @@ RULE METADATA TELESCOP STR CFHT 3.6m - DETECTOR STR MegaCam - EXTEND BOOL T - NEXTEND S32 36 - MOSAIC STR Chips + DETECTOR STR MegaCam Mosaicked:Chip END @@ -79,4 +76,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 @@ -98,5 +100,6 @@ CELL.X0 S32 0 CELL.Y0 S32 0 - + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 CHIP.X0.DEPEND STR CHIP.NAME CHIP.X0 METADATA @@ -177,82 +180,4 @@ 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.YPARITY.DEPEND STR CHIP.NAME - CHIP.YPARITY 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 END