Index: trunk/ippTools/share/magicdstool_todestreak.sql
===================================================================
--- trunk/ippTools/share/magicdstool_todestreak.sql	(revision 20763)
+++ 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