Index: trunk/ippTools/src/regtoolConfig.c
===================================================================
--- trunk/ippTools/src/regtoolConfig.c	(revision 12347)
+++ trunk/ippTools/src/regtoolConfig.c	(revision 13578)
@@ -96,5 +96,5 @@
         "define observation time", NULL);
     psMetadataAddS8(addprocessedimfileArgs, PS_LIST_TAIL, "-code",  0,
-        "set fault code (required)", 0);
+        "set fault code", 0);
 
     // -processedimfile
@@ -179,5 +179,5 @@
         "define label for phase 2 processing (non-detrend data only)", NULL);
     psMetadataAddS8(addprocessedexpArgs, PS_LIST_TAIL, "-code",  0,
-        "set fault code (required)", 0);
+        "set fault code", 0);
     /*
     psMetadataAddStr(updateArgs, PS_LIST_TAIL, "-recip",  0,
@@ -208,62 +208,20 @@
     
 
-#define PXTOOL_MODE(option, modeval, argset) \
-{ \
-    int N = 0; \
-    if ((N = psArgumentGet (argc, argv, option))) { \
-        psArgumentRemove (N, &argc, argv); \
-        if (config->mode) { \
-            psError(PXTOOLS_ERR_CONFIG, true, "only one mode selection is allowed"); \
-            psFree(config); \
-            return NULL; \
-        } \
-        config->mode = modeval; \
-        config->args = psMemIncrRefCounter(argset); \
-    } \
-    if (!psMetadataAddMetadata(argSets, PS_LIST_TAIL, option, 0, NULL, argset)) {;\
-        psError(PXTOOLS_ERR_PROG, false, "failed to add argset for %s", option);\
-    } \
-    psFree(argset); \
-}
-
     psMetadata *argSets = psMetadataAlloc();
-    // find which mode we're running under
-    PXTOOL_MODE("-pendingimfile",   REGTOOL_MODE_PENDINGIMFILE, pendingimfileArgs);
-    PXTOOL_MODE("-addprocessedimfile", REGTOOL_MODE_ADDPROCESSEDIMFILE, addprocessedimfileArgs);
-    PXTOOL_MODE("-processedimfile", REGTOOL_MODE_PROCESSEDIMFILE, processedimfileArgs);
-    PXTOOL_MODE("-updateprocessedimfile",  REGTOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileArgs);
-    PXTOOL_MODE("-pendingexp",      REGTOOL_MODE_PENDINGEXP,pendingexpArgs);
-    PXTOOL_MODE("-addprocessedexp", REGTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs);
-    PXTOOL_MODE("-processedexp",    REGTOOL_MODE_PROCESSEDEXP, processedexpArgs);
-    PXTOOL_MODE("-updateprocessedexp", REGTOOL_MODE_UPDATEPROCESSEDEXP,      updatedprocessedexpArgs);
-
-    bool argErr = false;
-    if (config->mode == REGTOOL_MODE_NONE) {
-	psError(PXTOOLS_ERR_CONFIG, false, "missing mode argument");
-        fprintf (stderr, "mode argument is required\n");
-        argErr = true;
-    } else if (! psArgumentParse(config->args, &argc, argv) || argc != 1) {
-	psError(PXTOOLS_ERR_CONFIG, false, "unknown argument");
-        fprintf (stderr, "error parsing arguments\n");
-        argErr = true;
-    }
-
-    if (argErr) {
-        printf("\nPan-STARRS Registration Tool\n");
-        printf("Usage: %s <mode> [<options>]\n\n", argv[0]);
-        printf(" <mode> :\n\n");
-
-        psMetadataIterator *iter = psMetadataIteratorAlloc(argSets, 0, NULL);
-        psMetadataItem *item = NULL;
-        while ((item = psMetadataGetAndIncrement(iter))) {
-            if (!item->type == PS_DATA_METADATA) {
-                psAbort("all options must be specified as a metadata");            }
-
-            fprintf(stdout, "%s ", item->name);
-            psArgumentHelp(item->data.md);
-        }
-        psFree(iter);
-
+    psMetadata *modes = psMetadataAlloc();
+
+    PXTOOL_ADD_MODE("-pendingimfile",           "", REGTOOL_MODE_PENDINGIMFILE, pendingimfileArgs);
+    PXTOOL_ADD_MODE("-addprocessedimfile",      "",  REGTOOL_MODE_ADDPROCESSEDIMFILE, addprocessedimfileArgs);
+    PXTOOL_ADD_MODE("-processedimfile",         "", REGTOOL_MODE_PROCESSEDIMFILE, processedimfileArgs);
+    PXTOOL_ADD_MODE("-updateprocessedimfile",   "",   REGTOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileArgs);
+    PXTOOL_ADD_MODE("-pendingexp",              "",       REGTOOL_MODE_PENDINGEXP,pendingexpArgs);
+    PXTOOL_ADD_MODE("-addprocessedexp",         "",  REGTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs);
+    PXTOOL_ADD_MODE("-processedexp",            "",     REGTOOL_MODE_PROCESSEDEXP, processedexpArgs);
+    PXTOOL_ADD_MODE("-updateprocessedexp",      "",  REGTOOL_MODE_UPDATEPROCESSEDEXP,      updatedprocessedexpArgs);
+
+    if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {
+        psError(PS_ERR_UNKNOWN, true, "option parsing failed");
         psFree(argSets);
+        psFree(modes);
         psFree(config);
         return NULL;
@@ -271,4 +229,5 @@
 
     psFree(argSets);
+    psFree(modes);
 
     // setup search criterion
@@ -333,8 +292,4 @@
     }
 
-    // save argv/argc
-    config->argv = argv;
-    config->argc = argc;
-
     return config;
 }