Index: /trunk/ippconfig/tc3/format.config
===================================================================
--- /trunk/ippconfig/tc3/format.config	(revision 12665)
+++ /trunk/ippconfig/tc3/format.config	(revision 12666)
@@ -21,17 +21,17 @@
 CONTENTS	METADATA
 	# File identifier with corresponding file layout name
-	CCID58-1-06b2	STR	CCID58
-	CCID45-1-14A	STR	CCID45
-	CCID45-1-11A	STR	CCID45
-	CCID45-1-22A	STR	CCID45
-	CCID45-1-04C	STR	CCID45
-	CCID45-1-13A	STR	CCID45
-	CCID45-1-05A	STR	CCID45
-	CCID45-1-19A	STR	CCID45
+	CCID58-1-06b2	STR	CCD_10u
+	CCID45-1-14A	STR	CCD_12u
+	CCID45-1-11A	STR	CCD_12u
+	CCID45-1-22A	STR	CCD_12u
+	CCID45-1-04C	STR	CCD_10u
+	CCID45-1-13A	STR	CCD_12u
+	CCID45-1-05A	STR	CCD_12u
+	CCID45-1-19A	STR	CCD_12u
 END
 
 # Specify the layout
 CHIPS	METADATA
-	CCID58		METADATA
+	CCD_10u		METADATA
 		# Extension name, cellName:cellType
 		xy00	STR	xy00:pitch10u
@@ -100,70 +100,70 @@
 		xy77	STR	xy77:pitch10u
 	END
-	CCID45		METADATA
+	CCD_12u		METADATA
 		# Extension name, cellName:cellType
