Index: trunk/ippTools/src/dettoolConfig.c
===================================================================
--- trunk/ippTools/src/dettoolConfig.c	(revision 8218)
+++ trunk/ippTools/src/dettoolConfig.c	(revision 8286)
@@ -38,10 +38,11 @@
             "use the simple output format", false);
 
-    // -define 
-    psMetadata *defineArgs = psMetadataAlloc();
-    psMetadataAddStr(defineArgs, PS_LIST_TAIL, "-exp_id",  PS_META_DUPLICATE_OK,
-        "include this exposure (multiple OK, required)", NULL);
-    psMetadataAddStr(defineArgs, PS_LIST_TAIL, "-det_type",  0,
-        "define the type of detrend run (required)", NULL);
+    // -definebyexp 
+    psMetadata *definebyexpArgs = psMetadataAlloc();
+    psMetadataAddStr(definebyexpArgs, PS_LIST_TAIL, "-exp_id",
+            PS_META_DUPLICATE_OK,
+            "include this exposure (multiple OK, required)", NULL);
+    psMetadataAddStr(definebyexpArgs, PS_LIST_TAIL, "-det_type",  0,
+            "define the type of detrend run (required)", NULL);
 
     // -runs
@@ -52,4 +53,5 @@
             "use the simple output format", false);
 
+#if 0
     // XXX temporary
     // -selectrun
@@ -71,4 +73,5 @@
     psMetadataAddStr(selectArgs, PS_LIST_TAIL, "-classID",  0,
         "defined class ID (required)", NULL);
+#endif
 
     // -input
@@ -204,36 +207,36 @@
         "use the simple output format", false);
 
-    // -addresid
-    psMetadata *addresidArgs = psMetadataAlloc();
-    psMetadataAddStr(addresidArgs, PS_LIST_TAIL, "-det_id",  0,
-        "define detrend ID (required)", NULL);
-    psMetadataAddS32(addresidArgs, PS_LIST_TAIL, "-iteration",  0,
+    // -addresidimfile
+    psMetadata *addresidimfileArgs = psMetadataAlloc();
+    psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-det_id",  0,
+        "define detrend ID (required)", NULL);
+    psMetadataAddS32(addresidimfileArgs, PS_LIST_TAIL, "-iteration",  0,
         "define iteration number", 0);
-    psMetadataAddStr(addresidArgs, PS_LIST_TAIL, "-exp_id",  0,
-        "define detrend ID (required)", NULL);
-    psMetadataAddStr(addresidArgs, PS_LIST_TAIL, "-class_id",  0,
+    psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-exp_id",  0,
+        "define detrend ID (required)", NULL);
+    psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-class_id",  0,
         "define class ID (required)", NULL);
-    psMetadataAddStr(addresidArgs, PS_LIST_TAIL, "-recip",  0,
+    psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-recip",  0,
         "define recipe (required)", NULL);
-    psMetadataAddStr(addresidArgs, PS_LIST_TAIL, "-uri",  0,
+    psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-uri",  0,
         "define resid file URI (required)", NULL);
-    psMetadataAddStr(addresidArgs, PS_LIST_TAIL, "-b1_uri",  0,
+    psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-b1_uri",  0,
         "define banana 1", NULL);
