Changeset 33415 for branches/meh_branches/ppstack_test/ippTools/share/warptool_towarped.sql

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ippTools/share/warptool_towarped.sql (modified) (1 diff, 1 prop)

branches/meh_branches/ppstack_test/ippTools/share/warptool_towarped.sql

@@ -100 +100 @@
         AND warpSkyfile.fault = 0
         AND camRun.state = 'full'
+        AND chipProcessedImfile.quality = 0
+        -- Maybe add this to solve the if any chip is bad a whole warp can't be updated problem?
+        -- AND (chipProcessedImfile.fault = 0 OR chipProcessedImfile.fault = 26)
         AND (Label.active OR Label.active IS NULL)
         -- where hook 2 %s
     GROUP BY warp_id, skycell_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))
+    HAVING COUNT(warpSkyCellMap.class_id) = SUM(IF(chipProcessedImfile.data_state ='full', 1, 0))
     -- limit hook 2 %s
     )