-		xy00	STR	xy00:pitch10u
-		xy01	STR	xy01:pitch10u
-		xy02	STR	xy02:pitch10u
-		xy03	STR	xy03:pitch10u
-		xy04	STR	xy04:pitch10u
-		xy05	STR	xy05:pitch10u
-		xy06	STR	xy06:pitch10u
-		xy07	STR	xy07:pitch10u
-		xy10	STR	xy10:pitch10u
-		xy11	STR	xy11:pitch10u
-		xy12	STR	xy12:pitch10u
-		xy13	STR	xy13:pitch10u
-		xy14	STR	xy14:pitch10u
-		xy15	STR	xy15:pitch10u
-		xy16	STR	xy16:pitch10u
-		xy17	STR	xy17:pitch10u
-		xy20	STR	xy20:pitch10u
-		xy21	STR	xy21:pitch10u
-		xy22	STR	xy22:pitch10u
-		xy23	STR	xy23:pitch10u
-		xy24	STR	xy24:pitch10u
-		xy25	STR	xy25:pitch10u
-		xy26	STR	xy26:pitch10u
-		xy27	STR	xy27:pitch10u
-		xy30	STR	xy30:pitch10u
-		xy31	STR	xy31:pitch10u
-		xy32	STR	xy32:pitch10u
-		xy33	STR	xy33:pitch10u
-		xy34	STR	xy34:pitch10u
-		xy35	STR	xy35:pitch10u
-		xy36	STR	xy36:pitch10u
-		xy37	STR	xy37:pitch10u
-		xy40	STR	xy40:pitch10u
-		xy41	STR	xy41:pitch10u
-		xy42	STR	xy42:pitch10u
-		xy43	STR	xy43:pitch10u
-		xy44	STR	xy44:pitch10u
-		xy45	STR	xy45:pitch10u
-		xy46	STR	xy46:pitch10u
-		xy47	STR	xy47:pitch10u
-		xy50	STR	xy50:pitch10u
-		xy51	STR	xy51:pitch10u
-		xy52	STR	xy52:pitch10u
-		xy53	STR	xy53:pitch10u
-		xy54	STR	xy54:pitch10u
-		xy55	STR	xy55:pitch10u
-		xy56	STR	xy56:pitch10u
-		xy57	STR	xy57:pitch10u
-		xy60	STR	xy60:pitch10u
-		xy61	STR	xy61:pitch10u
-		xy62	STR	xy62:pitch10u
-		xy63	STR	xy63:pitch10u
-		xy64	STR	xy64:pitch10u
-		xy65	STR	xy65:pitch10u
-		xy66	STR	xy66:pitch10u
-		xy67	STR	xy67:pitch10u
-		xy70	STR	xy70:pitch10u
-		xy71	STR	xy71:pitch10u
-		xy72	STR	xy72:pitch10u
-		xy73	STR	xy73:pitch10u
-		xy74	STR	xy74:pitch10u
-		xy75	STR	xy75:pitch10u
-		xy76	STR	xy76:pitch10u
-		xy77	STR	xy77:pitch10u
+		xy00	STR	xy00:pitch12u
+		xy01	STR	xy01:pitch12u
+		xy02	STR	xy02:pitch12u
+		xy03	STR	xy03:pitch12u
+		xy04	STR	xy04:pitch12u
+		xy05	STR	xy05:pitch12u
+		xy06	STR	xy06:pitch12u
+		xy07	STR	xy07:pitch12u
+		xy10	STR	xy10:pitch12u
+		xy11	STR	xy11:pitch12u
+		xy12	STR	xy12:pitch12u
+		xy13	STR	xy13:pitch12u
+		xy14	STR	xy14:pitch12u
+		xy15	STR	xy15:pitch12u
+		xy16	STR	xy16:pitch12u
+		xy17	STR	xy17:pitch12u
+		xy20	STR	xy20:pitch12u
+		xy21	STR	xy21:pitch12u
+		xy22	STR	xy22:pitch12u
+		xy23	STR	xy23:pitch12u
+		xy24	STR	xy24:pitch12u
+		xy25	STR	xy25:pitch12u
+		xy26	STR	xy26:pitch12u
+		xy27	STR	xy27:pitch12u
+		xy30	STR	xy30:pitch12u
+		xy31	STR	xy31:pitch12u
+		xy32	STR	xy32:pitch12u
+		xy33	STR	xy33:pitch12u
+		xy34	STR	xy34:pitch12u
+		xy35	STR	xy35:pitch12u
+		xy36	STR	xy36:pitch12u
+		xy37	STR	xy37:pitch12u
+		xy40	STR	xy40:pitch12u
+		xy41	STR	xy41:pitch12u
+		xy42	STR	xy42:pitch12u
+		xy43	STR	xy43:pitch12u
+		xy44	STR	xy44:pitch12u
+		xy45	STR	xy45:pitch12u
+		xy46	STR	xy46:pitch12u
+		xy47	STR	xy47:pitch12u
+		xy50	STR	xy50:pitch12u
+		xy51	STR	xy51:pitch12u
+		xy52	STR	xy52:pitch12u
+		xy53	STR	xy53:pitch12u
+		xy54	STR	xy54:pitch12u
+		xy55	STR	xy55:pitch12u
+		xy56	STR	xy56:pitch12u
+		xy57	STR	xy57:pitch12u
+		xy60	STR	xy60:pitch12u
+		xy61	STR	xy61:pitch12u
+		xy62	STR	xy62:pitch12u
+		xy63	STR	xy63:pitch12u
+		xy64	STR	xy64:pitch12u
+		xy65	STR	xy65:pitch12u
+		xy66	STR	xy66:pitch12u
+		xy67	STR	xy67:pitch12u
+		xy70	STR	xy70:pitch12u
+		xy71	STR	xy71:pitch12u
+		xy72	STR	xy72:pitch12u
+		xy73	STR	xy73:pitch12u
+		xy74	STR	xy74:pitch12u
+		xy75	STR	xy75:pitch12u
+		xy76	STR	xy76:pitch12u
+		xy77	STR	xy77:pitch12u
 	END
 END		
@@ -174,18 +174,17 @@
 		CELL.BIASSEC.SOURCE	STR	HEADER
 		CELL.TRIMSEC.SOURCE	STR	HEADER
-#		CELL.BIASSEC		STR	[575:606,1:594]
-#		CELL.TRIMSEC		STR	[1:574,1:594]
 		CELL.BIASSEC		STR	BIASSEC
 		CELL.TRIMSEC		STR	DATASEC
