Index: trunk/ippTools/share/magicdstool_completed_runs.sql
===================================================================
--- trunk/ippTools/share/magicdstool_completed_runs.sql	(revision 20789)
+++ trunk/ippTools/share/magicdstool_completed_runs.sql	(revision 20792)
@@ -20,7 +20,7 @@
     JOIN camProcessedExp USING(cam_id)
     JOIN rawImfile ON magicRun.exp_id = rawImfile.exp_id
-    LEFT JOIN magicDSImfile
-        ON magicDSRun.magic_ds_id = magicDSImfile.magic_ds_id
-        AND magicDSImfile.component = rawImfile.class_id
+    LEFT JOIN magicDSFile
+        ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
+        AND magicDSFile.component = rawImfile.class_id
     WHERE
         magicDSRun.state = 'run'
@@ -30,6 +30,6 @@
         rawImfile.exp_id
     HAVING
-        COUNT(rawImfile.class_id) = COUNT(magicDSImfile.component)
-        AND SUM(magicDSImfile.fault) = 0
+        COUNT(rawImfile.class_id) = COUNT(magicDSFile.component)
+        AND SUM(magicDSFile.fault) = 0
 UNION
 -- chip stage
@@ -53,7 +53,7 @@
     JOIN chipProcessedImfile USING(chip_id)
 
-    LEFT JOIN magicDSImfile
-        ON magicDSImfile.magic_ds_id = magicDSRun.magic_ds_id
-        AND magicDSImfile.component = chipProcessedImfile.class_id
+    LEFT JOIN magicDSFile
+        ON magicDSFile.magic_ds_id = magicDSRun.magic_ds_id
+        AND magicDSFile.component = chipProcessedImfile.class_id
     WHERE
         magicDSRun.state = 'run'
@@ -63,6 +63,6 @@
         chipRun.chip_id
     HAVING
-        COUNT(chipProcessedImfile.class_id) = COUNT(magicDSImfile.component)
-        AND SUM(magicDSImfile.fault) = 0
+        COUNT(chipProcessedImfile.class_id) = COUNT(magicDSFile.component)
+        AND SUM(magicDSFile.fault) = 0
 UNION
 -- warp stage
@@ -81,7 +81,7 @@
     JOIN warpSkyfile using(warp_id)
     JOIN warpRun USING(warp_id)
-    LEFT JOIN magicDSImfile
-        ON magicDSRun.magic_ds_id = magicDSImfile.magic_ds_id
-        AND magicDSImfile.component = warpSkyfile.skycell_id
+    LEFT JOIN magicDSFile
+        ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
+        AND magicDSFile.component = warpSkyfile.skycell_id
     WHERE
         magicDSRun.state = 'run'
@@ -93,6 +93,6 @@
         warpRun.warp_id
     HAVING
-        COUNT(warpSkyfile.skycell_id) = COUNT(magicDSImfile.component)
-        AND SUM(magicDSImfile.fault) = 0
+        COUNT(warpSkyfile.skycell_id) = COUNT(magicDSFile.component)
+        AND SUM(magicDSFile.fault) = 0
 UNION
 -- diff stage
@@ -105,7 +105,7 @@
     JOIN diffSkyfile USING(diff_id)
     JOIN diffInputSkyfile USING(diff_id)
-    LEFT JOIN magicDSImfile
-        ON magicDSRun.magic_ds_id = magicDSImfile.magic_ds_id
-        AND magicDSImfile.component = diffInputSkyfile.skycell_id
+    LEFT JOIN magicDSFile
+        ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
+        AND magicDSFile.component = diffInputSkyfile.skycell_id
     WHERE
         magicDSRun.state = 'run'
@@ -117,6 +117,6 @@
         magicRun.magic_id
     HAVING
-        COUNT(magicInputSkyfile.node) = COUNT(magicDSImfile.component)
-        AND SUM(magicDSImfile.fault) = 0
+        COUNT(magicInputSkyfile.node) = COUNT(magicDSFile.component)
+        AND SUM(magicDSFile.fault) = 0
 
    ) as Foo
Index: trunk/ippTools/share/magicdstool_todestreak.sql
===================================================================
--- trunk/ippTools/share/magicdstool_todestreak.sql	(revision 20789)
+++ trunk/ippTools/share/magicdstool_todestreak.sql	(revision 20792)
@@ -32,11 +32,11 @@
 JOIN camProcessedExp USING(cam_id)
 JOIN rawImfile ON magicRun.exp_id = rawImfile.exp_id
-LEFT JOIN magicDSImfile
-    ON magicDSRun.magic_ds_id = magicDSImfile.magic_ds_id
-    AND magicDSImfile.component = rawImfile.class_id
+LEFT JOIN magicDSFile
+    ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
+    AND magicDSFile.component = rawImfile.class_id
 WHERE
     magicDSRun.state = 'run'
     AND magicDSRun.stage = 'raw'
-    AND magicDSImfile.component IS NULL
+    AND magicDSFile.component IS NULL
 UNION
   -- chipProcesedImfiles
@@ -75,7 +75,7 @@
 JOIN chipProcessedImfile USING(chip_id)
 JOIN rawExp ON chipRun.exp_id = rawExp.exp_id
-LEFT JOIN magicDSImfile
-    ON magicDSRun.magic_ds_id = magicDSImfile.magic_ds_id
-    AND magicDSImfile.component = chipProcessedImfile.class_id
+LEFT JOIN magicDSFile
+    ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
+    AND magicDSFile.component = chipProcessedImfile.class_id
 WHERE
     magicDSRun.state = 'run'
@@ -83,5 +83,5 @@
     AND chipRun.state = 'full'
     AND chipProcessedImfile.fault = 0
-    AND magicDSImfile.component IS NULL
+    AND magicDSFile.component IS NULL
 UNION
 -- warpSkyfiles
@@ -116,7 +116,7 @@
 JOIN warpRun USING(warp_id)
 JOIN rawExp ON magicRun.exp_id = rawExp.exp_id
-LEFT JOIN magicDSImfile
-    ON magicDSRun.magic_ds_id = magicDSImfile.magic_ds_id
-    AND magicDSImfile.component = warpSkyfile.skycell_id
+LEFT JOIN magicDSFile
+    ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
+    AND magicDSFile.component = warpSkyfile.skycell_id
 WHERE
     magicDSRun.state = 'run'
@@ -124,5 +124,6 @@
     AND warpRun.state = 'full'
     AND warpSkyfile.fault = 0
-    AND magicDSImfile.component IS NULL
+    AND warpSkyfile.ignored = 0
+    AND magicDSFile.component IS NULL
 UNION
 -- diffSkyfiles
@@ -151,7 +152,7 @@
 JOIN diffSkyfile USING(diff_id)
 JOIN diffInputSkyfile USING(diff_id)
-LEFT JOIN magicDSImfile
-    ON magicDSRun.magic_ds_id = magicDSImfile.magic_ds_id
-    AND magicDSImfile.component = diffInputSkyfile.skycell_id
+LEFT JOIN magicDSFile
+    ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
+    AND magicDSFile.component = diffInputSkyfile.skycell_id
 WHERE
     magicDSRun.state = 'run'
@@ -159,4 +160,4 @@
     AND diffRun.state = 'full'
     AND diffSkyfile.fault = 0
-    AND magicDSImfile.component IS NULL
+    AND magicDSFile.component IS NULL
 ) as Foo