Index: trunk/ippconfig/ctio_mosaic2/format.config
===================================================================
--- trunk/ippconfig/ctio_mosaic2/format.config	(revision 10461)
+++ trunk/ippconfig/ctio_mosaic2/format.config	(revision 10499)
@@ -1,3 +1,3 @@
-# format file for CTIO Mosaic2 camera used by ESSENCE
+# Format file for CTIO Mosaic2 camera used by ESSENCE
 
 # How to identify this type
@@ -19,42 +19,29 @@
 CONTENTS	METADATA
 	# Extension name, chip name:type
-	amp00		STR	ccd00:LeftAmp:left
-	amp01		STR	ccd00:RightAmp:right
-	amp02		STR	ccd01:LeftAmp:left
-	amp03		STR	ccd01:RightAmp:right
-	amp04		STR	ccd02:LeftAmp:left
-	amp05		STR	ccd02:RightAmp:right
-	amp06		STR	ccd03:LeftAmp:left
-	amp07		STR	ccd03:RightAmp:right
-	amp08		STR	ccd04:LeftAmp:left
-	amp09		STR	ccd04:RightAmp:right
-	amp10		STR	ccd05:LeftAmp:left
-	amp11		STR	ccd05:RightAmp:right
-	amp12		STR	ccd06:LeftAmp:left
-	amp13		STR	ccd06:RightAmp:right
-	amp14		STR	ccd07:LeftAmp:left
-	amp15		STR	ccd07:RightAmp:right
-	amp16		STR	ccd08:LeftAmp:left
+	im1		STR	ccd00:LeftAmp:amp
+	im2		STR	ccd00:RightAmp:amp
+	im3		STR	ccd01:LeftAmp:amp  
+	im4		STR	ccd01:RightAmp:amp
+	im5		STR	ccd02:LeftAmp:amp  
+	im6		STR	ccd02:RightAmp:amp
+	im7		STR	ccd03:LeftAmp:amp  
+	im8		STR	ccd03:RightAmp:amp
+	im9		STR	ccd04:LeftAmp:amp  
+	im10		STR	ccd04:RightAmp:amp
+	im11		STR	ccd05:LeftAmp:amp  
+	im12		STR	ccd05:RightAmp:amp
+	im13		STR	ccd06:LeftAmp:amp  
+	im14		STR	ccd06:RightAmp:amp
+	im15		STR	ccd07:LeftAmp:left  
+	im16		STR	ccd07:RightAmp:amp
 END
 
 # Specify the cell data
 CELLS	METADATA
-	left	METADATA	# Left amplifier
+	amp	METADATA
 		CELL.BIASSEC.SOURCE	STR	HEADER
 		CELL.TRIMSEC.SOURCE	STR	HEADER
 		CELL.BIASSEC		STR	BIASSEC
 		CELL.TRIMSEC		STR	DATASEC
-		CELL.XPARITY		S32	1 # We could have specified this as a DEFAULT, but this works
-		CELL.X0			S32	1
-		CELL.Y0			S32	1
-	END
-	right	METADATA	# Right amplifier
-		CELL.BIASSEC.SOURCE	STR	HEADER
-		CELL.TRIMSEC.SOURCE	STR	HEADER
-		CELL.BIASSEC		STR	BIASSEC
-		CELL.TRIMSEC		STR	DATASEC
-		CELL.XPARITY		S32	-1 # This cell is read out in the opposite direction
-		CELL.X0			S32	2048
-		CELL.Y0			S32	1
 	END
 END
@@ -62,18 +49,13 @@
 # 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
 	FPA.OBSTYPE		STR	OBSTYPE
-	FPA.OBJECT		STR	CMMTOBS
+	FPA.OBJECT		STR	OBJECT
 	FPA.TIME		STR	MJD-OBS
-	FPA.TIMESYS		STR	TIMESYS
-	FPA.ALT			STR	TELALT
-	FPA.AZ			STR	TELAZ
-	CHIP.TEMP		STR	DETTEM
+	CHIP.TEMP		STR	CCDTEM
 	CELL.EXPOSURE		STR	EXPTIME
 	CELL.DARKTIME		STR	DARKTIME
@@ -82,133 +64,27 @@
 	CELL.SATURATION		STR	SATURATE
 	CELL.TIME		STR	MJD-OBS
