Changeset 23688 for trunk/ippTools/share/magicdstool_completed_runs.sql

Timestamp:

Apr 2, 2009, 2:51:37 PM (17 years ago)

Author:

Paul Price

Message:

Merging in branches/pap/ from r23685. Some conflicts, most notably in ippTools, but these resolved fairly simply. Only question mark is on regtool reversion, but I think I got it right. Everything builds fine.

Location:

trunk

Files:

• . (modified) (1 prop)
• ippTools/share/magicdstool_completed_runs.sql (modified) (5 diffs)

trunk/ippTools/share/magicdstool_completed_runs.sql

@@ -4 +4 @@
     (
 -- raw stage
-SELECT 
+SELECT
     magicDSRun.magic_ds_id
     FROM magicDSRun
@@ -22 +22 @@
 UNION
 -- chip stage
-SELECT 
+SELECT
     magicDSRun.magic_ds_id
     FROM magicDSRun
@@ -40 +40 @@
 UNION
 -- warp stage
-SELECT 
+SELECT
     magicDSRun.magic_ds_id
     FROM magicDSRun
@@ -51 +51 @@
         AND magicDSRun.stage = 'warp'
         AND warpSkyfile.fault = 0
-        AND warpSkyfile.ignored = 0
+        AND warpSkyfile.quality = 0
     GROUP BY
         magicDSRun.magic_ds_id,
@@ -75 +75 @@
         AND magicDSRun.stage = 'diff'
         AND diffSkyfile.fault = 0
+        AND diffSkyfile.quality = 0
     GROUP BY
         magicDSRun.magic_ds_id,