Index: trunk/ippconfig/vysos5/camera.config
===================================================================
--- trunk/ippconfig/vysos5/camera.config	(revision 19543)
+++ trunk/ippconfig/vysos5/camera.config	(revision 19628)
@@ -3,34 +3,34 @@
 # File formats that we know about
 FORMATS         METADATA
-	SIMPLE	STR	vysos-5/format.config
+        SIMPLE  STR     vysos5/format.config
 END
  
 # Description of camera --- all the chips and the cells that comprise them
 FPA     METADATA
-        Chip		STR	Cell
+        Chip            STR     Cell
 END
 
 # valid filter names and corresponding IDs
 FILTER.ID       METADATA
-	NONE	STR	NONE
-	g	STR	g
-	r	STR	r
-	i	STR	i
-	z	STR	z
+        NONE    STR     NONE
+        g       STR     PSg
+        r       STR     PSr
+        i       STR     PSi
+        z       STR     PSz
 END
 
 # Table of strings to use for the class identifier (see ippdb) according to the file level.
-CLASSID		METADATA
-	FPA	STR	fpa
+CLASSID         METADATA
+        FPA     STR     fpa
 END
 
-DVO.CAMERADIR	STR	simtest		# Camera directory for DVO
+DVO.CAMERADIR   STR     vysos5          # 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
+  bias     STR BIAS
+  zero     STR BIAS
+  dark     STR DARK
+  flat     STR SKYFLAT
   skyflat  STR SKYFLAT
   domeflat STR DOMEFLAT
@@ -40,19 +40,19 @@
 
 # Recipe options
-RECIPES		METADATA
-        PPIMAGE         STR     simtest/ppImage.config   # Default: all (normal) options on
-	PSPHOT		STR	simtest/psphot.config	# psphot details
-	PPSIM		STR	simtest/ppSim.config	# ppSim details
-	PPSUB		STR	simtest/ppSub.config	# ppSub details
-	PSASTRO		STR	simtest/psastro.config	# psastro details
-	REJECTIONS	STR	simtest/rejections.config # Rejection for detrend creation
+RECIPES         METADATA
+        # PPIMAGE         STR     vysos5/ppImage.config   # Default: all (normal) options on
+        # PSPHOT          STR     vysos5/psphot.config    # psphot details
+        # PPSIM           STR     vysos5/ppSim.config     # ppSim details
+        # PPSUB           STR     vysos5/ppSub.config     # ppSub details
+        # PSASTRO         STR     vysos5/psastro.config   # psastro details
+        # REJECTIONS      STR     vysos5/rejections.config # Rejection for detrend creation
 END
 
 # reduction classes (recipes which are grouped together)
-REDUCTION	STR	recipes/reductionClasses.mdc
+REDUCTION       STR     recipes/reductionClasses.mdc
 
 FITSTYPES       STR     recipes/fitstypes.mdc
 
-FILERULES	STR	recipes/filerules-simple.mdc
+FILERULES       STR     recipes/filerules-simple.mdc
 
 EXTNAME.RULES METADATA
@@ -62,14 +62,14 @@
   CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT?
 
-  PSF.HEAD  STR	{CHIP.NAME}.hdr
+  PSF.HEAD  STR {CHIP.NAME}.hdr
   PSF.TABLE STR {CHIP.NAME}.psf_model
   PSF.RESID STR {CHIP.NAME}.psf_resid
 END
 
-BLANK.HEADERS	METADATA
-	FPA.TIME	STR	MJD-OBS
-	FPA.EXPOSURE	STR	EXPTIME
-	FPA.AIRMASS	STR	AIRMASS
+BLANK.HEADERS   METADATA
+        FPA.TIME        STR     MJD-OBS
+        FPA.EXPOSURE    STR     EXPTIME
+        FPA.AIRMASS     STR     AIRMASS
 END
 
-PHOTCODE.RULE           STR     {DETECTOR}.{FILTER.ID}		# Rule for generating photcode
+PHOTCODE.RULE           STR     {DETECTOR}.{FILTER.ID}          # Rule for generating photcode