Index: trunk/ippTools/src/dettool.c
===================================================================
--- trunk/ippTools/src/dettool.c	(revision 8279)
+++ trunk/ippTools/src/dettool.c	(revision 8286)
@@ -10,20 +10,27 @@
 
 static bool pendingMode(pxConfig *config);
-static bool defineMode(pxConfig *config);
+static bool definebyexpMode(pxConfig *config);
+static bool definebyqueryMode(pxConfig *config);
 static bool runsMode(pxConfig *config);
-static bool selectrunMode(pxConfig *config);
-static bool selectMode(pxConfig *config);
 static bool inputMode(pxConfig *config);
 static bool rawMode(pxConfig *config);
-static bool addprocMode(pxConfig *config);
-static bool procMode(pxConfig *config);
-static bool addstacMode(pxConfig *config);
-static bool stacMode(pxConfig *config);
-static bool stacframeMode(pxConfig *config);
+//static bool selectrunMode(pxConfig *config);
+//static bool selectMode(pxConfig *config);
+static bool addprocessedMode(pxConfig *config);
+static bool tostackMode(pxConfig *config);
+static bool processedMode(pxConfig *config);
+static bool addstackedMode(pxConfig *config);
+static bool stackedMode(pxConfig *config);
+static bool stacframeMode(pxConfig *config); // needed?
+static bool tonormalizeMode(pxConfig *config);
+static bool addnormstatMode(pxConfig *config);
+static bool normstatMode(pxConfig *config);
 static bool addnormalizedMode(pxConfig *config);
-static bool normalizedMode(pxConfig *config);
-static bool normalizedframeMode(pxConfig *config);
-static bool addresidMode(pxConfig *config);
-static bool residMode(pxConfig *config);
+static bool toresidMode(pxConfig *config);
+static bool addresidimfileMode(pxConfig *config);
+static bool normalizedMode(pxConfig *config); // needed?
+static bool toresidexpMode(pxConfig *config);
+static bool normalizedframeMode(pxConfig *config);// neede?
+static bool residimfileMode(pxConfig *config);
 static bool addresidexpMode(pxConfig *config);
 static bool residexpMode(pxConfig *config);
@@ -53,33 +60,38 @@
 
     switch (config->mode) {
-        MODECASE(DETTOOL_MODE_PENDING, pendingMode);
-        MODECASE(DETTOOL_MODE_DEFINE, defineMode);
-        MODECASE(DETTOOL_MODE_RUNS, runsMode);
-        MODECASE(DETTOOL_MODE_SELECTRUN, selectrunMode);
-        MODECASE(DETTOOL_MODE_SELECT, selectMode);
-        MODECASE(DETTOOL_MODE_INPUT, inputMode);
-        MODECASE(DETTOOL_MODE_RAW, rawMode);
-        MODECASE(DETTOOL_MODE_ADDPROCESSED, addprocMode);
-        MODECASE(DETTOOL_MODE_PROCESSED, procMode);
-        MODECASE(DETTOOL_MODE_ADDSTACKED, addstacMode);
-        MODECASE(DETTOOL_MODE_STACKED, stacMode);
-        MODECASE(DETTOOL_MODE_STACKEDFRAME, stacframeMode);
-        MODECASE(DETTOOL_MODE_ADDNORMALIZED, addnormalizedMode);
-        MODECASE(DETTOOL_MODE_NORMALIZED, normalizedMode);
-        MODECASE(DETTOOL_MODE_NORMALIZEDFRAME, normalizedframeMode);
-        MODECASE(DETTOOL_MODE_ADDRESID, addresidMode);
-        MODECASE(DETTOOL_MODE_RESID, residMode);
-        MODECASE(DETTOOL_MODE_ADDRESIDEXP, addresidexpMode);
-        MODECASE(DETTOOL_MODE_RESIDEXP, residexpMode);
+        MODECASE(DETTOOL_MODE_PENDING,          pendingMode);
+        MODECASE(DETTOOL_MODE_DEFINEBYEXP,      definebyexpMode);
+        MODECASE(DETTOOL_MODE_DEFINEBYQUERY,    definebyqueryMode);
+        MODECASE(DETTOOL_MODE_RUNS,             runsMode);
+        MODECASE(DETTOOL_MODE_INPUT,            inputMode);
+        MODECASE(DETTOOL_MODE_RAW,              rawMode);
+//        MODECASE(DETTOOL_MODE_SELECTRUN, selectrunMode);
+//        MODECASE(DETTOOL_MODE_SELECT, selectMode);
+        MODECASE(DETTOOL_MODE_ADDPROCESSED,     addprocessedMode);
+        MODECASE(DETTOOL_MODE_TOSTACK,          tostackMode);
+        MODECASE(DETTOOL_MODE_PROCESSED,        processedMode);
+        MODECASE(DETTOOL_MODE_ADDSTACKED,       addstackedMode);
+        MODECASE(DETTOOL_MODE_STACKED,          stackedMode);
+        MODECASE(DETTOOL_MODE_STACKEDFRAME,     stacframeMode); // needed?
+        MODECASE(DETTOOL_MODE_TONORMALIZE,      tonormalizeMode);
+        MODECASE(DETTOOL_MODE_ADDNORMSTAT,      addnormstatMode);
+        MODECASE(DETTOOL_MODE_NORMSTAT,         normstatMode);
+        MODECASE(DETTOOL_MODE_ADDNORMALIZED,    addnormalizedMode);
+        MODECASE(DETTOOL_MODE_NORMALIZED,       normalizedMode);
+        MODECASE(DETTOOL_MODE_TORESID,          toresidMode);
+        MODECASE(DETTOOL_MODE_ADDRESIDIMFILE,   addresidimfileMode);
+        MODECASE(DETTOOL_MODE_TORESIDEXP,       toresidexpMode);
+        MODECASE(DETTOOL_MODE_NORMALIZEDFRAME,  normalizedframeMode); // needed?
+        MODECASE(DETTOOL_MODE_RESIDIMFILE,      residimfileMode);
+        MODECASE(DETTOOL_MODE_ADDRESIDEXP,      addresidexpMode);
+        MODECASE(DETTOOL_MODE_RESIDEXP,         residexpMode);
         MODECASE(DETTOOL_MODE_DECLAREMASTERFRAME, declaremasterframeMode);
-        MODECASE(DETTOOL_MODE_MASTERFRAME, masterframeMode);
-        MODECASE(DETTOOL_MODE_MASTER, masterMode);
-        MODECASE(DETTOOL_MODE_RERUN, rerunMode);
+        MODECASE(DETTOOL_MODE_MASTERFRAME,      masterframeMode);
+        MODECASE(DETTOOL_MODE_MASTER,           masterMode);
+        MODECASE(DETTOOL_MODE_RERUN,            rerunMode);
         default:
             psAbort(argv[0], "invalid option (this should not happen)");
     }
