Index: /trunk/ippTools/src/chiptoolConfig.c
===================================================================
--- /trunk/ippTools/src/chiptoolConfig.c	(revision 7026)
+++ /trunk/ippTools/src/chiptoolConfig.c	(revision 7027)
@@ -12,5 +12,6 @@
     }
 
-    if (! pmConfigRead(&config->site, &config->camera, &config->recipe, &argc, argv, RECIPE)) {
+    config->modules = pmConfigRead(&argc, argv);
+    if (! config->modules) {
         psErrorStackPrint(stderr, "Can't find site configuration!\n");
         exit(EXIT_FAILURE);
@@ -59,6 +60,6 @@
         config->mode = PX_MODE_DONE;
     }
-    
-    // paul's argument parsing convention requires: -key value 
+
+    // paul's argument parsing convention requires: -key value
     psMetadataAddBool(arguments, PS_LIST_TAIL, "-quick",   0, "examine raw image table, write ppImage output", false);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-define",  0, "examine raw image table, add to pending image table", "");
@@ -158,6 +159,6 @@
 
     // define Database handle, if used
-    config->dbh = pmConfigDB(config->site);
+    config->dbh = pmConfigDB(config->modules);
 
     return true;
-} 
+}
Index: /trunk/ippTools/src/guidetoolConfig.c
===================================================================
--- /trunk/ippTools/src/guidetoolConfig.c	(revision 7026)
+++ /trunk/ippTools/src/guidetoolConfig.c	(revision 7027)
@@ -15,6 +15,6 @@
 
     // setup site config
-    if (! pmConfigRead(&config->site, &config->camera, &config->recipe,
-        &argc, argv, RECIPE)) {
+    config->modules = pmConfigRead(&argc, argv);
+    if (!config->modules) {
         psError(PS_ERR_UNKNOWN, false, "Can't find site configuration!\n");
         exit(EXIT_FAILURE);
@@ -89,5 +89,5 @@
         config->mode = PX_MODE_DEFINE;
     }
-    
+
     // parse CLI for these options
     psMetadata *argSet = NULL;
@@ -125,5 +125,5 @@
         exit(EXIT_FAILURE);
     }
-    
+
     psFree(args);
     psFree(pendingArgs);
@@ -192,6 +192,6 @@
 
     // define Database handle, if used
-    config->dbh = pmConfigDB(config->site);
+    config->dbh = pmConfigDB(config->modules);
 
     return config;
-} 
+}
Index: /trunk/ippTools/src/pxadminConfig.c
===================================================================
--- /trunk/ippTools/src/pxadminConfig.c	(revision 7026)
+++ /trunk/ippTools/src/pxadminConfig.c	(revision 7027)
@@ -12,5 +12,7 @@
     }
 
-    if (! pmConfigRead(&config->site, &config->camera, &config->recipe, &argc, argv, RECIPE)) {
+    config->modules = pmConfigRead(&argc, argv);
+
+    if (! config->modules) {
         psErrorStackPrint(stderr, "Can't find site configuration!\n");
         exit(EXIT_FAILURE);
@@ -44,5 +46,5 @@
     }
 
-    // paul's argument parsing convention requires: -key value 
+    // paul's argument parsing convention requires: -key value
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-create", 0,
             "create the P2 tables", "");
@@ -75,7 +77,7 @@
 
     // define Database handle, if used
-    config->dbh = pmConfigDB(config->site);
+    config->dbh = pmConfigDB(config->modules);
     return config;
