Index: /branches/sj_branch_20080802/ippconfig/sdssmosaic/camera.config
===================================================================
--- /branches/sj_branch_20080802/ippconfig/sdssmosaic/camera.config	(revision 18911)
+++ /branches/sj_branch_20080802/ippconfig/sdssmosaic/camera.config	(revision 18912)
@@ -68,5 +68,5 @@
  		JPEG_BIN2       STR     PPIMAGE_J2
 	END
-        # photometry only for pre-detrended images
+        # photometry and astrometry for pre-detrended images
 	SDSSphotast	METADATA
 		CHIP		STR	PPIMAGE_OA_SOFT
Index: /branches/sj_branch_20080802/ippconfig/sdssmosaic/format.config
===================================================================
--- /branches/sj_branch_20080802/ippconfig/sdssmosaic/format.config	(revision 18911)
+++ /branches/sj_branch_20080802/ippconfig/sdssmosaic/format.config	(revision 18912)
@@ -20,4 +20,5 @@
 	CHIP.NAME	STR	CAMCOL	# Distinguishes chip name
 	CONTENT		STR	CAMCOL
+ # Is the following line the origin of the weirdly named output files?
 	CONTENT.RULE	STR	{CHIP.NUM} # How to derive the CONTENT when writing
 END
@@ -98,5 +99,10 @@
 # Default PS concepts that may be specified by value
 DEFAULTS	METADATA
-	FPA.INSTRUMENT	STR	SDSSmosaic
+# FPA.CAMERA contains the name of the camera according to the config system (i.e. SDSSmosaic)
+# FPA.INSTRUMENT contains the name of the camera according to the fits headers (i.e. itself)
+# Normally, this will be in the header keyword INSTRUME but for this one, we override it to 
+# SDSSmosaic to avoid confusion between this and the non-mosaic SDSS configuration.
+	INSTRUME	STR	SDSSmosaic
+	FPA.INSTRUMENT	STR	INSTRUME
 # The gain is only roughly correct...
 	CELL.GAIN	F32	5.0
Index: /branches/sj_branch_20080802/ippconfig/sdssmosaic/psastro.config
===================================================================
--- /branches/sj_branch_20080802/ippconfig/sdssmosaic/psastro.config	(revision 18911)
+++ /branches/sj_branch_20080802/ippconfig/sdssmosaic/psastro.config	(revision 18912)
@@ -67,5 +67,10 @@
 PSASTRO.ANGLE.TOLERANCE       F32      1.0
 
-PSASTRO.CATDIR STR /IPP/ippRefs/catdir.2mass
+# now use PSASTRO.CATDIR, it seems - and probably should only use it
+# once anyway - used to have both synth.grizy and 2mass listed here...
+# 2MASS is a symbolic name that needs to be defined in site.config
+# in the PSASTRO.CATDIRS METADATA section. SYNTH.GRIZY is currently
+# the other option.
+PSASTRO.CATDIR STR 2MASS
 
 # Mosaic Astrometry options