Changeset 32939

Timestamp:

Dec 13, 2011, 11:07:51 AM (14 years ago)

Author:

bills

Message:

Remove the requirement that chipimages be destreaked before being included in an update warp
if they were destreaked before they were cleaned.

Location:

trunk/ippTools/share

Files:

• chiptool_setimfiletoupdate.sql (modified) (2 diffs, 1 prop)
• warptool_towarped.sql (modified) (1 diff, 1 prop)

trunk/ippTools/share/chiptool_setimfiletoupdate.sql

@@ -1 +1 @@
 UPDATE chipRun
     JOIN chipProcessedImfile USING(chip_id)
-    LEFT JOIN magicDSRun ON (stage_id = chip_id AND stage = 'chip')
-    LEFT JOIN magicDSFile ON (magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
-                              AND component = class_id)
+    -- LEFT JOIN magicDSRun ON (stage_id = chip_id AND stage = 'chip')
+    -- LEFT JOIN magicDSFile ON (magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
+      --                         AND component = class_id)
 SET chipRun.state = 'update', 
     chipProcessedImfile.data_state = 'update',
@@ -12 +12 @@
     AND (chipProcessedImfile.data_state = 'cleaned')
     -- don't queue update if the associated magicDSFile exists and isn't cleaned
-    AND (chipRun.magicked = 0 
-      OR ((magicDSRun.state = 'cleaned' OR magicDSRun.state = 'update')
-            AND (magicDSFile.data_state = 'cleaned' OR magicDSFile.data_state = 'update'))
-    )
+    -- AND (chipRun.magicked = 0 
+    --   OR ((magicDSRun.state = 'cleaned' OR magicDSRun.state = 'update')
+    --         AND (magicDSFile.data_state = 'cleaned' OR magicDSFile.data_state = 'update'))
+    -- )

trunk/ippTools/share/warptool_towarped.sql

@@ -106 +106 @@
         -- 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
     )