-} 
+}
 
 /*
Index: /trunk/ippTools/src/pxconfig.c
===================================================================
--- /trunk/ippTools/src/pxconfig.c	(revision 7026)
+++ /trunk/ippTools/src/pxconfig.c	(revision 7027)
@@ -17,5 +17,4 @@
     config->start           = NULL;
     config->stop            = NULL;
-    config->camera          = NULL;
     config->camera_name     = NULL;
     config->telescope       = NULL;
@@ -23,6 +22,5 @@
     config->filter          = NULL;
     config->dbh             = NULL;
-    config->site            = NULL;
-    config->recipe          = NULL;
+    config->modules         = NULL;
     config->exp_id          = NULL;
     config->class           = NULL;
@@ -38,12 +36,10 @@
     psFree(config->start);
     psFree(config->stop);
-    psFree(config->camera);
     psFree(config->camera_name);
     psFree(config->telescope);
     psFree(config->exp_type);
     psFree(config->filter);
-    psFree(config->dbh); 
-    psFree(config->site);
-    psFree(config->recipe);
+    psFree(config->dbh);
+    psFree(config->modules);
     psFree(config->exp_id);
     psFree(config->class);
Index: /trunk/ippTools/src/pxtables.c
===================================================================
--- /trunk/ippTools/src/pxtables.c	(revision 7026)
+++ /trunk/ippTools/src/pxtables.c	(revision 7027)
@@ -60,8 +60,8 @@
     fgets (line, 128, stdin);
     sscanf (line, "%s", answer);
-             
+
     {
         bool status;
-        psString dbPassword = psMetadataLookupStr(&status, config->site, "DBPASSWORD");
+        psString dbPassword = psMetadataLookupStr(&status, config->modules->site, "DBPASSWORD");
         if (strcmp (answer, dbPassword)) goto escape;
         psFree(dbPassword);
Index: /trunk/ippTools/src/pxtools.h
===================================================================
--- /trunk/ippTools/src/pxtools.h	(revision 7026)
+++ /trunk/ippTools/src/pxtools.h	(revision 7027)
@@ -6,8 +6,5 @@
 # include <unistd.h>   // for unlink
 # include <pslib.h>
-# include <pmObjects.h>
-# include <pmPSF.h>
-# include <pmPSFtry.h>
-# include <pmModelGroup.h>
+# include <psmodules.h>
 # include <metadatadb.h>
 
@@ -40,5 +37,5 @@
     psSphere r1;
     psSphere r2;
-    psMetadata *camera;
+    pmConfig *modules;
     char *camera_name;
     char *telescope;
@@ -46,6 +43,4 @@
     char *filter;
     psDB *dbh;
-    psMetadata *site;
-    psMetadata *recipe;
     char *exp_id;
     char *class;
@@ -149,5 +144,5 @@
 rawScienceFrame *newToRawScienceFrame(newFrame *newFrame);
 bool rawScienceFrameInsert(pxConfig *config, rawScienceFrame *frame);
-rawDetrendFrame *newToRawDetrendFrame(newFrame *newFrame); 
+rawDetrendFrame *newToRawDetrendFrame(newFrame *newFrame);
 bool rawDetrendFrameInsert(pxConfig *config, rawDetrendFrame *frame);
 
Index: /trunk/ippTools/src/pzgetexpConfig.c
===================================================================
--- /trunk/ippTools/src/pzgetexpConfig.c	(revision 7026)
+++ /trunk/ippTools/src/pzgetexpConfig.c	(revision 7027)
@@ -9,8 +9,10 @@
 pxConfig *pzgetexpConfig(pxConfig *config, int argc, char **argv) {
     if (!config) {
-        config = pxConfigAlloc();            
+        config = pxConfigAlloc();
     }
 
-    if (! pmConfigRead(&config->site, &config->camera, &config->recipe, &argc, argv, RECIPE)) {
+    config->modules = pmConfigRead(&argc, argv);
+
+    if (! config->modules) {
         psError(PS_ERR_UNKNOWN, false, "Can't find site configuration!\n");
         exit(EXIT_FAILURE);
@@ -46,5 +48,5 @@
 
     // define Database handle, if used
-    config->dbh = pmConfigDB(config->site);
+    config->dbh = pmConfigDB(config->modules);
     if(!config->dbh) {
         psError(PS_ERR_UNKNOWN, false, "Can't connect to db\n");
@@ -54,3 +56,3 @@
 
     return config;
-} 
+}
Index: /trunk/ippTools/src/pzgetimfilesConfig.c
===================================================================
--- /trunk/ippTools/src/pzgetimfilesConfig.c	(revision 7026)
+++ /trunk/ippTools/src/pzgetimfilesConfig.c	(revision 7027)
@@ -9,8 +9,10 @@
 pxConfig *pzgetimfilesConfig(pxConfig *config, int argc, char **argv) {
     if (!config) {
-        config = pxConfigAlloc();            
+        config = pxConfigAlloc();
     }
 
-    if (! pmConfigRead(&config->site, &config->camera, &config->recipe, &argc, argv, RECIPE)) {
+    config->modules = pmConfigRead(&argc, argv);
+
+    if (! config->modules) {
         psError(PS_ERR_UNKNOWN, false, "Can't find site configuration!\n");
         exit(EXIT_FAILURE);
@@ -19,7 +21,7 @@
     psMetadata *args = psMetadataAlloc();
     psMetadataAddStr(args , PS_LIST_TAIL, "-uri", 0,
-        "DataStore FileSet URI", ""); 
+        "DataStore FileSet URI", "");
     psMetadataAddStr(args , PS_LIST_TAIL, "-filesetid", 0,
-        "FileSet ID", ""); 
+        "FileSet ID", "");
 
     bool status = false;
@@ -42,5 +44,5 @@
 
     // define Database handle, if used
-    config->dbh = pmConfigDB(config->site);
+    config->dbh = pmConfigDB(config->modules);
     if(!config->dbh) {
         psError(PS_ERR_UNKNOWN, false, "Can't connect to db\n");
@@ -50,3 +52,3 @@
 
     return config;
-} 
+}
Index: /trunk/ippTools/src/pztoolConfig.c
===================================================================
--- /trunk/ippTools/src/pztoolConfig.c	(revision 7026)
+++ /trunk/ippTools/src/pztoolConfig.c	(revision 7027)
@@ -12,5 +12,7 @@
     }
 
-    if (! pmConfigRead(&config->site, &config->camera, &config->recipe, &argc, argv, RECIPE)) {
+    config->modules = pmConfigRead(&argc, argv);
+
+    if (! config->modules) {
         psError(PS_ERR_UNKNOWN, false, "Can't find site configuration!\n");
         exit(EXIT_FAILURE);
@@ -40,6 +42,6 @@
         config->mode = PX_MODE_COPYDONE;
     }
-    
-    // paul's argument parsing convention requires: -key value 
+
+    // paul's argument parsing convention requires: -key value
     // Parse other command-line arguments
     psMetadata *args = psMetadataAlloc();
@@ -127,6 +129,6 @@
 
     // define Database handle, if used
-    config->dbh = pmConfigDB(config->site);
+    config->dbh = pmConfigDB(config->modules);
 
     return config;
-} 
+}
Index: /trunk/ippTools/src/regtoolConfig.c
===================================================================
--- /trunk/ippTools/src/regtoolConfig.c	(revision 7026)
+++ /trunk/ippTools/src/regtoolConfig.c	(revision 7027)
@@ -12,5 +12,7 @@
     }
 
-    if (! pmConfigRead(&config->site, &config->camera, &config->recipe, &argc, argv, RECIPE)) {
+    config->modules = pmConfigRead(&argc, argv);
+
+    if (! config->modules) {
         psError(PS_ERR_UNKNOWN, false, "Can't find site configuration!\n");
         exit(EXIT_FAILURE);
@@ -33,6 +35,6 @@
         config->mode = PX_MODE_UPDATE;
     }
-    
-    // paul's argument parsing convention requires: -key value 
+
+    // paul's argument parsing convention requires: -key value
     // Parse other command-line arguments
     psMetadata *args = psMetadataAlloc();
@@ -191,6 +193,6 @@
 
     // define Database handle, if used
-    config->dbh = pmConfigDB(config->site);
+    config->dbh = pmConfigDB(config->modules);
 
     return true;
-} 
+}