Index: /branches/czw_branch/20130702/ippconfig/suprime/format_raw.config =================================================================== --- /branches/czw_branch/20130702/ippconfig/suprime/format_raw.config (revision 35919) +++ /branches/czw_branch/20130702/ippconfig/suprime/format_raw.config (revision 35920) @@ -4,7 +4,8 @@ RULE METADATA TELESCOP STR Subaru -# DETECTOR STR kiki INSTRUME STR SuprimeCam NAXIS S32 2 + NAXIS1 S32 2272 + NAXIS2 S32 4273 END @@ -15,5 +16,4 @@ FPA.OBS STR EXP-ID # A PHU keyword for unique identifier CONTENT STR DETECTOR # Key to the CONTENTS menu - CHIP.NAME STR DETECTOR CONTENT.RULE STR {CHIP.NAME} # How to derive the CONTENT when writing END @@ -22,14 +22,14 @@ CONTENTS METADATA # Content name, chipType - nausicaa STR XY01:spcam20080721 - kiki STR XY11:spcam20080721 - fio STR XY21:spcam20080721 - sophie STR XY00:spcam20080721 - sheeta STR XY10:spcam20080721 - satsuki STR XY20:spcam20080721 - chihiro STR XY41:spcam20080721 - clarisse STR XY31:spcam20080721 - ponyo STR XY40:spcam20080721 - san STR XY30:spcam20080721 + nausicaa STR XY01_raw:spcam20080721 + kiki STR XY11_raw:spcam20080721 + fio STR XY21_raw:spcam20080721 + sophie STR XY00_raw:spcam20080721 + sheeta STR XY10_raw:spcam20080721 + satsuki STR XY20_raw:spcam20080721 + chihiro STR XY41_raw:spcam20080721 + clarisse STR XY31_raw:spcam20080721 + ponyo STR XY40_raw:spcam20080721 + san STR XY30_raw:spcam20080721 END @@ -37,7 +37,10 @@ CHIPS METADATA # Chip type, cellName:cellType - spcam20080721 STR Cell:cell -# spcam20080721 STR Cell:amplifier - + spcam20080721 METADATA + ch1 STR ch1:ch1 + ch2 STR ch2:ch2 + ch3 STR ch4:ch3 + ch4 STR ch4:ch4 + END END @@ -46,9 +49,39 @@ CELLS METADATA # Cell type, concepts for this type - cell METADATA + ch1 METADATA CELL.BIASSEC.SOURCE STR VALUE CELL.TRIMSEC.SOURCE STR VALUE CELL.BIASSEC STR [521:568,1:48] - CELL.TRIMSEC STR [1:2264,1:4225] + CELL.TRIMSEC STR [9:520:49,4225] + CELL.X0 S32 0 + CELL.GAIN.SOURCE STR HEADER + CELL.GAIN STR GAIN + END + # Cell type, concepts for this type + ch2 METADATA + CELL.BIASSEC.SOURCE STR VALUE + CELL.TRIMSEC.SOURCE STR VALUE + CELL.BIASSEC STR [569:616,1:48] + CELL.TRIMSEC STR [617:1128,49:4225] + CELL.X0 S32 0 + CELL.GAIN.SOURCE STR HEADER + CELL.GAIN STR GAIN + END + # Cell type, concepts for this type + ch3 METADATA + CELL.BIASSEC.SOURCE STR VALUE + CELL.TRIMSEC.SOURCE STR VALUE + CELL.BIASSEC STR [1657:1704,1:48] + CELL.TRIMSEC STR [1145:1656,49:4225] + CELL.X0 S32 0 + CELL.GAIN.SOURCE STR HEADER + CELL.GAIN STR GAIN + END + # Cell type, concepts for this type + ch4 METADATA + CELL.BIASSEC.SOURCE STR VALUE + CELL.TRIMSEC.SOURCE STR VALUE + CELL.BIASSEC STR [1705:1752,1:48] + CELL.TRIMSEC STR [1753:2264,49:4225] CELL.X0 S32 0 CELL.GAIN.SOURCE STR HEADER @@ -59,6 +92,6 @@ # How to translate PS concepts into FITS headers TRANSLATION METADATA - FPA.OBS STR EXP-ID - FPA.DETECTOR STR DETECTOR + FPA.OBS STR EXP-ID + FPA.DETECTOR STR DETECTOR FPA.AIRMASS STR AIRMASS FPA.FILTER STR FILTER01 @@ -70,5 +103,5 @@ FPA.OBSTYPE STR DATA-TYP FPA.OBJECT STR OBJECT - FPA.FOCUS STR TELFOCUS + FPA.FOCUS STR FOC-VAL FPA.TIME STR MJD FPA.TIMESYS STR TIMESYS @@ -80,9 +113,16 @@ CELL.EXPOSURE STR EXPTIME CELL.DARKTIME STR DARKTIME - CELL.READNOISE STR RDNOISE +# CELL.READNOISE STR RDNOISE CELL.TIME STR MJD CELL.TIMESYS STR TIMESYS CELL.XBIN STR BIN-FCT1 CELL.YBIN STR BIN-FCT2 + + # FPA.TELTEMP.M1 STR TELTEMM1 # Primary mirror temps (C) + # FPA.TELTEMP.M1CELL STR TELTEMMS # Primary mirror support temps (C) + # FPA.TELTEMP.M2 STR TELTEMM2 # Secondary mirror temps (C + # FPA.TELTEMP.SPIDER STR TELTEMSP # Spider temperatures (C) + FPA.TELTEMP.TRUSS STR DOM-TMP # Mid truss temperatures (C + FPA.TELTEMP.EXTRA STR OUT-TMP # Miscellaneous temperatures (C) END @@ -100,20 +140,10 @@ CELL.READDIR S32 1 # Cell is read in x direction CELL.SATURATION F32 50000.0 + CELL.READNOISE F32 5.0 # XXX wild guess CELL.BAD F32 0 CELL.XPARITY S32 1 CELL.YPARITY S32 1 CELL.Y0 S32 0 - CELL.TRIMSEC STR [1:2264,1:4225] CHIP.X0.DEPEND STR CHIP.NAME -# nausicaa STR XY01:spcam20080721 -# kiki STR XY11:spcam20080721 -# fio STR XY21:spcam20080721 -# sophie STR XY00:spcam20080721 -# sheeta STR XY10:spcam20080721 -# satsuki STR XY20:spcam20080721 -# chihiro STR XY41:spcam20080721 -# clarisse STR XY31:spcam20080721 -# ponyo STR XY40:spcam20080721 -# san STR XY30:spcam20080721 CHIP.X0 METADATA Index: /branches/czw_branch/20130702/ippconfig/suprime/format_split.config =================================================================== --- /branches/czw_branch/20130702/ippconfig/suprime/format_split.config (revision 35919) +++ /branches/czw_branch/20130702/ippconfig/suprime/format_split.config (revision 35920) @@ -4,5 +4,4 @@ RULE METADATA TELESCOP STR Subaru -# DETECTOR STR kiki INSTRUME STR SuprimeCam NAXIS S32 2 @@ -11,6 +10,6 @@ FILE METADATA # How to read this data - PHU STR CHIP # The FITS file represents an entire FPA - EXTENSIONS STR NONE # The extensions represent chips + PHU STR CHIP # The FITS file represents a chip + EXTENSIONS STR NONE # There are no extensions FPA.OBS STR EXP-ID # A PHU keyword for unique identifier CONTENT STR DETECTOR # Key to the CONTENTS menu @@ -36,5 +35,5 @@ CHIPS METADATA # Chip type, cellName:cellType - spcam20080721 STR cell:cell + spcam20080721 STR Cell:cell END @@ -46,6 +45,6 @@ CELL.BIASSEC.SOURCE STR VALUE CELL.TRIMSEC.SOURCE STR VALUE - CELL.BIASSEC STR [521:568,1:48] - CELL.TRIMSEC STR [520:2264,49:4225] + CELL.BIASSEC STR [0:0,0:0] + CELL.TRIMSEC STR [1:2048,1:4225] CELL.X0 S32 0 CELL.GAIN.SOURCE STR HEADER @@ -56,5 +55,6 @@ # How to translate PS concepts into FITS headers TRANSLATION METADATA - FPA.OBS STR EXP-ID + FPA.OBS STR EXP-ID + FPA.DETECTOR STR DETECTOR FPA.AIRMASS STR AIRMASS FPA.FILTER STR FILTER01 @@ -66,5 +66,5 @@ FPA.OBSTYPE STR DATA-TYP FPA.OBJECT STR OBJECT - FPA.FOCUS STR TELFOCUS + FPA.FOCUS STR FOC-VAL FPA.TIME STR MJD FPA.TIMESYS STR TIMESYS @@ -76,9 +76,16 @@ CELL.EXPOSURE STR EXPTIME CELL.DARKTIME STR DARKTIME - CELL.READNOISE STR RDNOISE +# CELL.READNOISE STR RDNOISE CELL.TIME STR MJD CELL.TIMESYS STR TIMESYS CELL.XBIN STR BIN-FCT1 CELL.YBIN STR BIN-FCT2 + + # FPA.TELTEMP.M1 STR TELTEMM1 # Primary mirror temps (C) + # FPA.TELTEMP.M1CELL STR TELTEMMS # Primary mirror support temps (C) + # FPA.TELTEMP.M2 STR TELTEMM2 # Secondary mirror temps (C + # FPA.TELTEMP.SPIDER STR TELTEMSP # Spider temperatures (C) + FPA.TELTEMP.TRUSS STR DOM-TMP # Mid truss temperatures (C + FPA.TELTEMP.EXTRA STR OUT-TMP # Miscellaneous temperatures (C) END @@ -87,5 +94,4 @@ FPA.TELESCOPE STR Subaru FPA.INSTRUMENT STR SuprimeCam - FPA.DETECTOR STR kiki CHIP.XSIZE S32 2048 CHIP.YSIZE S32 4224 @@ -97,4 +103,5 @@ CELL.READDIR S32 1 # Cell is read in x direction CELL.SATURATION F32 50000.0 + CELL.READNOISE F32 5.0 # XXX wild guess CELL.BAD F32 0 CELL.XPARITY S32 1 @@ -102,14 +109,4 @@ CELL.Y0 S32 0 CHIP.X0.DEPEND STR CHIP.NAME -# nausicaa STR XY01:spcam20080721 -# kiki STR XY11:spcam20080721 -# fio STR XY21:spcam20080721 -# sophie STR XY00:spcam20080721 -# sheeta STR XY10:spcam20080721 -# satsuki STR XY20:spcam20080721 -# chihiro STR XY41:spcam20080721 -# clarisse STR XY31:spcam20080721 -# ponyo STR XY40:spcam20080721 -# san STR XY30:spcam20080721 CHIP.X0 METADATA