-
-    psFree(config);
-    pmConfigDone();
+psFree(config); pmConfigDone();
     psLibFinalize();
 
@@ -136,5 +148,5 @@
 }
 
-static bool defineMode(pxConfig *config)
+static bool definebyexpMode(pxConfig *config)
 {
     bool status     = false;
@@ -262,4 +274,9 @@
     printf("%ld\n", det_id);
 
+    return true;
+}
+
+static bool definebyqueryMode(pxConfig *config)
+{
     return true;
 }
@@ -347,4 +364,5 @@
 }
 
+#if 0
 static bool selectrunMode(pxConfig *config)
 {
@@ -466,4 +484,7 @@
     return true;
 }
+
+#endif
+
 static detInputExpRow *rawDetrenTodetInputExpRow(rawDetrendExpRow *rawExp, psS32 det_id, psS32 iteration)
 {
@@ -620,5 +641,5 @@
 }
 
-static bool addprocMode(pxConfig *config)
+static bool addprocessedMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -710,5 +731,10 @@
 }
 
-static bool procMode(pxConfig *config)
+static bool tostackMode(pxConfig *config)
+{
+    return true;
+}
+
+static bool processedMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -967,5 +993,5 @@
 }
 
-static bool addstacMode(pxConfig *config)
+static bool addstackedMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -1066,5 +1092,5 @@
 }
 
-static bool stacMode(pxConfig *config)
+static bool stackedMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -1224,4 +1250,19 @@
 }
 
+static bool tonormalizeMode(pxConfig *config)
+{
+    return true;
+}
+
+static bool addnormstatMode(pxConfig *config)
+{
+    return true;
+}
+
+static bool normstatMode(pxConfig *config)
+{
+    return true;
+}
+
 static psArray *validDetInputClassIds(pxConfig *config, const char *det_id)
 {
@@ -1415,4 +1456,9 @@
     psFree(masterImfile);
 
+    return true;
+}
+
+static bool toresidMode(pxConfig *config)
+{
     return true;
 }
@@ -1497,4 +1543,9 @@
 }
 
+static bool toresidexpMode(pxConfig *config)
+{
+    return true;
+}
+
 static bool normalizedframeMode(pxConfig *config)
 {
@@ -1580,5 +1631,5 @@
 }
 
-static bool addresidMode(pxConfig *config)
+static bool addresidimfileMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -1720,5 +1771,5 @@
 }
 
-static bool residMode(pxConfig *config)
+static bool residimfileMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);