Index: trunk/ippconfig/isp/format.config
===================================================================
--- trunk/ippconfig/isp/format.config	(revision 8829)
+++ trunk/ippconfig/isp/format.config	(revision 8833)
@@ -1,19 +1,20 @@
-# Drop-dead simple camera with single chip with single cell
+# Pan-STARRS Imaging Sky Probe
 
 # How to identify this type
 RULE	METADATA
 	SIMPLE		BOOL	TRUE
-	NAXIS		S32	    2
-#    BITPIX      S32     16
-    TELESCOP    STR     ISP-1 
-    INSTRUME    STR     ISP-Apogee
-    DETECTOR    STR     ISP-Apogee-01
+	NAXIS		S32	2
+	TELESCOP	STR	ISP-1 
+	INSTRUME	STR	ISP-Apogee
+	DETECTOR	STR	ISP-Apogee-01
+	ISPCAMER	STR	Apogee U42
+	ISPVERS		F32	0.1
 END
 
 # How to read this data
 FILE	METADATA
-	PHU		    STR	    FPA	# The FITS file represents an entire FPA
-	EXTENSIONS	STR	    NONE	# There are no extensions
-	FPA.NAME	STR	    SEQID	# A PHU keyword for unique identifier within the hierarchy level
+	PHU		STR	FPA	# The FITS file represents an entire FPA
+	EXTENSIONS	STR	NONE	# There are no extensions
+	FPA.NAME	STR	SEQID	# A PHU keyword for unique identifier within the hierarchy level
 END
 
@@ -24,8 +25,8 @@
 CELLS	METADATA
 	amplifier	METADATA
-		CELL.TRIMSEC.SOURCE	STR	VALUE
-		CELL.BIASSEC.SOURCE	STR	VALUE
-		CELL.TRIMSEC		STR	[1:2048,1:2048]
-		CELL.BIASSEC		STR	[2049:2098,1:2048]
+		CELL.TRIMSEC.SOURCE	STR	HEADER
+		CELL.BIASSEC.SOURCE	STR	HEADER
+		CELL.TRIMSEC		STR	TRIMSEC
+		CELL.BIASSEC		STR	BIASSEC
 	END
 END
@@ -34,22 +35,23 @@
 TRANSLATION	METADATA
 	FPA.FILTER	STR	FILTNAME
+	FPA.RA		STR	RA
+	FPA.DEC		STR	DEC
+	FPA.RADECSYS	STR	RADECSYS
+	FPA.POSANGLE	STR	ROTANGLE
+	FPA.AIRMASS	STR	AIRMASS
 	CELL.EXPOSURE	STR	EXPTIME
-	CELL.DARKTIME	STR	EXPTIME		# Doesn't seem to be a concept of "dark time", so use EXPTIME
+	CELL.DARKTIME	STR	DARKTIME
 	CELL.TIME	STR	MJD-OBS
-
-### These aren't in the header, but probably should be
-#	FPA.AIRMASS	STR	AIRMASS
-#	FPA.POSANGLE	STR	POSANG
-#	FPA.RA		STR	OBJ-RA
-#	FPA.DEC		STR	OBJ-DEC
-#	CELL.XBIN	STR	CCDSUM
-#	CELL.YBIN	STR	CCDSUM
+	CELL.GAIN	STR	GAIN
+	CELL.READNOISE	STR	RDNOISE
+	CELL.XBIN	STR	XBIN
+	CELL.YBIN	STR	YBIN
+#	CELL.SATURATION	STR	SATURATE	### Currently set to 0 ???
+	CELL.BAD	STR	BADLEVEL
 END
 
 # Default PS concepts that may be specified by value
 DEFAULTS	METADATA
-	FPA.RADECSYS	STR	ICRS
 	CELL.SATURATION	F32	65535
-	CELL.BAD	F32	0
 	CELL.READDIR	S32	1
 	CELL.TIMESYS	STR	UTC
@@ -62,14 +64,4 @@
 	CELL.X0		S32	0
 	CELL.Y0		S32	0
-
-### I hope these end up in the header or somewhere more sensible
-	FPA.AIRMASS	F32	0.0
-	FPA.POSANGLE	F32	0.0
-	FPA.RA		F32	0.0
-	FPA.DEC		F32	0.0
-	CELL.XBIN	S32	1
-	CELL.YBIN	S32	1	
-	CELL.GAIN	F32	1.0
-	CELL.READNOISE	F32	0.0
 END