Index: /trunk/ippconfig/lris_red/format_raw.config
===================================================================
--- /trunk/ippconfig/lris_red/format_raw.config	(revision 7097)
+++ /trunk/ippconfig/lris_red/format_raw.config	(revision 7098)
@@ -40,20 +40,25 @@
 # What's in the FITS file?
 CONTENTS	STR	RedChip:LeftSide:left RedChip:RightSide:right
-END
 
 # Specify the cell data
 CELLS	METADATA
 	left	METADATA
-		CELL.BIASSEC	STR	VALUE:[1:20,1:2048];[2089:2168,1:2048]
-		CELL.TRIMSEC	STR	VALUE:[41:1064,1:2048]
-		CELL.GAIN	STR	VALUE:1.2
-		CELL.READNOISE	STR	VALUE:5.6
+		CELL.BIASSEC.SOURCE	STR	VALUE
+		CELL.TRIMSEC.SOURCE	STR	VALUE
+		CELL.BIASSEC		STR	[1:20,1:2048];[2089:2168,1:2048]
+		CELL.TRIMSEC		STR	[41:1064,1:2048]
+		CELL.GAIN		F32	1.98
+		CELL.READNOISE		F32	6.1
+		CELL.X0			S32	0
 	END
 
 	right	METADATA
-		CELL.BIASSEC	STR	VALUE:[21:40,1:2048];[2169:2248,1:2048]
-		CELL.TRIMSEC	STR	VALUE:[1065:2088,1:2048]
-		CELL.GAIN	STR	VALUE:1.3
-		CELL.READNOISE	STR	VALUE:6.5
+		CELL.BIASSEC.SOURCE	STR	VALUE
+		CELL.TRIMSEC.SOURCE	STR	VALUE
+		CELL.BIASSEC		STR	[21:40,1:2048];[2169:2248,1:2048]
+		CELL.TRIMSEC		STR	[1065:2088,1:2048]
+		CELL.GAIN		F32	2.17
+		CELL.READNOISE		F32	6.3
+		CELL.X0			S32	1023
 	END
 END
@@ -68,6 +73,5 @@
 	CELL.EXPOSURE	STR	EXPTIME
 	CELL.DARKTIME	STR	DARKTIME
-	CELL.DATE	STR	DATE-OBS
-	CELL.TIME	STR	TIME-OBS
+	CELL.TIME	STR	MJD-OBS
 END
 
@@ -75,4 +79,19 @@
 DEFAULTS	METADATA
 	FPA.RADECSYS	STR	ICRS
+	CELL.XPARITY	S32	1
+	CELL.YPARITY	S32	1
+	CELL.SATURATION	F32	65535
+	CELL.BAD	F32	0
+	CELL.XBIN	S32	1
+	CELL.YBIN	S32	1
+	CELL.READDIR	S32	1
+	CELL.TIMESYS	STR	UTC
 END
 
+# Where there might be some ambiguity, specify the format
+FORMATS		METADATA
+	CELL.TIME	MJD
+        FPA.RA          STR     HOURS
+        FPA.DEC         STR     DEGREES
+        CELL.TIME       STR     MJD
+END
Index: /trunk/ippconfig/lris_red/format_spec.config
===================================================================
--- /trunk/ippconfig/lris_red/format_spec.config	(revision 7097)
+++ /trunk/ippconfig/lris_red/format_spec.config	(revision 7098)
@@ -44,15 +44,21 @@
 CELLS	METADATA
 	left	METADATA
-		CELL.BIASSEC	STR	VALUE:[1:20,1:1000];[2089:2168,1:1000]
-		CELL.TRIMSEC	STR	VALUE:[41:1064,1:1000]
-		CELL.GAIN	STR	VALUE:1.2
-		CELL.READNOISE	STR	VALUE:5.6
+		CELL.BIASSEC.SOURCE	STR	VALUE
+		CELL.TRIMSEC.SOURCE	STR	VALUE
+		CELL.BIASSEC		STR	[1:20,1:1000];[2089:2168,1:1000]
+		CELL.TRIMSEC		STR	[41:1064,1:1000]
+		CELL.GAIN		F32	1.98
+		CELL.READNOISE		F32	6.1
+		CELL.X0			S32	0
 	END
 
 	right	METADATA
-		CELL.BIASSEC	STR	VALUE:[21:40,1:1000];[2169:2248,1:1000]
-		CELL.TRIMSEC	STR	VALUE:[1065:2088,1:1000]
-		CELL.GAIN	STR	VALUE:1.3
-		CELL.READNOISE	STR	VALUE:6.5
+		CELL.BIASSEC.SOURCE	STR	VALUE
+		CELL.TRIMSEC.SOURCE	STR	VALUE
+		CELL.BIASSEC		STR	[21:40,1:1000];[2169:2248,1:1000]
+		CELL.TRIMSEC		STR	[1065:2088,1:1000]
+		CELL.GAIN		F32	2.17
+		CELL.READNOISE		F32	6.3
+		CELL.X0			S32	1023
 	END
 END
@@ -67,6 +73,5 @@
 	CELL.EXPOSURE	STR	EXPTIME
 	CELL.DARKTIME	STR	DARKTIME
-	CELL.DATE	STR	DATE-OBS
-	CELL.TIME	STR	TIME-OBS
+	CELL.TIME	STR	MJD-OBS
 END
 
@@ -74,3 +79,19 @@
 DEFAULTS	METADATA
 	FPA.RADECSYS	STR	ICRS
+	CELL.XPARITY	S32	1
+	CELL.YPARITY	S32	1
+	CELL.SATURATION	F32	65535
+	CELL.BAD	F32	0
+	CELL.XBIN	S32	1
+	CELL.YBIN	S32	1
+	CELL.READDIR	S32	1
+	CELL.TIMESYS	STR	UTC
 END
+
+# Where there might be some ambiguity, specify the format
+FORMATS		METADATA
+	CELL.TIME	MJD
+        FPA.RA          STR     HOURS
+        FPA.DEC         STR     DEGREES
+        CELL.TIME       STR     MJD
+END