Index: trunk/ippTools/share/warptool_towarped.sql
===================================================================
--- trunk/ippTools/share/warptool_towarped.sql	(revision 29136)
+++ trunk/ippTools/share/warptool_towarped.sql	(revision 29171)
@@ -97,12 +97,10 @@
         AND warpSkyfile.fault = 0
         AND camRun.state = 'full'
-        AND chipProcessedImfile.data_state = 'full'
-        -- if warpSkyfile was magicked previously require inputs to be magicked
-        -- this blocks processing until all the chip inputs have been destreaked
-        AND (warpSkyfile.magicked = 0 OR chipProcessedImfile.magicked >= 0)
         AND (Label.active OR Label.active IS NULL)
         -- where hook 2 %s
     GROUP BY warp_id, skycell_id
-    HAVING COUNT(warpSkyCellMap.class_id) = COUNT(chipProcessedImfile.class_id)
+    -- if warpSkyfile was magicked previously require inputs to be magicked
+    -- this blocks processing until all the chip inputs have been destreaked
+    HAVING COUNT(warpSkyCellMap.class_id) = SUM(IF(chipProcessedImfile.data_state ='full' and (chipRun.magicked = 0 OR chipProcessedImfile.magicked > 0), 1, 0))
     -- limit hook 2 %s
     )