Changeset 25027 for branches/pap/ippTools/share/magicdstool_getrunids.sql

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ippTools/share/magicdstool_getrunids.sql (modified) (2 diffs)

branches/pap/ippTools/share/magicdstool_getrunids.sql

@@ -5 +5 @@
     chip_id,
     cam_id,
-    warp_id 
+    warp_id,
+    diffSkyfile.diff_id
 FROM magicRun 
 JOIN magicInputSkyfile USING(magic_id)
 JOIN diffSkyfile 
-    ON magicInputSkyfile.diff_id = diffSkyfile.diff_id
+    ON magicRun.diff_id = diffSkyfile.diff_id
     AND magicInputSkyfile.node = diffSkyfile.skycell_id
 JOIN diffInputSkyfile
@@ -15 +16 @@
     AND diffInputSkyfile.skycell_id = diffSkyfile.skycell_id
 JOIN warpRun
-    ON diffInputSkyfile.warp1 = warp_id
+    ON (diffInputSkyfile.warp1 = warp_id AND !magicRun.inverse)
+    OR (diffInputSkyfile.warp2 = warp_id AND magicRun.inverse)
 JOIN fakeRun USING(fake_id)
 JOIN camRun USING(cam_id)