Index: trunk/ippconfig/.cvsignore
===================================================================
--- trunk/ippconfig/.cvsignore	(revision 16562)
+++ trunk/ippconfig/.cvsignore	(revision 16611)
@@ -12,2 +12,3 @@
 missing
 ipprc.config
+site.config
Index: trunk/ippconfig/Makefile.am
===================================================================
--- trunk/ippconfig/Makefile.am	(revision 16562)
+++ trunk/ippconfig/Makefile.am	(revision 16611)
@@ -15,4 +15,6 @@
 
 install_files = \
+	site.config \
+	system.config \
 	GSCregions.tbl \
 	dvo.photcodes
Index: trunk/ippconfig/ipprc.config.in
===================================================================
--- trunk/ippconfig/ipprc.config.in	(revision 16562)
+++ trunk/ippconfig/ipprc.config.in	(revision 16611)
@@ -1,110 +1,24 @@
-### Example .ipprc file
+## Example .ipprc file : copy to your home directory and modify as desired
 
 # Default search path for configuration files (add $HOME if desired)
+# Note: do not include $HOME in the distributed copy used by ippMonitor
 # PATH            STR     @pkgdatadir@:$HOME/.ipp:.
-PATH            STR     @pkgdatadir@:.
-# note: do not include $HOME in the distributed copy used by ippMonitor
+PATH              STR     @pkgdatadir@:.
 
-# place your data directories here and refer to as path://PATH/remainder
-DATAPATH	METADATA
-	ALALA	STR	/data/alala.0/
-	ISP	STR	/data/ipp000.0/isp
-	ISP_V2	STR	/data/ipp000.0/isp_v2
-	ISP_V3	STR	/data/ipp000.0/isp_v3
-	ISP_TEST STR	/data/ipp000.0/isp_test
-	EAMTEST STR     /data/alala.0/eugene/swtests/simtest/raw
-	EAMWORK STR     /data/alala.0/eugene/swtests/simtest/work
-	CFH12K  STR     /data/ipp003.0/eugene/cfh12k
-        DATA1   STR     /data/alala.0/
-        SRESS1  STR     /data/ipp003.0/SM_W/sm030927/
-        SRESSWORK STR   /data/ipp003.0/rodney/sresswork
-        SIMTEST STR     /data/po05.0/rodney/sim/
-        SIMWORK STR     /data/po05.0/rodney/simwork/
-	MOPS	STR	/data/ipp002.0/MOPS/
-	TALCS	STR	/data/ipp003.0/TALCS/
-END
+# load the site-specific information from here
+SITE              STR     site.config
 
-NEB_SERVER	STR	http://alala:80/nebulous	# Nebulous server
+# load the system configuration information from here
+SYSTEM            STR     system.config
 
-### Database configuration
-DBSERVER	STR	ipp000			# Database host name (for psDBInit)
-DBNAME		STR	ipp			# Database name (for psDBInit)
-DBUSER		STR	XXX			# Database user name (for psDBInit)
-DBPASSWORD	STR	XXX			# Database password (for psDBInit)
-
-### Setups for each camera system
-CAMERAS		METADATA
-	MEGACAM			STR	megacam/camera.config
-	CFH12K			STR	cfh12k/camera.config
-	ISP-Apogee     		STR	isp/camera.config
-	CTIO_MOSAIC2		STR	ctio_mosaic2/camera.config	# CTIO MOSAIC2 camera, for ESSENCE
-	SDSS			STR	sdss/camera.config		# Sloan Digital Sky Survey
-	GPC1			STR	gpc1/camera.config
-	ESOWFI			STR	esowfi/camera.config		# ESO Wide-Field Imager
-#	UCAM			STR	ucam/camera.config
-#	LRIS_BLUE		STR	lris_blue/camera.config
-#	TC3			STR	tc3/camera.config		# Pan-STARRS Test Camera III
-#	LRIS_RED		STR	lris_red/camera.config
-	SIMMOSAIC		STR	simmosaic/camera.config		# Simulated mosaic, for testing
-	SIMTEST			STR	simtest/camera.config
-	SIMPLE			STR	simple/camera.config
-END
-
-### camera names as expected by DVO
-DVO.CAMERAS		METADATA
-	MEGACAM			STR	megacam
-	CFH12K			STR	cfh12k
-	ISP-Apogee     		STR	isp
-	CTIO_MOSAIC2		STR	ctio_mosaic2
-	SDSS			STR	sdss
-	GPC1			STR	gpc1
-	ESOWFI			STR	esowfi
-#	UCAM			STR	ucam
-#	TC3			STR	tc3
-#	LRIS_BLUE		STR	lris_blue
-#	LRIS_RED		STR	lris_red
-	SIMMOSAIC		STR	simmosaic
-	SIMTEST			STR	simtest
-	SIMPLE			STR	simple
-END
-
-### psLib setup
-#TIME		STR	/home/mithrandir/price/pan-starrs/jhroot/i686-pc-linux-gnu/etc/pslib/psTime.config	# Time configuration file
+# logging verbosity levels
 LOGLEVEL	S32	9			# Logging level; 3=INFO
 LOGFORMAT	STR	THLNM			# Log format
 LOGDEST		STR	STDERR			# Log destination
 TRACEDEST	STR	STDERR			# Trace destination
