Changeset 25256 for trunk/ippTools/share/difftool_skyfile.sql

Timestamp:

Sep 2, 2009, 2:36:52 PM (17 years ago)

Author:

Paul Price

Message:

Merging branches/pap_mops into trunk. ppMops now merges multiple skycells, and these get published for MOPS as a single file per exposure. Tested and works.

Location:

trunk

Files:

• . (modified) (1 prop)
• ippTools/share/difftool_skyfile.sql (modified) (3 diffs)

trunk/ippTools/share/difftool_skyfile.sql

@@ -12 +12 @@
     -- The following are only valid for warps
     -- XXX This needs to be more clever to handle diffs between stacks
+    -- Zero points are appropriate for both forward and backward diffs
     camProcessedInput.zpt_obs,
     camProcessedInput.zpt_stdev,
@@ -19 +20 @@
     rawInput.camera,
     rawInput.exp_name AS exp_name_1,
+    rawInput.exp_id AS exp_id_1,
+    chipInput.chip_id AS chip_id_1,
+    camInput.cam_id AS cam_id_1,
+    fakeInput.fake_id AS fake_id_1,
+    camProcessedInput.sigma_ra AS sigma_ra_1,
+    camProcessedInput.sigma_dec AS sigma_dec_1,
     rawTemplate.exp_name AS exp_name_2,
-    rawInput.exp_id AS exp_id_1,
-    rawTemplate.exp_id AS exp_id_2
+    rawTemplate.exp_id AS exp_id_2,
+    chipTemplate.chip_id AS chip_id_2,
+    camTemplate.cam_id AS cam_id_2,
+    fakeTemplate.fake_id AS fake_id_2,
+    camProcessedTemplate.sigma_ra AS sigma_ra_2,
+    camProcessedTemplate.sigma_dec AS sigma_dec_2
 FROM diffRun
 JOIN diffSkyfile USING(diff_id)
@@ -43 +54 @@
 LEFT JOIN camRun AS camTemplate
     ON camTemplate.cam_id = fakeTemplate.cam_id
+LEFT JOIN camProcessedExp AS camProcessedTemplate
+    ON camProcessedTemplate.cam_id = camTemplate.cam_id
 LEFT JOIN chipRun AS chipTemplate
     ON chipTemplate.chip_id = camTemplate.chip_id