Index: /trunk/ippconfig/tc3/format.config
===================================================================
--- /trunk/ippconfig/tc3/format.config	(revision 12611)
+++ /trunk/ippconfig/tc3/format.config	(revision 12612)
@@ -1,3 +1,3 @@
-# TC3 data from the early runs did not have many needed keywords set
+# Camera format configuration for Pan-STARRS Test Camera 3
 
 # How to recognise this type
@@ -170,20 +170,20 @@
 CELLS	METADATA
 	pitch10u	METADATA
-		CELL.BIASSEC.SOURCE	STR	VALUE
-		CELL.TRIMSEC.SOURCE	STR	VALUE
-		CELL.BIASSEC		STR	[575:606,1:594]
-		CELL.TRIMSEC		STR	[1:574,1:594]
-	#	CELL.BIASSEC		STR	BIASSEC
-	#	CELL.TRIMSEC		STR	DATASEC
+		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
 	pitch12u	METADATA
-		CELL.BIASSEC.SOURCE	STR	VALUE
-		CELL.TRIMSEC.SOURCE	STR	VALUE
-		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.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
 	END
 END
@@ -213,10 +213,18 @@
         CELL.DARKTIME   STR     DARKTIME
 	CELL.TIME	STR	MJD-OBS
-        CELL.GAIN       STR     GAIN
-#       CELL.READNOISE  STR     RDNOISE
         CELL.SATURATION STR     SATURATE
         CELL.XBIN       STR     CCDBIN1
         CELL.YBIN       STR     CCDBIN2
 #	CELL.BAD	STR	BADLEVEL
+
+#### How to get the cell coordiantes from readout coordinates
+#	READOUT.X0		STR	CNPIX1
+#	READOUT.Y0		STR	CNPIX2
+
+### How to get the chip coordinates from cell coordinates
+	CELL.X0		STR	IMNPIX1
+	CELL.Y0		STR	IMNPIX2
+	CELL.XPARITY	STR	IMTM1_1
+	CELL.YPARITY	STR	IMTM2_2
 END
 
@@ -227,65 +235,58 @@
 	FPA.FILTERID		STR	NONE
 	FPA.FILTER		STR	NONE
-	CHIP.XSIZE		S32	2048
-	CHIP.YSIZE		S32	4612
-	CELL.XSIZE		S32	1024
-	CELL.YSIZE		S32	4612
+	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
 	CELL.READDIR		S32	1		# Cell is read in x direction
         CELL.BAD                S32     0
-	CELL.XPARITY		S32	1
-	CELL.YPARITY		S32	1
-	CELL.Y0			S32	0
-
-#	CHIP.X0.DEPEND		STR	CHIP.NAME
-#	CHIP.X0		METADATA
-#		chip00	S32	0
-#		chip01	S32	2048
-#		chip02	S32	4096
-#		chip03	S32	6144
-#		chip04	S32	8192
-#		chip05	S32	10240
-#		chip06	S32	0    
-#		chip07	S32	2048 
-#		chip08	S32	4096 
-#		chip09	S32	6144 
-#		chip10	S32	8192 
-#		chip11	S32	10240
-#	END
-#	CHIP.Y0.DEPEND		STR	CHIP.NAME
-#	CHIP.Y0		METADATA
-#		chip00	S32	0
-#		chip01	S32	0
-#		chip02	S32	0
-#		chip03	S32	0
-#		chip04	S32	0
-#		chip05	S32	0
-#		chip06	S32	4128
-#		chip07	S32	4128
-#		chip08	S32	4128
-#		chip09	S32	4128
-#		chip10	S32	4128
-#		chip11	S32	4128
-#	END
-#	CHIP.XPARITY		S32	1
-#	CHIP.YPARITY.DEPEND	STR	CHIP.NAME
-#	CHIP.YPARITY	METADATA
-#		chip00	S32	+1
-#		chip01	S32	+1
-#		chip02	S32	+1
-#		chip03	S32	+1
-#		chip04	S32	+1
-#		chip05	S32	+1
-#		chip06	S32	-1
-#		chip07	S32	-1
-#		chip08	S32	-1
-#		chip09	S32	-1
-#		chip10	S32	-1
-#		chip11	S32	-1
-#	END
-	CHIP.XPARITY		S32	1
-	CHIP.YPARITY		S32	1
-	CHIP.X0			S32	0
-	CHIP.Y0			S32	0
+
+	### How to get FPA coordinates from chip coordinates
+	CHIP.X0.DEPEND		STR	CHIP.NAME
+	CHIP.X0		METADATA
+		CCID58-1-06b	S32	0
+		CCID45-1-14A	S32	4100
+		CCID45-1-11A	S32	8200
+		CCID45-1-22A	S32	12300
+		CCID45-1-04C	S32	0
+		CCID45-1-13A	S32	4100
+		CCID45-1-05A	S32	8200    
+		CCID45-1-19A	S32	12300 
+	END
+	CHIP.Y0.DEPEND		STR	CHIP.NAME
+	CHIP.Y0		METADATA
+		CCID58-1-06b	S32	0
+		CCID45-1-14A	S32	0
+		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
+	END
+	CHIP.XPARITY.DEPEND	STR	CHIP.NAME
+	CHIP.XPARITY	METADATA
+		CCID58-1-06b	S32	+1
+		CCID45-1-14A	S32	+1
+		CCID45-1-11A	S32	+1
+		CCID45-1-22A	S32	+1
+		CCID45-1-04C	S32	+1
+		CCID45-1-13A	S32	+1
+		CCID45-1-05A	S32	+1
+		CCID45-1-19A	S32	+1
+	END
+	CHIP.YPARITY.DEPEND	STR	CHIP.NAME
+	CHIP.YPARITY	METADATA
+		CCID58-1-06b	S32	+1
+		CCID45-1-14A	S32	+1
+		CCID45-1-11A	S32	+1
+		CCID45-1-22A	S32	+1
+		CCID45-1-04C	S32	+1
+		CCID45-1-13A	S32	+1
+		CCID45-1-05A	S32	+1
+		CCID45-1-19A	S32	+1
+	END
 END