+
+# place default trace lines here
 TRACE		METADATA			# Trace levels
-	err		S32	10
-# place default trace lines here
-# example: 
-# psLib.db S32	10
+  err		S32	10
+# psLib.db      S32	10
 END
-
-RECIPES		METADATA		# Site-level recipes
-	MASKS		STR		recipes/masks.config	# Mask values
-	REJECTIONS	STR		recipes/rejections.config # Rejection for detrend creation
-	PPIMAGE		STR		recipes/ppImage.config  # Image reduction
-	PPMERGE		STR		recipes/ppMerge.config	# Image combination
- 	PPSTATS		STR		recipes/ppStats.config	# Image statistics
-	PSPHOT		STR     	recipes/psphot.config	# Photometry
-	PSASTRO		STR		recipes/psastro.config	# Astrometry
-	PPSTACK		STR		recipes/ppStack.config	# Combination
-	PSWARP		STR		recipes/pswarp.config   # Warping
-	PPSIM		STR		recipes/ppSim.config	# Simulations
-	PPSUB		STR		recipes/ppSub.config	# Subtraction
-END
-
-# Header keywords for skycell concepts; required because DVO doesn't read HIERARCH
-SKYCELLS	METADATA
-	FPA.TIME	STR	MJD-OBS
-	CELL.TIME	STR	MJD-OBS
-	FPA.EXPOSURE	STR	EXPTIME
-	CELL.EXPOSURE	STR	EXPTIME
-	FPA.AIRMASS	STR	AIRMASS
-END
-
-# List of tessellations, and their DVO CATDIR
-TESSELLATIONS	METADATA
-	MOPS		STR	path://MOPS/skycells/
-END
Index: trunk/ippconfig/site.config.in
===================================================================
--- trunk/ippconfig/site.config.in	(revision 16611)
+++ trunk/ippconfig/site.config.in	(revision 16611)
@@ -0,0 +1,52 @@
+## Site Configuration : use this as an example for your installation
+## Supply locations of interest
+
+# place your data directories here and refer to as path://PATH/remainder
+DATAPATH	METADATA
+	ALALA	STR	/data/alala.0/
+	ISP	STR	/data/ipp000.0/isp
+	ISP_V2	STR	/data/ipp000.0/isp_v2
+	ISP_V3	STR	/data/ipp000.0/isp_v3
+	ISP_TEST STR	/data/ipp000.0/isp_test
+	EAMTEST STR     /data/alala.0/eugene/swtests/simtest/raw
+	EAMWORK STR     /data/alala.0/eugene/swtests/simtest/work
+	CFH12K  STR     /data/ipp003.0/eugene/cfh12k
+        DATA1   STR     /data/alala.0/
+        SRESS1  STR     /data/ipp003.0/SM_W/sm030927/
+        SRESSWORK STR   /data/ipp003.0/rodney/sresswork
+        SIMTEST STR     /data/po05.0/rodney/sim/
+        SIMWORK STR     /data/po05.0/rodney/simwork/
+	MOPS	STR	/data/ipp002.0/MOPS/
+	TALCS	STR	/data/ipp003.0/TALCS/
+END
+
+# List of tessellations, and their DVO CATDIR
+TESSELLATIONS	METADATA
+	MOPS		STR	path://MOPS/skycells/
+END
+
+# dvo databases used for output
+DVO.CATDIRS     METADATA
+	MOPS		STR	path://MOPS/catdir/
+END
+
+# dvo databases used for psastro reference
+PSASTRO.CATDIRS METADATA
+	2MASS		STR	/data/alala.0/ipp/ippRefs/catdir.2mass
+	SYNTH.GRIZY	STR	/data/alala.0/ipp/ippRefs/catdir.synth.grizy
+	SYNTH.BRIGHT	STR	/data/alala.0/ipp/ippRefs/catdir.synth.bright
+END
+
+# nebulous server
+NEB_SERVER	STR	http://alala:80/nebulous	# Nebulous server
+
+# Database configuration
+DBSERVER	STR	ipp000			# Database host name (for psDBInit)
+DBNAME		STR	XXX			# Database name (for psDBInit)
+DBUSER		STR	XXX			# Database user name (for psDBInit)
+DBPASSWORD	STR	XXX			# Database password (for psDBInit)
+
+# other basic values:
+# XXX is TIME still needed / used?
+# XXX use autoconf to put this in a known location?
+# TIME		STR	psTime.config	# Time configuration file
Index: trunk/ippconfig/system.config
===================================================================
--- trunk/ippconfig/system.config	(revision 16611)
+++ trunk/ippconfig/system.config	(revision 16611)
@@ -0,0 +1,58 @@
+## system-wide options : these are concepts not specific to any camera or recipe
+
+### Setups for each camera system
+CAMERAS		METADATA
+	MEGACAM			STR	megacam/camera.config
+	CFH12K			STR	cfh12k/camera.config
+	ISP-Apogee     		STR	isp/camera.config
+	MOSAIC2 		STR	ctio_mosaic2/camera.config	# CTIO MOSAIC2 camera, for ESSENCE
+	SDSS			STR	sdss/camera.config		# Sloan Digital Sky Survey
+	GPC1			STR	gpc1/camera.config
+	ESOWFI			STR	esowfi/camera.config		# ESO Wide-Field Imager
+	SIMMOSAIC		STR	simmosaic/camera.config		# Simulated mosaic, for testing
+	SIMTEST			STR	simtest/camera.config
+	SIMPLE			STR	simple/camera.config
+END
+
+## directories exist for other camera, introduce if they are tested and working
+#	UCAM			STR	ucam/camera.config
+#	LRIS_BLUE		STR	lris_blue/camera.config
+#	TC3			STR	tc3/camera.config		# Pan-STARRS Test Camera III
+#	LRIS_RED		STR	lris_red/camera.config
+
+### camera names as expected by DVO
+DVO.CAMERAS		METADATA
+	MEGACAM			STR	megacam
+	CFH12K			STR	cfh12k
+	ISP-Apogee     		STR	isp
+	MOSAIC2 		STR	ctio_mosaic2
+	SDSS			STR	sdss
+	GPC1			STR	gpc1
+	ESOWFI			STR	esowfi
+	SIMMOSAIC		STR	simmosaic
+	SIMTEST			STR	simtest
+	SIMPLE			STR	simple
+END
+
+# Header keywords for skycell concepts; required because DVO doesn't read HIERARCH
+SKYCELLS	METADATA
+	FPA.TIME	STR	MJD-OBS
+	CELL.TIME	STR	MJD-OBS
+	FPA.EXPOSURE	STR	EXPTIME
+	CELL.EXPOSURE	STR	EXPTIME
+	FPA.AIRMASS	STR	AIRMASS
+END
+
+RECIPES		METADATA		# Site-level recipes
+	MASKS		STR		recipes/masks.config	# Mask values
+	REJECTIONS	STR		recipes/rejections.config # Rejection for detrend creation
+	PPIMAGE		STR		recipes/ppImage.config  # Image reduction
+	PPMERGE		STR		recipes/ppMerge.config	# Image combination
+ 	PPSTATS		STR		recipes/ppStats.config	# Image statistics
+	PSPHOT		STR     	recipes/psphot.config	# Photometry
+	PSASTRO		STR		recipes/psastro.config	# Astrometry
+	PPSTACK		STR		recipes/ppStack.config	# Combination
+	PSWARP		STR		recipes/pswarp.config   # Warping
+	PPSIM		STR		recipes/ppSim.config	# Simulations
+	PPSUB		STR		recipes/ppSub.config	# Subtraction
+END
