Changeset 25071

Timestamp:

Aug 14, 2009, 10:23:24 AM (17 years ago)

Author:

Paul Price

Message:

Altering SQL to get exp_id for warp1 and warp2.

Location:

trunk/ippTools

Files:

• share/difftool_skyfile.sql (modified) (1 diff)
• src/difftool.c (modified) (1 diff)

trunk/ippTools/share/difftool_skyfile.sql

@@ -6 +6 @@
     diffRun.workdir,
     diffRun.bothways,
-    camProcessedExp.zpt_obs,
-    camProcessedExp.zpt_stdev,
-    camProcessedExp.zpt_lq,
-    camProcessedExp.zpt_uq,
-    rawExp.exp_time,
-    rawExp.camera,
     warp1,
     stack1,
     warp2,
-    stack2
+    stack2,
+    -- The following are only valid for warps
+    -- XXX This needs to be more clever to handle diffs between stacks
+    camProcessedInput.zpt_obs,
+    camProcessedInput.zpt_stdev,
+    camProcessedInput.zpt_lq,
+    camProcessedInput.zpt_uq,
+    rawInput.exp_time,
+    rawInput.camera,
+    rawInput.exp_id AS exp1,
+    rawTemplate.exp_id AS exp2
 FROM diffRun
 JOIN diffSkyfile USING(diff_id)
 JOIN diffInputSkyfile USING(diff_id, skycell_id)
-JOIN warpRun
--- NOTE: joining input only!
--- This is so that we can get the correct zero point
--- XXX This needs to be more clever to handle diffs between stacks
-    ON warpRun.warp_id = diffInputSkyfile.warp1
-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)
+LEFT JOIN warpRun AS warpInput
+    ON warpInput.warp_id = diffInputSkyfile.warp1
+LEFT JOIN fakeRun AS fakeInput
+    ON fakeInput.fake_id = warpInput.fake_id
+LEFT JOIN camRun AS camInput
+    ON camInput.cam_id = fakeInput.cam_id
+LEFT JOIN camProcessedExp AS camProcessedInput
+    ON camProcessedInput.cam_id = camInput.cam_id
+LEFT JOIN chipRun AS chipInput
+    ON chipInput.chip_id = camInput.chip_id
+LEFT JOIN rawExp AS rawInput
+    ON rawInput.exp_id = chipInput.exp_id
+LEFT JOIN warpRun AS warpTemplate
+    ON warpTemplate.warp_id = diffInputSkyfile.warp2
+LEFT JOIN fakeRun AS fakeTemplate
+    ON fakeTemplate.fake_id = warpTemplate.fake_id
+LEFT JOIN camRun AS camTemplate
+    ON camTemplate.cam_id = fakeTemplate.cam_id
+LEFT JOIN chipRun AS chipTemplate
+    ON chipTemplate.chip_id = camTemplate.chip_id
+LEFT JOIN rawExp AS rawTemplate
+    ON rawTemplate.exp_id = chipTemplate.exp_id

trunk/ippTools/src/difftool.c

@@ -584 +584 @@
     PXOPT_COPY_STR(config->args, where, "-tess_id", "diffRun.tess_id", "==");
     PXOPT_COPY_S16(config->args, where, "-fault", "diffSkyfile.fault", "==");
-    PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.exp_id", "==");
-    PXOPT_COPY_STR(config->args, where, "-exp_name", "rawExp.exp_name", "==");
-    PXOPT_COPY_STR(config->args, where, "-warp_id", "warpRun.warp_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-exp_id", "rawInput.exp_id", "==");
+    PXOPT_COPY_STR(config->args, where, "-exp_name", "rawInput.exp_name", "==");
+    PXOPT_COPY_STR(config->args, where, "-warp_id", "warpInput.warp_id", "==");
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);