Index: trunk/ippTools/src/magictool.c
===================================================================
--- trunk/ippTools/src/magictool.c	(revision 14481)
+++ trunk/ippTools/src/magictool.c	(revision 14537)
@@ -29,24 +29,16 @@
 
 #include "pxtools.h"
-#include "warptool.h"
+#include "magictool.h"
 
 static psS64 definerunMode(pxConfig *config);
-static bool runoneMode(pxConfig *config);
 static bool updaterunMode(pxConfig *config);
-static bool addinputexpMode(pxConfig *config);
-static bool expMode(pxConfig *config);
-static bool imfileMode(pxConfig *config);
-static bool tooverlapMode(pxConfig *config);
-static bool addoverlapMode(pxConfig *config);
-static bool scmapMode(pxConfig *config);
-static bool towarpedMode(pxConfig *config);
-static bool addwarpedMode(pxConfig *config);
-static bool warpedMode(pxConfig *config);
-static bool revertwarpedMode(pxConfig *config);
-
-static bool parseAndInsertSkyCellMap(pxConfig *config, const char *mapfile);
-static bool setwarpRunState(pxConfig *config, psS64 warp_id, const char *state);
-static bool isValidMode(pxConfig *config, const char *mode);
-bool warpCompletedRuns(pxConfig *config);
+static bool addinputskyfileMode(pxConfig *config);
+static bool inputtreeMode(pxConfig *config);
+static bool toprocessMode(pxConfig *config);
+static bool addresultMode(pxConfig *config);
+static bool tomaskMode(pxConfig *config);
+static bool addmaskMode(pxConfig *config);
+static bool toskyfilemaskMode(pxConfig *config);
+static bool addskyfilemaskMode(pxConfig *config);
 
 # define MODECASE(caseName, func) \
@@ -61,5 +53,5 @@
     psLibInit(NULL);
 
-    pxConfig *config = warptoolConfig(NULL, argc, argv);
+    pxConfig *config = magictoolConfig(NULL, argc, argv);
     if (!config) {
         psError(PXTOOLS_ERR_CONFIG, false, "failed to configure");
@@ -68,17 +60,14 @@
 
     switch (config->mode) {
-        MODECASE(WARPTOOL_MODE_DEFINERUN,         definerunMode);
-        MODECASE(WARPTOOL_MODE_RUNONE,            runoneMode);
-        MODECASE(WARPTOOL_MODE_UPDATERUN,         updaterunMode);
-        MODECASE(WARPTOOL_MODE_ADDINPUTEXP,       addinputexpMode);
-        MODECASE(WARPTOOL_MODE_EXP,               expMode);
-        MODECASE(WARPTOOL_MODE_IMFILE,            imfileMode);
-        MODECASE(WARPTOOL_MODE_TOOVERLAP,         tooverlapMode);
-        MODECASE(WARPTOOL_MODE_ADDOVERLAP,        addoverlapMode);
-        MODECASE(WARPTOOL_MODE_SCMAP,             scmapMode);
-        MODECASE(WARPTOOL_MODE_TOWARPED,          towarpedMode);
-        MODECASE(WARPTOOL_MODE_ADDWARPED,         addwarpedMode);
-        MODECASE(WARPTOOL_MODE_WARPED,            warpedMode);
-        MODECASE(WARPTOOL_MODE_REVERTWARPED,      revertwarpedMode);
+        MODECASE(MAGICTOOL_MODE_DEFINERUN,      definerunMode);
+        MODECASE(MAGICTOOL_MODE_UPDATERUN,      updaterunMode);
+        MODECASE(MAGICTOOL_MODE_ADDINPUTSKYFILE,addinputskyfileMode);
+        MODECASE(MAGICTOOL_MODE_INPUTTREE,      inputtreeMode);
+        MODECASE(MAGICTOOL_MODE_TOPROCESS,      toprocessMode);
+        MODECASE(MAGICTOOL_MODE_ADDRESULT,      addresultMode);
+        MODECASE(MAGICTOOL_MODE_TOMASK,         tomaskMode);
+        MODECASE(MAGICTOOL_MODE_ADDMASK,        addmaskMode);
+        MODECASE(MAGICTOOL_MODE_TOSKYFILEMASK,  toskyfilemaskMode);
+        MODECASE(MAGICTOOL_MODE_ADDSKYFILEMASK, addskyfilemaskMode);
         default:
             psAbort("invalid option (this should not happen)");
@@ -102,4 +91,74 @@
 }
 
+static psS64 definerunMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    return 0;
+}
+
+
+static bool updaterunMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    return true;
+}
+
+
+static bool addinputskyfileMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    return true;
+}
+
+
+static bool inputtreeMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    return true;
+}
+
+
+static bool toprocessMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    return true;
+}
+
+
+static bool addresultMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    return true;
+}
+
+
+static bool tomaskMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    return true;
+}
+
+
+static bool addmaskMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    return true;
+}
+
+
+static bool toskyfilemaskMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    return true;
+}
+
+
+static bool addskyfilemaskMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    return true;
+}
+
+#if 0
 
 static psS64 definerunMode(pxConfig *config)
@@ -1274,2 +1333,3 @@
     return true;
 }
+#endif