-	END
-
-	# This is just in here for fun
+		CELL.XSIZE		S32	590
+		CELL.YSIZE		S32	598
+	END
+
 	pitch12u	METADATA
 		CELL.BIASSEC.SOURCE	STR	HEADER
 		CELL.TRIMSEC.SOURCE	STR	HEADER
-#		CELL.BIASSEC		STR	[1:10,1:512];[523:574,1:512]
-#		CELL.TRIMSEC		STR	[11:522,1:512]
 		CELL.BIASSEC		STR	BIASSEC
-		CELL.TRIMSEC		STR	TRIMSEC
+		CELL.TRIMSEC		STR	DATASEC
+		CELL.XSIZE		S32	477
+		CELL.YSIZE		S32	496
 	END
 END
@@ -240,6 +239,4 @@
 	CHIP.XSIZE		S32	4036
 	CHIP.YSIZE		S32	4031
-	CELL.XSIZE		S32	480
-	CELL.YSIZE		S32	496
 	CELL.GAIN		F32	1.0
 	CELL.READNOISE          F32     10.0
@@ -247,26 +244,50 @@
         CELL.BAD                S32     0
 
+	CHIP.XSIZE.DEPEND	STR	CHIP.NAME
+	CHIP.XSIZE	METADATA
+		CCID58-1-06b2	S32	4837		# 10 micron pitch
+		CCID45-1-14A	S32	4033
+		CCID45-1-11A	S32	4033
+		CCID45-1-22A	S32	4033
+		CCID45-1-04C	S32	4837		# 10 micron pitch
+		CCID45-1-13A	S32	4033
+		CCID45-1-05A	S32	4033    
+		CCID45-1-19A	S32	4033 
+	END
+
+	CHIP.XSIZE.DEPEND	STR	CHIP.NAME
+	CHIP.XSIZE	METADATA
+		CCID58-1-06b2	S32	4829		# 10 micron pitch
+		CCID45-1-14A	S32	4031
+		CCID45-1-11A	S32	4031
+		CCID45-1-22A	S32	4031
+		CCID45-1-04C	S32	4829		# 10 micron pitch
+		CCID45-1-13A	S32	4031
+		CCID45-1-05A	S32	4031    
+		CCID45-1-19A	S32	4031 
+	END
+
 	### How to get FPA coordinates from chip coordinates
 	CHIP.X0.DEPEND		STR	CHIP.NAME
 	CHIP.X0		METADATA
 		CCID58-1-06b2	S32	0
-		CCID45-1-14A	S32	4100
-		CCID45-1-11A	S32	8200
-		CCID45-1-22A	S32	12300
+		CCID45-1-14A	S32	4900
+		CCID45-1-11A	S32	9800
+		CCID45-1-22A	S32	14700
 		CCID45-1-04C	S32	0
-		CCID45-1-13A	S32	4100
-		CCID45-1-05A	S32	8200    
-		CCID45-1-19A	S32	12300 
+		CCID45-1-13A	S32	4900
+		CCID45-1-05A	S32	9800    
+		CCID45-1-19A	S32	14700 
 	END
 	CHIP.Y0.DEPEND		STR	CHIP.NAME
 	CHIP.Y0		METADATA
 		CCID58-1-06b2	S32	0
-		CCID45-1-14A	S32	0
+		CCID45-1-14A	S32	4900
 		CCID45-1-11A	S32	0
-		CCID45-1-22A	S32	0
-		CCID45-1-04C	S32	4100
-		CCID45-1-13A	S32	4100
-		CCID45-1-05A	S32	4100
-		CCID45-1-19A	S32	4100
+		CCID45-1-22A	S32	4900
+		CCID45-1-04C	S32	0
+		CCID45-1-13A	S32	4900
+		CCID45-1-05A	S32	0
+		CCID45-1-19A	S32	4900
 	END
 	CHIP.XPARITY.DEPEND	STR	CHIP.NAME