Index: /branches/czw_branch/20160809/ippconfig/hsc/camera.config
===================================================================
--- /branches/czw_branch/20160809/ippconfig/hsc/camera.config	(revision 39703)
+++ /branches/czw_branch/20160809/ippconfig/hsc/camera.config	(revision 39704)
@@ -3,6 +3,7 @@
 # File formats that we know about
 FORMATS         METADATA
+        MEF     STR     hsc/format_mef.config  # for output cmfs from, e.g., camera
         RAW     STR     hsc/format_raw.config
-        MEF     STR     hsc/format_mef.config  # for output cmfs from, e.g., camera
+        CMF     STR     hsc/format_cmf.config  # chip output cmfs
 #       SPLIT   STR     hsc/format_split.config
 END
Index: /branches/czw_branch/20160809/ippconfig/hsc/format_cmf.config
===================================================================
--- /branches/czw_branch/20160809/ippconfig/hsc/format_cmf.config	(revision 39704)
+++ /branches/czw_branch/20160809/ippconfig/hsc/format_cmf.config	(revision 39704)
@@ -0,0 +1,740 @@
+# The split MecaCam data is stored as single files for each chip, each a simple fits image
+
+# How to recognise this type
+RULE	METADATA
+	TELESCOP	STR	Subaru
+	INSTRUME	STR	Hyper Suprime-Cam
+ 	NAXIS           S32     0 # with 2 this is an image (with 0, this is an output smf)
+END
+
+FILE	METADATA
+	# How to read this data
+	PHU		STR	CHIP	# The FITS file represents an entire FPA
+	EXTENSIONS	STR	NONE	# The extensions represent chips
+	FPA.OBS		STR	EXP-ID	# A PHU keyword for unique identifier
+	CONTENT		STR	DET-ID	# Key to the CONTENTS menu (use DET-ID or T_CCDSN?)
+	CONTENT.RULE	STR	{CHIP.ID} # How to derive the CONTENT when writing
+END
+
+# What's in the FITS file?
+CONTENTS	METADATA
+    # Content name, chipType
+      0 STR      x000:S10892
+      1 STR      x001:S10892
+      2 STR      x002:S10892
+      3 STR      x003:S10892
+      4 STR      x004:S10892
+      5 STR      x005:S10892
+      6 STR      x006:S10892
+      7 STR      x007:S10892
+      8 STR      x008:S10892
+      9 STR      x009:S10892
+     10 STR      x010:S10892
+     11 STR      x011:S10892
+     12 STR      x012:S10892
+     13 STR      x013:S10892
+     14 STR      x014:S10892
+     15 STR      x015:S10892
+     16 STR      x016:S10892
+     17 STR      x017:S10892
+     18 STR      x018:S10892
+     19 STR      x019:S10892
+     20 STR      x020:S10892
+     21 STR      x021:S10892
+     22 STR      x022:S10892
+     23 STR      x023:S10892
+     24 STR      x024:S10892
+     25 STR      x025:S10892
+     26 STR      x026:S10892
+     27 STR      x027:S10892
+     28 STR      x028:S10892
+     29 STR      x029:S10892
+     30 STR      x030:S10892
+     31 STR      x031:S10892
+     32 STR      x032:S10892
+     33 STR      x033:S10892
+     34 STR      x034:S10892
+     35 STR      x035:S10892
+     36 STR      x036:S10892
+     37 STR      x037:S10892
+     38 STR      x038:S10892
+     39 STR      x039:S10892
+     40 STR      x040:S10892
+     41 STR      x041:S10892
+     42 STR      x042:S10892
+     43 STR      x043:S10892
+     44 STR      x044:S10892
+     45 STR      x045:S10892
+     46 STR      x046:S10892
+     47 STR      x047:S10892
+     48 STR      x048:S10892
+     49 STR      x049:S10892
+     50 STR      x050:S10892
+     51 STR      x051:S10892
+     52 STR      x052:S10892
+     53 STR      x053:S10892
+     54 STR      x054:S10892
+     55 STR      x055:S10892
+     56 STR      x056:S10892
+     57 STR      x057:S10892
+     58 STR      x058:S10892
+     59 STR      x059:S10892
+     60 STR      x060:S10892
+     61 STR      x061:S10892
+     62 STR      x062:S10892
+     63 STR      x063:S10892
+     64 STR      x064:S10892
+     65 STR      x065:S10892
+     66 STR      x066:S10892
+     67 STR      x067:S10892
+     68 STR      x068:S10892
+     69 STR      x069:S10892
+     70 STR      x070:S10892
+     71 STR      x071:S10892
+     72 STR      x072:S10892
+     73 STR      x073:S10892
+     74 STR      x074:S10892
+     75 STR      x075:S10892
+     76 STR      x076:S10892
+     77 STR      x077:S10892
+     78 STR      x078:S10892
+     79 STR      x079:S10892
+     80 STR      x080:S10892
+     81 STR      x081:S10892
+     82 STR      x082:S10892
+     83 STR      x083:S10892
+     84 STR      x084:S10892
+     85 STR      x085:S10892
+     86 STR      x086:S10892
+     87 STR      x087:S10892
+     88 STR      x088:S10892
+     89 STR      x089:S10892
+     90 STR      x090:S10892
+     91 STR      x091:S10892
+     92 STR      x092:S10892
+     93 STR      x093:S10892
+     94 STR      x094:S10892
+     95 STR      x095:S10892
+     96 STR      x096:S10892
+     97 STR      x097:S10892
+     98 STR      x098:S10892
+     99 STR      x099:S10892
+    100 STR      x100:S10892
+    101 STR      x101:S10892
+    102 STR      x102:S10892
+    103 STR      x103:S10892
+    104 STR      x104:S10892
+    105 STR      x105:S10892
+    106 STR      x106:S10892
+    107 STR      x107:S10892
+    108 STR      x108:S10892
+    109 STR      x109:S10892
+    110 STR      x110:S10892
+    111 STR      x111:S10892
+END
+
+# Specify the chips
+CHIPS		METADATA
+	# Chip type, cellName:cellType
+	S10892	STR	CH1:channel_1 CH2:channel_2 CH3:channel_3 CH4:channel_4
+END
+
+
+# Specify the cells
+CELLS		METADATA
+	# Cell type, concepts for this type
+	channel_1	METADATA
+		CELL.BIASSEC.SOURCE	STR	VALUE
+		CELL.TRIMSEC.SOURCE	STR	VALUE
+		CELL.BIASSEC		STR	[512:536,50:4225]
+		CELL.TRIMSEC		STR	[9:520,50:4225]
+		CELL.GAIN.SOURCE	STR	HEADER
+		CELL.GAIN		STR	T_GAIN1
+		CELL.X0			S32	0
+		CELL.Y0			S32	0
+	END
+	channel_2	METADATA
+		CELL.BIASSEC.SOURCE	STR	VALUE
+		CELL.TRIMSEC.SOURCE	STR	VALUE
+		CELL.BIASSEC		STR	[537:552,50:4225]
+		CELL.TRIMSEC		STR	[553:1064,50:4225]
+		CELL.GAIN.SOURCE	STR	HEADER
+		CELL.GAIN		STR	T_GAIN2
+		CELL.X0			S32	512
+		CELL.Y0			S32	0
+	END
+	channel_3	METADATA
+		CELL.BIASSEC.SOURCE	STR	VALUE
+		CELL.TRIMSEC.SOURCE	STR	VALUE
+		CELL.BIASSEC		STR	[1593:1608,50:4225]
+		CELL.TRIMSEC		STR	[1081:1592,50:4225]
+		CELL.GAIN.SOURCE	STR	HEADER
+		CELL.GAIN		STR	T_GAIN3
+		CELL.X0			S32	1024
+		CELL.Y0			S32	0
+	END
+	channel_4	METADATA
+		CELL.BIASSEC.SOURCE	STR	VALUE
+		CELL.TRIMSEC.SOURCE	STR	VALUE
+		CELL.BIASSEC		STR	[1609:1624,50:4225]
+		CELL.TRIMSEC		STR	[1625:2136,50:4225]
+		CELL.GAIN.SOURCE	STR	HEADER
+		CELL.GAIN		STR	T_GAIN4
+		CELL.X0			S32	1536
+		CELL.Y0			S32	0
+	END
+END
+
+# How to translate PS concepts into FITS headers
+TRANSLATION	METADATA
+        FPA.OBS         STR     EXP-ID
+        FPA.AIRMASS     STR     AIRMASS
+        FPA.FILTER      STR     FILTER01
+        FPA.FILTERID    STR     FILTER01
+#       FPA.POSANGLE    STR     INR-STR
+        FPA.POSANGLE    STR     INST-PA
+        FPA.RA          STR     RA
+        FPA.DEC         STR     DEC
+        FPA.RADECSYS    STR     RADESYS
+	FPA.OBSTYPE	STR	DATA-TYP
+	FPA.OBJECT	STR	OBJECT
+        FPA.OBS.MODE    STR     OBS-MOD
+#       FPA.COMMENT     STR     CMMTOBS
+	FPA.FOCUS	STR	FOC-VAL
+	FPA.TIME	STR	MJD-STR
+	FPA.TIMESYS	STR	TIMESYS
+	FPA.ALT		STR	ALTITUDE
+	FPA.AZ		STR	AZIMUTH
+	FPA.TEMP	STR	DET-TMP
+	FPA.EXPOSURE	STR	EXPTIME
+        FPA.M2X         STR     M2-POS1
+        FPA.M2Y         STR     M2-POS2
+        FPA.M2Z         STR     M2-POS3
+        FPA.M2TIP       STR     M2-ANG1
+        FPA.M2TILT      STR     M2-ANG2
+        FPA.ENV.TEMP    STR     OUT-TMP
+        FPA.ENV.HUMID   STR     OUT-HUM
+        FPA.ENV.WIND    STR     OUT-WND
+#       FPA.ENV.DIR     STR     OUT-TMP
+        FPA.TELTEMP.TRUSS  STR  DOM-TMP # Mid truss temperatures (C
+
+	CHIP.TEMP	STR	DET-TMP
+	CHIP.ID		STR	DET-ID
+        CELL.EXPOSURE   STR     EXPTIME
+        CELL.DARKTIME   STR     EXPTIME
+	CELL.TIME	STR	MJD-STR
+	CELL.TIMESYS	STR	TIMESYS
+        CELL.XBIN       STR     BIN-FCT1
+        CELL.YBIN       STR     BIN-FCT2
+END
+
+# Default PS concepts that may be specified by value
+DEFAULTS        METADATA
+	FPA.TELESCOPE		STR	SUBARU
+	FPA.INSTRUMENT		STR	HYPERSUPRIME
+	FPA.DETECTOR	        STR	HSC
+        FPA.LONGITUDE   	STR     10:25:01.417 # XXX haleakla
+        FPA.LATITUDE    	STR     20:42:25.558 # XXX haleakla
+        FPA.ELEVATION   	F32     3048.0       # altitude in meters
+#	FPA.TIMESYS	        STR	TAI
+	CHIP.XSIZE		S32	2048
+	CHIP.YSIZE		S32	4096
+	CELL.XSIZE		S32	512
+	CELL.YSIZE		S32	4176		# XXX: or 4096?
+	CELL.XWINDOW		S32	0
+	CELL.YWINDOW		S32	0
+        CELL.SATURATION         S32     60000
+	CELL.READDIR		S32	1		# Cell is read in x direction
+        CELL.READNOISE          F32     1.0		# XXX: set based on bias stats
+        CELL.BAD                F32     0
+	CELL.XPARITY		S32	1		# XXX may need to flip some of the cells
+	CELL.YPARITY		S32	1
+#	CELL.X0			S32	0
+#	CELL.Y0			S32	0
+#	CELL.TIMESYS	        STR	TAI
+	CHIP.XPARITY		S32	1		# XXX may need to flip some of the cells
+	CHIP.YPARITY		S32	1
+	CHIP.X0.DEPEND		STR	CHIP.NAME
+	CHIP.X0		METADATA
+          x000 S32  4165
+          x001 S32  4165
+          x002 S32  4165
+          x003 S32  4165
+          x004 S32  6288
+          x005 S32  6288
+          x006 S32  6288
+          x007 S32  6288
+          x008 S32  6288
+          x009 S32  6288
+          x010 S32  8411
+          x011 S32  8411
+          x012 S32  8411
+          x013 S32  8411
+          x014 S32  8411
+          x015 S32  8411
+          x016 S32  8484
+          x017 S32  8484
+          x018 S32  8484
+          x019 S32 10533
+          x020 S32 10533
+          x021 S32 10533
+          x022 S32 10607
+          x023 S32 10607
+          x024 S32 10607
+          x025 S32 10607
+          x026 S32 12656
+          x027 S32 12656
+          x028 S32 12656
+          x029 S32 12656
+          x030 S32 12730
+          x031 S32 12730
+          x032 S32 12730
+          x033 S32 12730
+          x034 S32 14779
+          x035 S32 14779
+          x036 S32 14779
+          x037 S32 14779
+          x038 S32 14852
+          x039 S32 14852
+          x040 S32 14852
+          x041 S32 14852
+          x042 S32 16901
+          x043 S32 16901
+          x044 S32 16901
+          x045 S32 16901
+          x046 S32 16975
+          x047 S32 16975
+          x048 S32 16975
+          x049 S32 16975
+          x050 S32 19024
+          x051 S32 19024
+          x052 S32 19024
+          x053 S32 19024
+          x054 S32 19098
+          x055 S32 19098
+          x056 S32 19098
+          x057 S32 19098
+          x058 S32 21147
+          x059 S32 21147
+          x060 S32 21147
+          x061 S32 21147
+          x062 S32 21220
+          x063 S32 21220
+          x064 S32 21220
+          x065 S32 21220
+          x066 S32 23269
+          x067 S32 23269
+          x068 S32 23269
+          x069 S32 23269
+          x070 S32 23343
+          x071 S32 23343
+          x072 S32 23343
+          x073 S32 23343
+          x074 S32 25392
+          x075 S32 25392
+          x076 S32 25392
+          x077 S32 25392
+          x078 S32 25466
+          x079 S32 25466
+          x080 S32 25466
+          x081 S32 27515
+          x082 S32 27515
+          x083 S32 27515
+          x084 S32 27588
+          x085 S32 27588
+          x086 S32 27588
+          x087 S32 27588
+          x088 S32 27588
+          x089 S32 27588
+          x090 S32 29711
+          x091 S32 29711
+          x092 S32 29711
+          x093 S32 29711
+          x094 S32 29711
+          x095 S32 29711
+          x096 S32 31834
+          x097 S32 31834
+          x098 S32 31834
+          x099 S32 31834
+          x100 S32  8484
+          x101 S32 10533
+          x102 S32 25466 # was 33357
+          x103 S32 27515 # was 4424
+          x104 S32  2043
+          x105 S32  2043
+          x106 S32  4165
+          x107 S32  4165
+          x108 S32 31834
+          x109 S32 31834
+          x110 S32 33956
+          x111 S32 33956
+	END
+	CHIP.Y0.DEPEND		STR	CHIP.NAME
+	CHIP.Y0		METADATA
+          x000 S32 13457
+          x001 S32 17926
+          x002 S32 22395
+          x003 S32 26863
+          x004 S32  8989
+          x005 S32 13457
+          x006 S32 17926
+          x007 S32 22395
+          x008 S32 26863
+          x009 S32 31332
+          x010 S32  8989
+          x011 S32 13457
+          x012 S32 17926
+          x013 S32 22395
+          x014 S32 26863
+          x015 S32 31332
+          x016 S32  4934
+          x017 S32  9402
+          x018 S32 13871
+          x019 S32 22395
+          x020 S32 26863
+          x021 S32 31332
+          x022 S32   465
+          x023 S32  4934
+          x024 S32  9402
+          x025 S32 13871
+          x026 S32 22395
+          x027 S32 26863
+          x028 S32 31332
+          x029 S32 35801
+          x030 S32   465
+          x031 S32  4934
+          x032 S32  9402
+          x033 S32 13871
+          x034 S32 22395
+          x035 S32 26863
+          x036 S32 31332
+          x037 S32 35801
+          x038 S32   465
+          x039 S32  4934
+          x040 S32  9402
+          x041 S32 13871
+          x042 S32 22395
+          x043 S32 26863
+          x044 S32 31332
+          x045 S32 35801
+          x046 S32   465
+          x047 S32  4934
+          x048 S32  9402
+          x049 S32 13871
+          x050 S32 22395
+          x051 S32 26863
+          x052 S32 31332
+          x053 S32 35801
+          x054 S32   465
+          x055 S32  4934
+          x056 S32  9402
+          x057 S32 13871
+          x058 S32 22395
+          x059 S32 26863
+          x060 S32 31332
+          x061 S32 35801
+          x062 S32   465
+          x063 S32  4934
+          x064 S32  9402
+          x065 S32 13871
+          x066 S32 22395
+          x067 S32 26863
+          x068 S32 31332
+          x069 S32 35801
+          x070 S32   465
+          x071 S32  4934
+          x072 S32  9402
+          x073 S32 13871
+          x074 S32 22395
+          x075 S32 26863
+          x076 S32 31332
+          x077 S32 35801
+          x078 S32  4934
+          x079 S32  9402
+          x080 S32 13871
+          x081 S32 22395
+          x082 S32 26863
+          x083 S32 31332
+          x084 S32  4934
+          x085 S32  9402
+          x086 S32 13871
+          x087 S32 18340
+          x088 S32 22808
+          x089 S32 27277
+          x090 S32  4934
+          x091 S32  9402
+          x092 S32 13871
+          x093 S32 18340
+          x094 S32 22808
+          x095 S32 27277
+          x096 S32  9402
+          x097 S32 13871
+          x098 S32 18340
+          x099 S32 22808
+          x100 S32   465 # was 4934 (rotated, false location)
+          x101 S32 35801 # was 31332
+          x102 S32   465 # was 29691 (rotated, false location)
+          x103 S32 35801 # was 29691
+          x104 S32 13457
+          x105 S32 26863
+          x106 S32  8989
+          x107 S32 31332
+          x108 S32  4934
+          x109 S32 27277
+          x110 S32  9402
+          x111 S32 22808
+	END
+	CHIP.XPARITY.DEPEND	STR	CHIP.NAME
+	CHIP.XPARITY	METADATA
+          x000 S32 -1
+          x001 S32 -1
+          x002 S32 -1
+          x003 S32 -1
+          x004 S32 -1
+          x005 S32 -1
+          x006 S32 -1
+          x007 S32 -1
+          x008 S32 -1
+          x009 S32 -1
+          x010 S32 -1
+          x011 S32 -1
+          x012 S32 -1
+          x013 S32 -1
+          x014 S32 -1
+          x015 S32 -1
+          x016 S32 +1
+          x017 S32 +1
+          x018 S32 +1
+          x019 S32 -1
+          x020 S32 -1
+          x021 S32 -1
+          x022 S32 +1
+          x023 S32 +1
+          x024 S32 +1
+          x025 S32 +1
+          x026 S32 -1
+          x027 S32 -1
+          x028 S32 -1
+          x029 S32 -1
+          x030 S32 +1
+          x031 S32 +1
+          x032 S32 +1
+          x033 S32 +1
+          x034 S32 -1
+          x035 S32 -1
+          x036 S32 -1
+          x037 S32 -1
+          x038 S32 +1
+          x039 S32 +1
+          x040 S32 +1
+          x041 S32 +1
+          x042 S32 -1
+          x043 S32 -1
+          x044 S32 -1
+          x045 S32 -1
+          x046 S32 +1
+          x047 S32 +1
+          x048 S32 +1
+          x049 S32 +1
+          x050 S32 -1
+          x051 S32 -1
+          x052 S32 -1
+          x053 S32 -1
+          x054 S32 +1
+          x055 S32 +1
+          x056 S32 +1
+          x057 S32 +1
+          x058 S32 -1
+          x059 S32 -1
+          x060 S32 -1
+          x061 S32 -1
+          x062 S32 +1
+          x063 S32 +1
+          x064 S32 +1
+          x065 S32 +1
+          x066 S32 -1
+          x067 S32 -1
+          x068 S32 -1
+          x069 S32 -1
+          x070 S32 +1
+          x071 S32 +1
+          x072 S32 +1
+          x073 S32 +1
+          x074 S32 -1
+          x075 S32 -1
+          x076 S32 -1
+          x077 S32 -1
+          x078 S32 +1
+          x079 S32 +1
+          x080 S32 +1
+          x081 S32 -1
+          x082 S32 -1
+          x083 S32 -1
+          x084 S32 +1
+          x085 S32 +1
+          x086 S32 +1
+          x087 S32 +1
+          x088 S32 +1
+          x089 S32 +1
+          x090 S32 +1
+          x091 S32 +1
+          x092 S32 +1
+          x093 S32 +1
+          x094 S32 +1
+          x095 S32 +1
+          x096 S32 +1
+          x097 S32 +1
+          x098 S32 +1
+          x099 S32 +1
+          x100 S32 +1
+          x101 S32 -1
+          x102 S32 +1
+          x103 S32 -1
+          x104 S32 -1
+          x105 S32 -1
+          x106 S32 -1
+          x107 S32 -1
+          x108 S32 +1
+          x109 S32 +1
+          x110 S32 +1
+          x111 S32 +1
+	END
+	CHIP.YPARITY.DEPEND	STR	CHIP.NAME
+	CHIP.YPARITY	METADATA
+          x000 S32 -1
+          x001 S32 -1
+          x002 S32 -1
+          x003 S32 -1
+          x004 S32 -1
+          x005 S32 -1
+          x006 S32 -1
+          x007 S32 -1
+          x008 S32 -1
+          x009 S32 -1
+          x010 S32 -1
+          x011 S32 -1
+          x012 S32 -1
+          x013 S32 -1
+          x014 S32 -1
+          x015 S32 -1
+          x016 S32 +1
+          x017 S32 +1
+          x018 S32 +1
+          x019 S32 -1
+          x020 S32 -1
+          x021 S32 -1
+          x022 S32 +1
+          x023 S32 +1
+          x024 S32 +1
+          x025 S32 +1
+          x026 S32 -1
+          x027 S32 -1
+          x028 S32 -1
+          x029 S32 -1
+          x030 S32 +1
+          x031 S32 +1
+          x032 S32 +1
+          x033 S32 +1
+          x034 S32 -1
+          x035 S32 -1
+          x036 S32 -1
+          x037 S32 -1
+          x038 S32 +1
+          x039 S32 +1
+          x040 S32 +1
+          x041 S32 +1
+          x042 S32 -1
+          x043 S32 -1
+          x044 S32 -1
+          x045 S32 -1
+          x046 S32 +1
+          x047 S32 +1
+          x048 S32 +1
+          x049 S32 +1
+          x050 S32 -1
+          x051 S32 -1
+          x052 S32 -1
+          x053 S32 -1
+          x054 S32 +1
+          x055 S32 +1
+          x056 S32 +1
+          x057 S32 +1
+          x058 S32 -1
+          x059 S32 -1
+          x060 S32 -1
+          x061 S32 -1
+          x062 S32 +1
+          x063 S32 +1
+          x064 S32 +1
+          x065 S32 +1
+          x066 S32 -1
+          x067 S32 -1
+          x068 S32 -1
+          x069 S32 -1
+          x070 S32 +1
+          x071 S32 +1
+          x072 S32 +1
+          x073 S32 +1
+          x074 S32 -1
+          x075 S32 -1
+          x076 S32 -1
+          x077 S32 -1
+          x078 S32 +1
+          x079 S32 +1
+          x080 S32 +1
+          x081 S32 -1
+          x082 S32 -1
+          x083 S32 -1
+          x084 S32 +1
+          x085 S32 +1
+          x086 S32 +1
+          x087 S32 +1
+          x088 S32 +1
+          x089 S32 +1
+          x090 S32 +1
+          x091 S32 +1
+          x092 S32 +1
+          x093 S32 +1
+          x094 S32 +1
+          x095 S32 +1
+          x096 S32 +1
+          x097 S32 +1
+          x098 S32 +1
+          x099 S32 +1
+          x100 S32 +1
+          x101 S32 -1
+          x102 S32 +1
+          x103 S32 -1
+          x104 S32 -1
+          x105 S32 -1
+          x106 S32 -1
+          x107 S32 -1
+          x108 S32 +1
+          x109 S32 +1
+          x110 S32 +1
+          x111 S32 +1
+	END
+END
+
+
+# How to translation PS concepts into database lookups
+DATABASE	METADATA
+	TYPE		dbEntry		TABLE		COLUMN		GIVENDBCOL	GIVENPS
+#	CELL.GAIN	dbEntry		Camera		gain		chipId,cellId	CHIP.NAME,CELL.NAME
+#	CELL.READNOISE	dbEntry		Camera		readNoise	chipId,cellId	CHIP.NAME,CELL.NAME
+
+# A database entry refers to a particular column (COLUMN) in a
+# particular table (TABLE), given certain PS concepts (GIVENPS) that
+# match certain database columns (GIVENDBCOL).
+END		
+
+# Where there might be some ambiguity, specify the format
+FORMATS		METADATA
+	FPA.RA		STR	HOURS
+	FPA.DEC		STR	DEGREES
+	FPA.TIME	STR	MJD
+	CELL.TIME	STR	MJD
+	FPA.LONGITUDE	STR	HOURS
+	FPA.LATITUDE	STR	DEGREES
+END
+ 
Index: /branches/czw_branch/20160809/ippconfig/hsc/psastro.config
===================================================================
--- /branches/czw_branch/20160809/ippconfig/hsc/psastro.config	(revision 39703)
+++ /branches/czw_branch/20160809/ippconfig/hsc/psastro.config	(revision 39704)
@@ -6,5 +6,5 @@
 DVO.GETSTAR.OUTFORMAT         STR      PS1_DEV_0
 DVO.GETSTAR.PHOTCODE          STR      i