-    psMetadataAddStr(addresidArgs, PS_LIST_TAIL, "-b2_uri",  0,
+    psMetadataAddStr(addresidimfileArgs, PS_LIST_TAIL, "-b2_uri",  0,
         "define banana 2", NULL);
 
-    // -resid
-    psMetadata *residArgs = psMetadataAlloc();
-    psMetadataAddStr(residArgs, PS_LIST_TAIL, "-det_id",  0,
+    // -residimfile
+    psMetadata *residimfileArgs = psMetadataAlloc();
+    psMetadataAddStr(residimfileArgs, PS_LIST_TAIL, "-det_id",  0,
         "search for detrend ID (required)", NULL);
-    psMetadataAddS32(residArgs, PS_LIST_TAIL, "-iteration",  0,
+    psMetadataAddS32(residimfileArgs, PS_LIST_TAIL, "-iteration",  0,
         "search for iteration number", 0);
-    psMetadataAddStr(residArgs, PS_LIST_TAIL, "-exp_id",  0,
-        "define detrend ID (required)", NULL);
-    psMetadataAddStr(residArgs, PS_LIST_TAIL, "-class_id",  0,
-        "search for class ID", NULL);
-    psMetadataAddStr(residArgs, PS_LIST_TAIL, "-recip",  0,
+    psMetadataAddStr(residimfileArgs, PS_LIST_TAIL, "-exp_id",  0,
+        "define detrend ID (required)", NULL);
+    psMetadataAddStr(residimfileArgs, PS_LIST_TAIL, "-class_id",  0,
+        "search for class ID", NULL);
+    psMetadataAddStr(residimfileArgs, PS_LIST_TAIL, "-recip",  0,
         "search for recipe", NULL);
-    psMetadataAddBool(residArgs, PS_LIST_TAIL, "-simple",  0,
+    psMetadataAddBool(residimfileArgs, PS_LIST_TAIL, "-simple",  0,
         "use the simple output format", false);
  
@@ -313,9 +316,9 @@
     // find which mode we're running under
     PXTOOL_MODE("-pending",         DETTOOL_MODE_PENDING,       pendingArgs);
-    PXTOOL_MODE("-define",          DETTOOL_MODE_DEFINE,        defineArgs);
+    PXTOOL_MODE("-definebyexp",     DETTOOL_MODE_DEFINEBYEXP,   definebyexpArgs);
     PXTOOL_MODE("-raw",             DETTOOL_MODE_RAW,           rawArgs);
     PXTOOL_MODE("-runs",            DETTOOL_MODE_RUNS,          runsArgs);
-    PXTOOL_MODE("-selectrun",       DETTOOL_MODE_SELECTRUN,     selectrunArgs);
-    PXTOOL_MODE("-select",          DETTOOL_MODE_SELECT,        selectArgs);
+//    PXTOOL_MODE("-selectrun",       DETTOOL_MODE_SELECTRUN,     selectrunArgs);
+//    PXTOOL_MODE("-select",          DETTOOL_MODE_SELECT,        selectArgs);
     PXTOOL_MODE("-input",           DETTOOL_MODE_INPUT,         inputArgs);
     PXTOOL_MODE("-addprocessed",    DETTOOL_MODE_ADDPROCESSED,  addprocArgs);
@@ -327,6 +330,6 @@
     PXTOOL_MODE("-normalized",      DETTOOL_MODE_NORMALIZED,    normalizedArgs);
     PXTOOL_MODE("-normalizedframe", DETTOOL_MODE_NORMALIZEDFRAME,normalizedframeArgs);
-    PXTOOL_MODE("-addresid",        DETTOOL_MODE_ADDRESID,      addresidArgs);
-    PXTOOL_MODE("-resid",           DETTOOL_MODE_RESID,         residArgs);
+    PXTOOL_MODE("-addresidimfile",  DETTOOL_MODE_ADDRESIDIMFILE,  addresidimfileArgs);
+    PXTOOL_MODE("-residimfile",     DETTOOL_MODE_RESIDIMFILE,    residimfileArgs);
     PXTOOL_MODE("-addresidexp",     DETTOOL_MODE_ADDRESIDEXP,  addresidexpArgs);
     PXTOOL_MODE("-residexp",        DETTOOL_MODE_RESIDEXP,     residexpArgs);
@@ -348,14 +351,15 @@
         printf("\nPan-STARRS Detrend Tool\n");
         printf("Usage: %s <mode> [<options>]\n\n", argv[0]);
-        printf(" <mode> : [-pending|-define|-runs|-selectrun|-select|-raw|-addprocessed|-processed|-addstacked|-stacked|-stackedframe|-addnormalized|-normalized|-normalizedframe|-addresid|-resid|-addresidexp|-residexp|-declaremasterframe|-masterframe|-master|-rerun]\n\n");
+        printf(" <mode> : [-pending|-definebyexp|-runs|-selectrun|-select|-raw|-addprocessed|-processed|-addstacked|-stacked|-stackedframe|-addnormalized|-normalized|-normalizedframe|-addresidimfile|-residimfile|-addresidexp|-residexp|-declaremasterframe|-masterframe|-master|-rerun]\n\n");
         fprintf (stdout, "-pending ");
         psArgumentHelp(pendingArgs);
         psFree(pendingArgs);
-        fprintf (stdout, "-define ");
-        psArgumentHelp(defineArgs);
-        psFree(defineArgs);
+        fprintf (stdout, "-definebyexp ");
+        psArgumentHelp(definebyexpArgs);
+        psFree(definebyexpArgs);
         fprintf (stdout, "-runs ");
         psArgumentHelp(runsArgs);
         psFree(runsArgs);
+#if 0
         fprintf (stdout, "-selectrun ");
         psArgumentHelp(selectrunArgs);
@@ -364,4 +368,5 @@
         psArgumentHelp(selectArgs);
         psFree(selectArgs);
+#endif
         fprintf (stdout, "-input ");
         psArgumentHelp(inputArgs);
@@ -395,9 +400,9 @@
         psFree(normalizedframeArgs);
         fprintf (stdout, "-addresid ");
-        psArgumentHelp(addresidArgs);
-        psFree(addresidArgs);
-        fprintf (stdout, "-resid ");
-        psArgumentHelp(residArgs);
-        psFree(residArgs);
+        psArgumentHelp(addresidimfileArgs);
+        psFree(addresidimfileArgs);
+        fprintf (stdout, "-residimfile ");
+        psArgumentHelp(residimfileArgs);
+        psFree(residimfileArgs);
         fprintf (stdout, "-addresidexp ");
         psArgumentHelp(addresidexpArgs);
@@ -423,8 +428,8 @@
 
     psFree(pendingArgs);
-    psFree(defineArgs);
+    psFree(definebyexpArgs);
     psFree(runsArgs);
-    psFree(selectrunArgs);
-    psFree(selectArgs);
+//    psFree(selectrunArgs);
+//    psFree(selectArgs);
     psFree(inputArgs);
     psFree(rawArgs);
@@ -437,6 +442,6 @@
     psFree(normalizedArgs);
     psFree(normalizedframeArgs);
-    psFree(addresidArgs);
-    psFree(residArgs);
+    psFree(addresidimfileArgs);
+    psFree(residimfileArgs);
     psFree(addresidexpArgs);
     psFree(residexpArgs);