Index: trunk/ippTools/share/Makefile.am
===================================================================
--- trunk/ippTools/share/Makefile.am	(revision 18524)
+++ trunk/ippTools/share/Makefile.am	(revision 18526)
@@ -70,5 +70,7 @@
 	magictool_toprocess_tree.sql \
 	magictool_toskyfilemask.sql \
-	magictool_node.sql \
+	magictool_inputs.sql \
+	magictool_addmask.sql \
+	magictool_mask.sql \
 	pxadmin_create_tables.sql \
 	pxadmin_drop_tables.sql \
Index: trunk/ippTools/share/magictool_addmask.sql
===================================================================
--- trunk/ippTools/share/magictool_addmask.sql	(revision 18526)
+++ trunk/ippTools/share/magictool_addmask.sql	(revision 18526)
@@ -0,0 +1,6 @@
+UPDATE
+    magicRun
+SET
+    state = 'stop'
+WHERE
+    state != 'stop'
Index: trunk/ippTools/share/magictool_inputs.sql
===================================================================
--- trunk/ippTools/share/magictool_inputs.sql	(revision 18526)
+++ trunk/ippTools/share/magictool_inputs.sql	(revision 18526)
@@ -0,0 +1,29 @@
+SELECT *
+FROM (
+-- Single skycells
+SELECT
+    magicInputSkyfile.node,
+    magicRun.state,
+    diffSkyfile.uri,
+    diffSkyfile.fault
+FROM magicInputSkyfile
+JOIN diffSkyfile
+    using(diff_id)
+JOIN magicRun
+    USING(magic_id)
+UNION
+-- Merged skycells
+SELECT
+    magicTree.node,
+    magicRun.state,
+    magicNodeResult.uri,
+    magicNodeResult.fault
+FROM magicTree
+JOIN magicRun
+    USING(magic_id)
+JOIN magicNodeResult
+    ON magicTree.magic_id = magicNodeResult.magic_id
+    AND magicTree.dep = magicNodeResult.node
+) as Foo
+WHERE
+    fault = 0
Index: trunk/ippTools/share/magictool_mask.sql
===================================================================
--- trunk/ippTools/share/magictool_mask.sql	(revision 18526)
+++ trunk/ippTools/share/magictool_mask.sql	(revision 18526)
@@ -0,0 +1,8 @@
+SELECT
+    magicMask.*
+FROM magicMask
+JOIN magicRun
+    USING(magic_id)
+WHERE
+    magicRun.state = 'stop'
+    AND magicMask.fault = 0
Index: trunk/ippTools/share/magictool_node.sql
===================================================================
--- trunk/ippTools/share/magictool_node.sql	(revision 18524)
+++ 	(revision )
@@ -1,29 +1,0 @@
-SELECT *
-FROM (
--- Single skycells
-SELECT
-    magicInputSkyfile.node,
-    magicRun.state,
-    diffSkyfile.uri,
-    diffSkyfile.fault
-FROM magicInputSkyfile
-JOIN diffSkyfile
-    using(diff_id)
-JOIN magicRun
-    USING(magic_id)
-UNION
--- Merged skycells
-SELECT
-    magicTree.node,
-    magicRun.state,
-    magicNodeResult.uri,
-    magicNodeResult.fault
-FROM magicTree
-JOIN magicRun
-    USING(magic_id)
-JOIN magicNodeResult
-    ON magicTree.magic_id = magicNodeResult.magic_id
-    AND magicTree.dep = magicNodeResult.node
-) as Foo
-WHERE
-    fault = 0