-DVO.GETSTAR.MAX.RHO           F32      10000.0
+DVO.GETSTAR.MAX.RHO           F32      30000.0
 DVO.GETSTAR.MIN.MAG           F32      12.0
 DVO.GETSTAR.MIN.MAG.INST      F32     -15.0
@@ -31,8 +31,21 @@
 PHOTCODE.DATA METADATA
   FILTER   STR z
-  ZEROPT   F32 28.0
+  ZEROPT   F32 26.1
   PHOTCODE STR z
   GHOST_MAX_MAG                   F32 -25.0
 END
+
+# extra field for ref stars:
+PSASTRO.PHOTOM.WINDOW.SIGMA  F32 0.2
+
+PSASTRO.GRID.MIN.ANGLE F32 -2.0 # start angle (degrees)
+PSASTRO.GRID.MAX.ANGLE F32 +2.0
+PSASTRO.GRID.DEL.ANGLE F32  1.0
+
+PSASTRO.GRID.NREF.MAX  S32   1000 # max stars accepted for fitting
+PSASTRO.GRID.NRAW.MAX  S32   1000 # max stars accepted for fitting
+
+PSASTRO.GRID.MIN.INST.MAG.RAW       F32      -14
+PSASTRO.GRID.MAX.INST.MAG.RAW       F32       -9
 
 # pmAstromMatchFit
