Changeset 26958 for trunk/ippTools/share

Timestamp:

Feb 16, 2010, 11:20:32 AM (16 years ago)

Author:

watersc1

Message:

This should fix the stack-stack overqueueing bug. The test case for input_label = MD03.nightlyscience now only finds stacks from data_group MD03.20100215, which do not appear to have been queued for SS diffs before.

Location:

trunk/ippTools/share

Files:

• difftool_definestackstack_part0.sql (modified) (2 diffs)
• difftool_definestackstack_part1.sql (modified) (1 diff)

trunk/ippTools/share/difftool_definestackstack_part0.sql

@@ -5 +5 @@
        stackRun.label AS INPUT_label,
        stackRun.tess_id AS INPUT_tess_id
+--     ,
+--       stackRun.stack_id AS INPUT_stack_id,
+--       template.max_stack_id,
+--       diffExp.diff_id
 FROM stackRun JOIN stackSumSkyfile USING(stack_id) 
 JOIN (
@@ -28 +32 @@
      SELECT 
             diffRun.diff_id,
-            stackRun.stack_id 
+            diffInputSkyfile.stack1,
+            diffInputSkyfile.stack2
      FROM diffRun JOIN diffInputSkyfile USING(diff_id) 
           JOIN stackRun ON stackRun.stack_id = diffInputSkyfile.stack1 
           JOIN stackSumSkyfile USING(stack_id)
           WHERE 1
-          -- diff where hook %s
           -- input where hook %s
-) AS diffExp ON stackRun.stack_id = diffExp.stack_id 
+) AS diffExp ON diffExp.stack1 = stackRun.stack_id AND diffExp.stack2 = template.max_stack_id
 WHERE
         stackSumSkyfile.fault = 0 AND stackSumSkyfile.quality = 0
+        -- diff where hook %s
         -- input where hook again %s
 ORDER BY stackRun.data_group,stackRun.filter

trunk/ippTools/share/difftool_definestackstack_part1.sql

@@ -33 +33 @@
      SELECT 
             diffRun.diff_id,
-            stackRun.stack_id 
+            diffInputSkyfile.stack1,
+            diffInputSkyfile.stack2
      FROM diffRun JOIN diffInputSkyfile USING(diff_id) 
           JOIN stackRun ON stackRun.stack_id = diffInputSkyfile.stack1 
           JOIN stackSumSkyfile USING(stack_id)
           WHERE 1
-          -- diff where hook %s
           -- input where hook %s
-) AS diffExp ON stackRun.stack_id = diffExp.stack_id 
+) AS diffExp ON diffExp.stack1 = stackRun.stack_id AND diffExp.stack2 = template.max_stack_id
 WHERE
         stackSumSkyfile.fault = 0 AND stackSumSkyfile.quality = 0
+        -- diff where hook %s
         -- input where hook again %s
 ORDER BY stackRun.data_group,stackRun.filter,stackRun.skycell_id