-	CELL.TIMESYS		STR	TIMESYS
-	CELL.XBIN		STR	CCDBIN1
-	CELL.YBIN		STR	CCDBIN2
+	CELL.XBIN		STR	CCDSUM
+	CELL.YBIN		STR	CCDSUM
+
+	CHIP.XPARITY		STR	DTM1_1
+	CHIP.YPARITY		STR	DTM2_2
+	CHIP.X0			STR	DTV1
+	CHIP.Y0			STR	DTV2
+
+	CELL.XPARITY		STR	ATM1_1
+	CELL.YPARITY		STR	ATM2_2
+	CELL.X0			STR	ATV1
+	CELL.Y0			STR	ATV2
 END
 
 # Default PS concepts that may be specified by value
 DEFAULTS	METADATA
+	FPA.POSANGLE		F32	0.0
+	FPA.TIMESYS		STR	UTC		# Header says "UTC approximate"
+	FPA.ALT			F32	0.0		# Not present in header
+	FPA.AZ			F32	0.0		# Not present in header
+	CELL.TIMESYS		STR	UTC		# Header says "UTC approximate"
 	CELL.READDIR		S32	1		# Cell is read in x direction
 	CELL.BAD		S32	0
-	CELL.YPARITY		S32	1
-
-	CHIP.X0.DEPEND		STR	CHIP.NAME
-	CHIP.X0		METADATA
-		ccd00	S32	0
-		ccd01	S32	2048
-		ccd02	S32	4096
-		ccd03	S32	6144
-		ccd04	S32	8192
-		ccd05	S32	10240
-		ccd06	S32	12288
-		ccd07	S32	14336
-		ccd08	S32	16384
-		ccd09	S32	0
-		ccd10	S32	2048
-		ccd11	S32	4096
-		ccd12	S32	6144
-		ccd13	S32	8192
-		ccd14	S32	10240
-		ccd15	S32	12288
-		ccd16	S32	14336
-		ccd17	S32	16384
-		ccd18	S32	0
-		ccd19	S32	2048
-		ccd20	S32	4096
-		ccd21	S32	6144
-		ccd22	S32	8192
-		ccd23	S32	10240
-		ccd24	S32	12288
-		ccd25	S32	14336
-		ccd26	S32	16384
-		ccd27	S32	0
-		ccd28	S32	2048
-		ccd29	S32	4096
-		ccd30	S32	6144
-		ccd31	S32	8192
-		ccd32	S32	10240
-		ccd33	S32	12288
-		ccd34	S32	14336
-		ccd35	S32	16384
-	END
-	CHIP.Y0.DEPEND		STR	CHIP.NAME
-	CHIP.Y0		METADATA
-		ccd00	S32	18447
-		ccd01	S32	18447
-		ccd02	S32	18447
-		ccd03	S32	18447
-		ccd04	S32	18447
-		ccd05	S32	18447
-		ccd06	S32	18447
-		ccd07	S32	18447
-		ccd08	S32	18447
-		ccd09	S32	13835
-		ccd10	S32	13835
-		ccd11	S32	13835
-		ccd12	S32	13835
-		ccd13	S32	13835
-		ccd14	S32	13835
-		ccd15	S32	13835
-		ccd16	S32	13835
-		ccd17	S32	13835
-		ccd18	S32	13835
-		ccd19	S32	4612
-		ccd20	S32	4612
-		ccd21	S32	4612
-		ccd22	S32	4612
-		ccd23	S32	4612
-		ccd24	S32	4612
-		ccd25	S32	4612
-		ccd26	S32	4612
-		ccd27	S32	0
-		ccd28	S32	0
-		ccd29	S32	0
-		ccd30	S32	0
-		ccd31	S32	0
-		ccd32	S32	0
-		ccd33	S32	0
-		ccd34	S32	0
-		ccd35	S32	0
-	END
-	CHIP.XPARITY	S32	1
-	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
 
@@ -238,4 +114,6 @@
 	FPA.TIME	STR	MJD
 	CELL.TIME	STR	MJD
+	CHIP.X0		STR	FORTRAN
+	CHIP.Y0		STR	FORTRAN
 	CELL.X0		STR	FORTRAN
 	CELL.Y0		STR	FORTRAN