@@ -42,12 +55,45 @@
 
 # single-chip radius match in pixels
-PSASTRO.MATCH.RADIUS.N0 F32    90
-PSASTRO.MATCH.RADIUS.N1 F32    60
-PSASTRO.MATCH.RADIUS.N2 F32    30
-PSASTRO.MATCH.RADIUS.N3 F32    20
-PSASTRO.MATCH.RADIUS.N4 F32    20
-PSASTRO.MATCH.RADIUS.N5 F32    10
-PSASTRO.MATCH.RADIUS.N6 F32    10
-PSASTRO.MATCH.RADIUS.N7 F32    5
-PSASTRO.MATCH.FIT.NITER S32    8
+PSASTRO.MATCH.RADIUS.N0 F32    30
+PSASTRO.MATCH.RADIUS.N1 F32    20
+PSASTRO.MATCH.RADIUS.N2 F32    20
+PSASTRO.MATCH.RADIUS.N3 F32    10
+PSASTRO.MATCH.RADIUS.N4 F32    10
+PSASTRO.MATCH.RADIUS.N5 F32     8 # was 5
+PSASTRO.MATCH.RADIUS.N6 F32     2
+PSASTRO.MATCH.RADIUS.N7 F32     0
+PSASTRO.MATCH.FIT.NITER S32     6 # was 7
 
