Index: /trunk/ippconfig/hsc/camera.config
===================================================================
--- /trunk/ippconfig/hsc/camera.config	(revision 39504)
+++ /trunk/ippconfig/hsc/camera.config	(revision 39504)
@@ -0,0 +1,223 @@
+# Camera configuration file for MegaCam: describes the camera
+
+# File formats that we know about
+FORMATS         METADATA
+        RAW     STR     hsc/format_raw.config
+        MEF     STR     hsc/format_mef.config  # for output cmfs from, e.g., camera
+#       SPLIT   STR     hsc/format_split.config
+END
+
+# Description of camera --- all the chips and the cells that comprise them
+FPA     METADATA
+        x000   STR     CH1 CH2 CH3 CH4
+        x001   STR     CH1 CH2 CH3 CH4
+        x002   STR     CH1 CH2 CH3 CH4
+        x003   STR     CH1 CH2 CH3 CH4
+        x004   STR     CH1 CH2 CH3 CH4
+        x005   STR     CH1 CH2 CH3 CH4
+        x006   STR     CH1 CH2 CH3 CH4
+        x007   STR     CH1 CH2 CH3 CH4
+        x008   STR     CH1 CH2 CH3 CH4
+        x009   STR     CH1 CH2 CH3 CH4
+        x010   STR     CH1 CH2 CH3 CH4
+        x011   STR     CH1 CH2 CH3 CH4
+        x012   STR     CH1 CH2 CH3 CH4
+        x013   STR     CH1 CH2 CH3 CH4
+        x014   STR     CH1 CH2 CH3 CH4
+        x015   STR     CH1 CH2 CH3 CH4
+        x016   STR     CH1 CH2 CH3 CH4
+        x017   STR     CH1 CH2 CH3 CH4
+        x018   STR     CH1 CH2 CH3 CH4
+        x019   STR     CH1 CH2 CH3 CH4
+        x020   STR     CH1 CH2 CH3 CH4
+        x021   STR     CH1 CH2 CH3 CH4
+        x022   STR     CH1 CH2 CH3 CH4
+        x023   STR     CH1 CH2 CH3 CH4
+        x024   STR     CH1 CH2 CH3 CH4
+        x025   STR     CH1 CH2 CH3 CH4
+        x026   STR     CH1 CH2 CH3 CH4
+        x027   STR     CH1 CH2 CH3 CH4
+        x028   STR     CH1 CH2 CH3 CH4
+        x029   STR     CH1 CH2 CH3 CH4
+        x030   STR     CH1 CH2 CH3 CH4
+        x031   STR     CH1 CH2 CH3 CH4
+        x032   STR     CH1 CH2 CH3 CH4
+        x033   STR     CH1 CH2 CH3 CH4
+        x034   STR     CH1 CH2 CH3 CH4
+        x035   STR     CH1 CH2 CH3 CH4
+        x036   STR     CH1 CH2 CH3 CH4
+        x037   STR     CH1 CH2 CH3 CH4
+        x038   STR     CH1 CH2 CH3 CH4
+        x039   STR     CH1 CH2 CH3 CH4
+        x040   STR     CH1 CH2 CH3 CH4
+        x041   STR     CH1 CH2 CH3 CH4
+        x042   STR     CH1 CH2 CH3 CH4
+        x043   STR     CH1 CH2 CH3 CH4
+        x044   STR     CH1 CH2 CH3 CH4
+        x045   STR     CH1 CH2 CH3 CH4
+        x046   STR     CH1 CH2 CH3 CH4
+        x047   STR     CH1 CH2 CH3 CH4
+        x048   STR     CH1 CH2 CH3 CH4
+        x049   STR     CH1 CH2 CH3 CH4
+        x050   STR     CH1 CH2 CH3 CH4
+        x051   STR     CH1 CH2 CH3 CH4
+        x052   STR     CH1 CH2 CH3 CH4
+        x053   STR     CH1 CH2 CH3 CH4
+        x054   STR     CH1 CH2 CH3 CH4
+        x055   STR     CH1 CH2 CH3 CH4
+        x056   STR     CH1 CH2 CH3 CH4
+        x057   STR     CH1 CH2 CH3 CH4
+        x058   STR     CH1 CH2 CH3 CH4
+        x059   STR     CH1 CH2 CH3 CH4
+        x060   STR     CH1 CH2 CH3 CH4
+        x061   STR     CH1 CH2 CH3 CH4
+        x062   STR     CH1 CH2 CH3 CH4
+        x063   STR     CH1 CH2 CH3 CH4
+        x064   STR     CH1 CH2 CH3 CH4
+        x065   STR     CH1 CH2 CH3 CH4
+        x066   STR     CH1 CH2 CH3 CH4
+        x067   STR     CH1 CH2 CH3 CH4
+        x068   STR     CH1 CH2 CH3 CH4
+        x069   STR     CH1 CH2 CH3 CH4
+        x070   STR     CH1 CH2 CH3 CH4
+        x071   STR     CH1 CH2 CH3 CH4
+        x072   STR     CH1 CH2 CH3 CH4
+        x073   STR     CH1 CH2 CH3 CH4
+        x074   STR     CH1 CH2 CH3 CH4
+        x075   STR     CH1 CH2 CH3 CH4
+        x076   STR     CH1 CH2 CH3 CH4
+        x077   STR     CH1 CH2 CH3 CH4
+        x078   STR     CH1 CH2 CH3 CH4
+        x079   STR     CH1 CH2 CH3 CH4
+        x080   STR     CH1 CH2 CH3 CH4
+        x081   STR     CH1 CH2 CH3 CH4
+        x082   STR     CH1 CH2 CH3 CH4
+        x083   STR     CH1 CH2 CH3 CH4
+        x084   STR     CH1 CH2 CH3 CH4
+        x085   STR     CH1 CH2 CH3 CH4
+        x086   STR     CH1 CH2 CH3 CH4
+        x087   STR     CH1 CH2 CH3 CH4
+        x088   STR     CH1 CH2 CH3 CH4
+        x089   STR     CH1 CH2 CH3 CH4
+        x090   STR     CH1 CH2 CH3 CH4
+        x091   STR     CH1 CH2 CH3 CH4
+        x092   STR     CH1 CH2 CH3 CH4
+        x093   STR     CH1 CH2 CH3 CH4
+        x094   STR     CH1 CH2 CH3 CH4
+        x095   STR     CH1 CH2 CH3 CH4
+        x096   STR     CH1 CH2 CH3 CH4
+        x097   STR     CH1 CH2 CH3 CH4
+        x098   STR     CH1 CH2 CH3 CH4
+        x099   STR     CH1 CH2 CH3 CH4
+        x100   STR     CH1 CH2 CH3 CH4
+        x101   STR     CH1 CH2 CH3 CH4
+        x102   STR     CH1 CH2 CH3 CH4
+        x103   STR     CH1 CH2 CH3 CH4
+        x104   STR     CH1 CH2 CH3 CH4
+        x105   STR     CH1 CH2 CH3 CH4
+        x106   STR     CH1 CH2 CH3 CH4
+        x107   STR     CH1 CH2 CH3 CH4
+        x108   STR     CH1 CH2 CH3 CH4
+        x109   STR     CH1 CH2 CH3 CH4
+        x110   STR     CH1 CH2 CH3 CH4
+        x111   STR     CH1 CH2 CH3 CH4
+#       ccd112   STR     LeftAmp RightAmp # guide ccds are not saved
+#       ccd113   STR     LeftAmp RightAmp # guide ccds are not saved
+#       ccd114   STR     LeftAmp RightAmp # guide ccds are not saved
+#       ccd115   STR     LeftAmp RightAmp # guide ccds are not saved
+END
+
+# move this elsewhere?  we need a lookup table to go from filter ID to abstract name
+FILTER.ID       METADATA
+   g        STR   HSC-g
+   r        STR   HSC-r
+   i        MULTI
+   i        STR   HSC-i
+   i        STR   HSC-i2
+   z        STR   HSC-z
+END
+
+# Table of strings to use for the class identifier (see ippdb) according to the file level.
+CLASSID         METADATA
+        FPA     STR     fpa
+        CHIP    STR     {CHIP.NAME}
+        CELL    STR     {CHIP.NAME}:{CELL.NAME}
+        fpa     STR     fpa
+        chip    STR     {CHIP.NAME}
+        cell    STR     {CHIP.NAME}:{CELL.NAME}
+END
+
+DVO.CAMERADIR	STR	megacam		# Camera directory for DVO
+
+# convert supplied FPA.OBSTYPE values to abstract exptype names
+OBSTYPE.TABLE METADATA
+  bias     STR BIAS
+  zero     STR BIAS
+  dark     STR DARK
+  flat     STR SKYFLAT
+  skyflat  STR SKYFLAT
+  domeflat STR DOMEFLAT
+  object   STR OBJECT
+  science  STR OBJECT
+END
+
+# Recipe options
+RECIPES         METADATA
+        # Other recipes
+#       PSPHOT          STR     hsc/psphot.config           # psphot details
+        PSASTRO         STR     hsc/psastro.config          # psastro details
+#	PSWARP		STR	hsc/pswarp.config		# pswarp details
+        PPIMAGE         STR     hsc/ppImage.config          # ppImage recipe
+#	REJECTIONS      STR     hsc/rejections.config       # rejection recipe
+	PPMERGE		STR	hsc/ppMerge.config		# ppMerge recipe
+#	PPSTACK		STR	hsc/ppStack.config          # ppStack recipe
+        PPSTATS         STR     hsc/ppStats.config
+END
+
+# reduction classes (recipes which are grouped together)
+REDUCTION	STR	recipes/reductionClasses.mdc
+
+FITSTYPES       STR     recipes/fitstypes.mdc
+
+FILERULES	STR	recipes/filerules-split.mdc		# File rules appropriate for MEF format
+
+EXTNAME.RULES METADATA
+  CMF.HEAD   STR {CHIP.NAME}.hdr
+  CMF.DATA   STR {CHIP.NAME}.psf # use .PSF and .EXT?
+  CMF.XSRC STR {CHIP.NAME}.xsrc # use .PSF and .EXT?
+  CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT?
+  CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT?
+  CMF.DETEFF STR {CHIP.NAME}.deteff
+
+  PSF.HEAD   STR {CHIP.NAME}.hdr
+  PSF.TABLE  STR {CHIP.NAME}.psf_model
+  PSF.RESID  STR {CHIP.NAME}.psf_resid
+
+  REF.ASTROM STR {CHIP.NAME}.ref_astrom
+END
+
+BLANK.HEADERS	METADATA
+	FPA.TIME	STR	MJD-OBS
+	FPA.EXPOSURE	STR	EXPTIME
+	FPA.AIRMASS	STR	AIRMASS
+	FPA.OBS		STR	EXPNUM
+END
+
+PHOTCODE.RULE           STR     {DETECTOR}.{FILTER.ID}.{CHIP.N}		# Rule for generating photcode
+
+BURNTOOL.STATE.GOOD        S16  0  # Value for burntool_state with the most recent bt version.
+BURNTOOL.STATE.GOOD.UPDATE S16  0  # for upddate processing accept earlier version
+
+FOV_REF                     F32     0   # Field of view of unvignetted region in FPA pixels.
+FOV_MAX			    F32	    0
+NPIX_REF 		    S32	    0
+NPIX_MAX		    S32	    0
+NPIX_INTERCHIP              S32     0
+
+# This sets the maximum size for the fwhm_major.  This is roughly 3", and 98.67% of all exposures in the database are less than this.
+MAX_ALLOWED_FWHM          F32         25
+
+# don't censor any masked pixels
+MASK.NO.CENSOR          U32 4294967295
+
+METADATA.COMPRESSION         STR      7f # compression mode (nM): n = 1-9, M = f (filtered), h (Huffman), R (run-length)
Index: /trunk/ippconfig/hsc/format_mef.config
===================================================================
--- /trunk/ippconfig/hsc/format_mef.config	(revision 39504)
+++ /trunk/ippconfig/hsc/format_mef.config	(revision 39504)
@@ -0,0 +1,741 @@
+# 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
+	PSFORMAT        STR     MEF
+#	NAXIS           S32     2 # with 2 this is an image (with 0, this is an output smf)
+END
+
+FILE	METADATA
+	# How to read this data
+	PHU		STR	FPA	# The FITS file represents an entire FPA
+	EXTENSIONS	STR	CHIP	# 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 (not sure which is right)
+        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.TIMESYS	STR	TAI
+#	CELL.X0			S32	0
+#	CELL.Y0			S32	0
+	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: /trunk/ippconfig/hsc/format_raw.config
===================================================================
--- /trunk/ippconfig/hsc/format_raw.config	(revision 39504)
+++ /trunk/ippconfig/hsc/format_raw.config	(revision 39504)
@@ -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     2 # 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 (not sure which is right)
+        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: /trunk/ippconfig/hsc/mkchips
===================================================================
--- /trunk/ippconfig/hsc/mkchips	(revision 39504)
+++ /trunk/ippconfig/hsc/mkchips	(revision 39504)
@@ -0,0 +1,4 @@
+kukui: ls biases/HSCA90264[01]??.fits | fields DET-ID CRVAL1 CRVAL2 CRPIX1 CRPIX2 CD1_1 CD1_2 CD2_1 CD2_2 | awk '($8 < 0.0){dx = 1}($8 > 0.0){dx = -1}{printf "x%03d S32 %+2d\n", $2, dx}' | sort -k 1 > chip.dx
+kukui: ls biases/HSCA90264[01]??.fits | fields DET-ID CRVAL1 CRVAL2 CRPIX1 CRPIX2 CD1_1 CD1_2 CD2_1 CD2_2 | awk '($8 < 0.0){dx = 1}($8 > 0.0){dx = -1}{printf "x%03d S32 %+2d\n", $2, dx}' | sort -k 1 > chip.dy
+kukui: ls biases/HSCA90264[01]??.fits | fields DET-ID CRVAL1 CRVAL2 CRPIX1 CRPIX2 CD1_1 CD1_2 CD2_1 CD2_2 | awk '($8 < 0.0){y0 = 18000-$6}($8 > 0.0){y0 = 18000+$6}{printf "x%03d S32 %5d\n", $2, y0}' | sort -k 1 > chip.y0
+kukui: ls biases/HSCA90264[01]??.fits | fields DET-ID CRVAL1 CRVAL2 CRPIX1 CRPIX2 CD1_1 CD1_2 CD2_1 CD2_2 | awk '($8 < 0.0){x0 = 18000-$5}($8 > 0.0){x0 = 18000+$5}{printf "x%03d S32 %5d\n", $2, x0}' | sort -k 1 > chip.x0
Index: /trunk/ippconfig/hsc/ppImage.config
===================================================================
--- /trunk/ippconfig/hsc/ppImage.config	(revision 39504)
+++ /trunk/ippconfig/hsc/ppImage.config	(revision 39504)
@@ -0,0 +1,123 @@
+
+# binned output image options
+BIN1.XBIN               S32      16
+BIN1.YBIN               S32      16
+BIN2.XBIN               S32     256
+BIN2.YBIN               S32     256
+
+# Normalization class
+NORM.CLASS              STR     CHIP             # How to find the per-class normalizations
+
+DETREND.CONSTRAINTS  METADATA
+  FLAT METADATA
+    DETTYPE STR FLAT
+    FILTER  STR FPA.FILTERID
+  END
+END   
+
+# Standard chip processing
+CHIP	METADATA
+  BASE.FITS          BOOL    FALSE           # Save base detrended image?
+  BASE.MASK.FITS     BOOL    FALSE           # Save base detrended image?
+  BASE.VARIANCE.FITS BOOL    FALSE           # Save base detrended image?
+  CHIP.FITS          BOOL    TRUE            # Save chip-mosaic-ed image? 
+  CHIP.MASK.FITS     BOOL    TRUE            # Save chip-mosaic-ed image? 
+  CHIP.VARIANCE.FITS BOOL    TRUE            # Save chip-mosaic-ed image? 
+  OVERSCAN           BOOL    TRUE            # Overscan subtraction
+  NONLIN             BOOL    FALSE           # Non-linearity correction; not implemented
+  BIAS               BOOL    TRUE            # Bias subtraction
+  DARK               BOOL    FALSE           # Dark subtraction
+  SHUTTER            BOOL    FALSE           # Shutter correction
+  FLAT               BOOL    TRUE            # Flat-field normalisation
+  MASK               BOOL    TRUE            # Mask bad pixels
+  FRINGE             BOOL    FALSE           # Fringe subtraction
+  BIN1.FITS          BOOL    TRUE            # Save 1st binned chip image?
+  BIN2.FITS          BOOL    TRUE            # Save 2nd binned chip image?
+  PHOTOM             BOOL    TRUE            # Source identification and photometry
+  ASTROM.CHIP        BOOL    FALSE           # Astrometry per chip?
+  ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
+  BACKGROUND         BOOL    TRUE            # Subtract background?
+  MASK.STATS         BOOL    TRUE            # Calculate Mask statistics.
+END
+
+# No operation except rebinning and potential normalisation
+# used by the detrend normalization stage, the background should not be subtracted
+PPIMAGE_N          METADATA
+  BASE.FITS          BOOL    TRUE            # Save base detrended image?
+  BASE.MASK.FITS     BOOL    FALSE           # Save base detrended image?
+  BASE.VARIANCE.FITS BOOL    FALSE           # Save base detrended image?
+  CHIP.FITS          BOOL    FALSE           # Save chip-mosaic-ed image? 
+  CHIP.MASK.FITS     BOOL    FALSE           # Save chip-mosaic-ed image? 
+  CHIP.VARIANCE.FITS BOOL    FALSE           # Save chip-mosaic-ed image? 
+  OVERSCAN           BOOL    FALSE           # Overscan subtraction
+  NONLIN             BOOL    FALSE           # Non-linearity correction; not implemented
+  BIAS               BOOL    FALSE           # Bias subtraction
+  DARK               BOOL    FALSE           # Dark subtraction
+  SHUTTER            BOOL    FALSE           # Shutter correction
+  FLAT               BOOL    FALSE           # Flat-field normalisation
+  MASK               BOOL    FALSE           # Mask bad pixels
+  MASK.BUILD	     BOOL    FALSE           # Build internal mask?
+  FRINGE             BOOL    FALSE           # Fringe subtraction
+  PHOTOM             BOOL    FALSE           # Source identification and photometry
+  ASTROM.CHIP        BOOL    FALSE           # Astrometry per chip?
+  ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
+  BIN1.FITS          BOOL    TRUE            # Save 1st binned chip image?
+  BIN2.FITS          BOOL    TRUE            # Save 2nd binned chip image?
+  BACKGROUND         BOOL    FALSE           # Subtract background?
+END
+
+# Overscan, bias, dark, shutter
+PPIMAGE_OBDS       METADATA
+  BASE.FITS          BOOL    TRUE            # Save base detrended image?
+  BASE.MASK.FITS     BOOL    TRUE            # Save base detrended image?
+  BASE.VARIANCE.FITS BOOL    TRUE            # Save base detrended image?
+  CHIP.FITS          BOOL    FALSE           # Save chip-mosaic-ed image? 
+  CHIP.MASK.FITS     BOOL    FALSE           # Save chip-mosaic-ed image? 
+  CHIP.VARIANCE.FITS BOOL    FALSE           # Save chip-mosaic-ed image? 
+  OVERSCAN           BOOL    TRUE            # Overscan subtraction
+  NONLIN             BOOL    FALSE           # Non-linearity correction; not implemented
+  BIAS               BOOL    TRUE            # Bias subtraction
+  DARK               BOOL    FALSE           # Dark subtraction
+  SHUTTER            BOOL    FALSE           # Shutter correction
+  FLAT               BOOL    FALSE           # Flat-field normalisation
+  MASK               BOOL    FALSE           # Mask bad pixels
+  MASK.BUILD         BOOL    FALSE	     # Build internal mask?
+  FRINGE             BOOL    FALSE           # Fringe subtraction
+  PHOTOM             BOOL    FALSE           # Source identification and photometry
+  ASTROM.CHIP        BOOL    FALSE           # Astrometry per chip?
+  ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
+  BIN1.FITS          BOOL    TRUE            # Save 1st binned chip image?
+  BIN2.FITS          BOOL    TRUE            # Save 2nd binned chip image?
+END
+
+# Overscan, bias, dark, shutter, flat-field -- use FLAT_PREMASK
+PPIMAGE_FLATMASK_PROCESS      METADATA
+  BASE.FITS        BOOL    TRUE            # Save base detrended image?
+  BASE.MASK.FITS   BOOL    TRUE            # Save base detrended image?
+  BASE.VARIANCE.FITS BOOL  TRUE            # Save base detrended image?
+  CHIP.FITS        BOOL    FALSE           # Save chip-mosaic-ed image? 
+  CHIP.MASK.FITS   BOOL    FALSE           # Save chip-mosaic-ed image? 
+  CHIP.VARIANCE.FITS BOOL  FALSE           # Save chip-mosaic-ed image? 
+  OVERSCAN         BOOL    TRUE            # Overscan subtraction
+  NONLIN           BOOL    FALSE           # Non-linearity correction; not implemented
+  BIAS             BOOL    TRUE            # Bias subtraction
+  DARK             BOOL    FALSE           # Dark subtraction
+  SHUTTER          BOOL    FALSE           # Shutter correction
+  FLAT             BOOL    TRUE            # Flat-field normalisation
+  MASK             BOOL    FALSE           # Mask bad pixels
+  MASK.BUILD       BOOL    FALSE	   # Build internal mask?
+  FRINGE           BOOL    FALSE           # Fringe subtraction
+  PHOTOM           BOOL    FALSE           # Source identification and photometry
+  ASTROM.CHIP      BOOL    FALSE           # Astrometry per chip?
+  ASTROM.MOSAIC    BOOL    FALSE           # Astrometry for mosaic?
+  BIN1.FITS        BOOL    TRUE            # Save 1st binned chip image?
+  BIN2.FITS        BOOL    TRUE            # Save 2nd binned chip image?
+
+  DETREND.CONSTRAINTS  METADATA
+    FLAT METADATA
+      DETTYPE STR FLAT
+      FILTER  STR FPA.FILTERID
+    END
+  END   
+END
+
Index: /trunk/ippconfig/hsc/ppMerge.config
===================================================================
--- /trunk/ippconfig/hsc/ppMerge.config	(revision 39504)
+++ /trunk/ippconfig/hsc/ppMerge.config	(revision 39504)
@@ -0,0 +1,13 @@
+
+# Bias combination --- don't want min/max rejection
+PPMERGE_BIAS    METADATA
+        REJ             F32     3.0             # Rejection threshold (sigma)
+        ITER            S32     2               # Number of rejection iterations
+        FRACHIGH        F32     0.0             # Fraction of high pixels to reject immediately
+        FRACLOW         F32     0.0             # Fraction of low pixels to reject immediately
+        VARIANCES       BOOL    FALSE           # Use image variances?
+#       COMBINE         STR     CLIPPED         # Statistic to use for combination: 
+        COMBINE         STR     SAMPLE_MEDIAN   # Statistic to use for combination
+        MEAN            STR     SAMPLE_MEDIAN   # Statistic to use to measure the mean
+        STDEV           STR     ROBUST_STDEV    # Statistic to use to measure the stdev
+END
Index: /trunk/ippconfig/hsc/ppStats.config
===================================================================
--- /trunk/ippconfig/hsc/ppStats.config	(revision 39504)
+++ /trunk/ippconfig/hsc/ppStats.config	(revision 39504)
@@ -0,0 +1,1 @@
+
Index: /trunk/ippconfig/hsc/psastro.config
===================================================================
--- /trunk/ippconfig/hsc/psastro.config	(revision 39504)
+++ /trunk/ippconfig/hsc/psastro.config	(revision 39504)
@@ -0,0 +1,53 @@
+
+PSASTRO.SAVE.REFMATCH         BOOL     T  # save refstars in a separate FITS table
+PSASTRO.SAVE.REFSTARS         BOOL     F  # save refstars in a separate FITS file (broken!)
+PSASTRO.CATDIR                STR      PS1.REF.20140713
+DVO.GETSTAR                   STR      getstar
+DVO.GETSTAR.OUTFORMAT         STR      PS1_DEV_0
+DVO.GETSTAR.PHOTCODE          STR      i
+DVO.GETSTAR.MAX.RHO           F32      10000.0
+DVO.GETSTAR.MIN.MAG           F32      12.0
+DVO.GETSTAR.MIN.MAG.INST      F32     -15.0
+
+PHOTCODE.DATA MULTI
+PHOTCODE.DATA METADATA
+  FILTER   STR g
+  ZEROPT   F32 28.0
+  PHOTCODE STR g
+  GHOST_MAX_MAG                   F32 -16.5
+END
+PHOTCODE.DATA METADATA
+  FILTER   STR r
+  ZEROPT   F32 28.0
+  PHOTCODE STR r
+  GHOST_MAX_MAG                   F32 -20.0
+END
+PHOTCODE.DATA METADATA
+  FILTER   STR i
+  ZEROPT   F32 26.9
+  PHOTCODE STR i
+  GHOST_MAX_MAG                   F32 -25.0
+END
+PHOTCODE.DATA METADATA
+  FILTER   STR z
+  ZEROPT   F32 28.0
+  PHOTCODE STR z
+  GHOST_MAX_MAG                   F32 -25.0
+END
+
+# pmAstromMatchFit
+PSASTRO.CHIP.ORDER     S32      3  # fit order
+PSASTRO.CHIP.NITER     S32      3  # fit clipping iterations
+PSASTRO.CHIP.NSIGMA    F32      3  # fit clipping sigmas
+
+# 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
+
Index: /trunk/ippconfig/system.config
===================================================================
--- /trunk/ippconfig/system.config	(revision 39503)
+++ /trunk/ippconfig/system.config	(revision 39504)
@@ -3,5 +3,5 @@
 ### Setups for each camera system
 CAMERAS		METADATA
-	MEGACAM			STR	megacam/camera.config		# CFHT MegaCam
+ 	MEGACAM			STR	megacam/camera.config		# CFHT MegaCam
 	CFH12K			STR	cfh12k/camera.config		# CFHT 12K
 	ISP-Apogee     		STR	isp/camera.config		# Pan-STARRS Imaging sky probe
@@ -20,4 +20,5 @@
 	VYSOS20			STR	vysos20/camera.config		# VYSOS 5in
 	SSP			STR	ssp/camera.config		# Pan-STARRS spectroscopic sky probe
+	HSC			STR	hsc/camera.config		# Subaru Hypersuprime cam
 	SUPRIMECAM		STR	suprime/camera.config           # Subaru Suprimecam
 	SIMMOSAIC		STR	simmosaic/camera.config		# Simulated mosaic, for testing
