Changeset 24336 for trunk/ippScripts/scripts/ipp_serial_mops.pl

Timestamp:

Jun 4, 2009, 8:17:07 PM (17 years ago)

Author:

Paul Price

Message:

Need to use warp1 as the template for zero point, since the difference image is normalised to the input.

File:

• trunk/ippScripts/scripts/ipp_serial_mops.pl (modified) (4 diffs)

trunk/ippScripts/scripts/ipp_serial_mops.pl

@@ -80 +80 @@
     MAX(diffWarps.diff_id) AS diff_id,
     -- The following trick pulls out the appropriate values for the maximum diff_id
-    SUBSTRING_INDEX(GROUP_CONCAT(camProcessedExp.zpt_obs ORDER BY diffWarps.diff_id), ',', 1) AS zpt_obs,
+    SUBSTRING_INDEX(GROUP_CONCAT(camTemplate.zpt_obs ORDER BY diffWarps.diff_id), ',', 1) AS zpt_obs,
     CONVERT(SUBSTRING_INDEX(GROUP_CONCAT(diffWarps.inverse ORDER BY diffWarps.diff_id), ',', 1), UNSIGNED) AS inverse
 FROM (
@@ -87 +87 @@
         diffRun.diff_id,
         warp1 AS warp_id,
+        warp1 AS template_warp,
         0 AS inverse
     FROM diffRun
@@ -99 +100 @@
         diffRun.diff_id,
         warp2 AS warp_id,
+        warp1 AS template_warp,
         1 AS inverse
     FROM diffRun
@@ -111 +113 @@
 JOIN fakeRun USING(fake_id)
 JOIN camRun USING(cam_id)
-JOIN camProcessedExp USING(cam_id)
 JOIN chipRun USING(chip_id)
 JOIN rawExp USING(exp_id)
+JOIN warpRun AS warpTemplate ON warpTemplate.warp_id = diffWarps.template_warp
+JOIN fakeRun AS fakeTemplate ON fakeTemplate.fake_id = warpTemplate.fake_id
+JOIN camProcessedExp AS camTemplate ON camTemplate.cam_id = fakeTemplate.cam_id
 WHERE rawExp.camera = '$camera'
 GROUP BY exp_id;";