+# Mosaic Astrometry options
+PSASTRO.MOSAIC.MODE         BOOL   TRUE
+
+# for iterations >= N, require a single match per reference
+PSASTRO.MOSAIC.CHIP.NITER     S32      5  # fit clipping iterations (NOTE: last iteration is NITER, not NITER - 1)
+PSASTRO.MOSAIC.CHIP.NSIGMA    F32      3  # fit clipping sigmas
+PSASTRO.MOSAIC.UNIQ.ITER      S32      3  # for iterations >= N, require a single match per reference
+
+PSASTRO.MOSAIC.MAX.ERROR.N0 F32    0.00 # max allow error for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.ERROR.N1 F32    0.00 # max allow error for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.ERROR.N2 F32    0.00 # max allow error for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.ERROR.N3 F32    0.00 # max allow error for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.ERROR.N4 F32    0.00 # max allow error for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.ERROR.N5 F32    0.30 # max allow error for valid solution (arcsec)
+
+# mosaic radius match in pixels (do these make sense?)
+PSASTRO.MOSAIC.RADIUS.N0    F32    5
+PSASTRO.MOSAIC.RADIUS.N1    F32    10
+PSASTRO.MOSAIC.RADIUS.N2    F32    10
+PSASTRO.MOSAIC.RADIUS.N3    F32    5
+PSASTRO.MOSAIC.RADIUS.N4    F32    5
+PSASTRO.MOSAIC.RADIUS.N5    F32    3
+
+PSASTRO.MOSAIC.CHIP.ORDER     S32      1  # limit chip-fit order to 1
+PSASTRO.MOSAIC.CHIP.ORDER.N0  S32      0 # fit order (-1 means use default)
+PSASTRO.MOSAIC.CHIP.ORDER.N1  S32      0 # fit order (-1 means use default)
+PSASTRO.MOSAIC.CHIP.ORDER.N2  S32      1 # fit order (-1 means use default)
+PSASTRO.MOSAIC.CHIP.ORDER.N3  S32      1 # fit order (-1 means use default)
+PSASTRO.MOSAIC.CHIP.ORDER.N4  S32      3 # fit order (-1 means use default)
+PSASTRO.MOSAIC.CHIP.ORDER.N5  S32      3 # fit order (-1 means use default)
+
+PSASTRO.MODEL.REF.CHIP        STR      x050
+PSASTRO.MODEL.REF.CHIP.ANGLE  F32      90.0
