Changeset 31236

Timestamp:

Apr 7, 2011, 3:42:30 PM (15 years ago)

Author:

bills

Message:

various changes to support distributing rawImages with exp_type != 'OBJECT'
(This should have been checked in with r30906

Location:

trunk/ippTools/share

Files:

• Makefile.am (modified) (1 diff)
• difftool_listrun.sql (modified) (3 diffs)
• disttool_definebyquery_raw_no_magic.sql (added)
• disttool_pending_SSdiff.sql (modified) (1 diff)
• disttool_pending_camera.sql (modified) (1 diff)
• disttool_pending_chip.sql (modified) (1 diff)
• disttool_pending_chip_bg.sql (modified) (1 diff)
• disttool_pending_diff.sql (modified) (1 diff)
• disttool_pending_fake.sql (modified) (1 diff)
• disttool_pending_raw.sql (modified) (6 diffs)
• disttool_pending_sky.sql (modified) (1 diff)
• disttool_pending_stack.sql (modified) (1 diff)
• disttool_pending_warp.sql (modified) (1 diff)
• disttool_pending_warp_bg.sql (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -164 +164 @@
         disttool_definebyquery_fake.sql \
         disttool_definebyquery_raw.sql \
+        disttool_definebyquery_raw_no_magic.sql \
         disttool_definebyquery_sky.sql \
         disttool_definebyquery_stack.sql \

trunk/ippTools/share/difftool_listrun.sql

@@ -20 +20 @@
     camProcessedInput.zpt_lq,
     camProcessedInput.zpt_uq,
+    camProcessedInput.fwhm_major,
     rawInput.comment,
     rawInput.exp_time,
@@ -25 +26 @@
     rawInput.exp_name AS exp_name_1,
     rawInput.exp_id AS exp_id_1,
+    rawInput.filter AS filter_1,
     rawInput.comment AS comment_1,
     rawInput.dateobs AS dateobs_1,
@@ -34 +36 @@
     rawTemplate.exp_name AS exp_name_2,
     rawTemplate.exp_id AS exp_id_2,
+    rawInput.filter AS filter_2,
     rawTemplate.comment AS comment_2,
     rawTemplate.dateobs AS dateobs_2,

trunk/ippTools/share/disttool_pending_SSdiff.sql

@@ -6 +6 @@
     stage_id,
     diffSkyfile.skycell_id AS component,
+    exp_type,
     clean,
     rawExp.camera,

trunk/ippTools/share/disttool_pending_camera.sql

@@ -6 +6 @@
     stage_id,
     'exposure' AS component,
+    exp_type,
     clean,
     rawExp.camera,

trunk/ippTools/share/disttool_pending_chip.sql

@@ -6 +6 @@
     stage_id,
     chipProcessedImfile.class_id AS component,
+    exp_type,
     distRun.clean,
     rawExp.camera,

trunk/ippTools/share/disttool_pending_chip_bg.sql

@@ -6 +6 @@
     stage_id,
     chipBackgroundImfile.class_id AS component,
+    exp_type,
     distRun.clean,
     rawExp.camera,

trunk/ippTools/share/disttool_pending_diff.sql

@@ -6 +6 @@
     stage_id,
     diffSkyfile.skycell_id AS component,
+    exp_type,
     clean,
     rawExp.camera,

trunk/ippTools/share/disttool_pending_fake.sql

@@ -6 +6 @@
     stage_id,
     fakeProcessedImfile.class_id AS component,
+    exp_type,
     clean,
     rawExp.camera,

trunk/ippTools/share/disttool_pending_raw.sql

@@ +1 @@
+SELECT * FROM (
+-- rawExp magicked with re_place
 SELECT
     distRun.dist_id,
@@ -6 +8 @@
     rawExp.exp_id AS stage_id,
     rawImfile.class_id AS component,
+    rawExp.exp_type,
     clean,
     rawExp.camera,
@@ -38 +41 @@
     AND distRun.stage = 'raw'
     AND distComponent.dist_id IS NULL
-    AND (rawExp.magicked OR distRun.no_magic)
+    -- AND (rawExp.magicked OR distRun.no_magic)
+    AND rawExp.magicked
     -- need to have magicked the chip image which makes the camera mask
     AND chipProcessedImfile.magicked != 0
     AND camRun.magicked > 0 
+    AND (Label.active OR Label.active IS NULL)
+UNION
+SELECT
+    -- raw images no_magic required
+    distRun.dist_id,
+    distRun.label,
+    distTarget.dist_group,
+    'raw' AS stage,
+    rawExp.exp_id AS stage_id,
+    rawImfile.class_id AS component,
+    rawExp.exp_type,
+    clean,
+    rawExp.camera,
+    CONCAT_WS('.', distRun.outroot, CONVERT(distRun.dist_id, CHAR)) as outdir,
+    -- XXX: replace this with rawImfile.path_base once it exists
+    TRIM(TRAILING '.fits' FROM rawImfile.uri) AS path_base,
+    CAST(NULL AS CHAR(255)) AS alt_path_base,
+    -- pass camera stage path base since we want the camera mask file. The script knows what to do
+    CAST(NULL AS CHAR(255)) AS chip_path_base,
+    CAST(NULL AS CHAR(255)) AS state,
+    CAST(NULL AS CHAR(255)) AS data_state,
+    0 as quality,
+    distRun.no_magic,
+    rawImfile.magicked,
+    IFNULL(Label.priority, 10000) AS priority
+FROM distRun
+JOIN distTarget USING(target_id, stage, clean)
+JOIN rawExp ON rawExp.exp_id = stage_id 
+            AND distTarget.stage = 'raw' AND distRun.alternate = 0
+JOIN rawImfile USING(exp_id)
+LEFT JOIN distComponent 
+    ON distRun.dist_id = distComponent.dist_id 
+    AND rawImfile.class_id = distComponent.component
+LEFT JOIN Label ON distRun.label = Label.label
+WHERE
+    distRun.state = 'new'
+    AND distRun.clean = 0
+    AND distRun.stage = 'raw'
+    AND distComponent.dist_id IS NULL
+    AND (distRun.no_magic)
     AND (Label.active OR Label.active IS NULL)
 UNION
@@ -52 +96 @@
     rawExp.exp_id AS stage_id,
     rawImfile.class_id AS component,
+    rawExp.exp_type,
     clean,
     rawExp.camera,
@@ -96 +141 @@
     rawExp.exp_id AS stage_id,
     'exposure' AS component,
+    rawExp.exp_type,
     clean,
     rawExp.camera,
@@ -120 +166 @@
     AND distComponent.dist_id IS NULL
     AND (Label.active OR Label.active IS NULL)
+) AS distRun
+WHERE 1

trunk/ippTools/share/disttool_pending_sky.sql

@@ -6 +6 @@
     stage_id,
     stackRun.skycell_id AS component,
+    exp_type,
     clean,
     rawExp.camera,

trunk/ippTools/share/disttool_pending_stack.sql

@@ -6 +6 @@
     stage_id,
     stackRun.skycell_id AS component,
+    exp_type,
     clean,
     rawExp.camera,

trunk/ippTools/share/disttool_pending_warp.sql

@@ -6 +6 @@
     stage_id,
     warpSkyfile.skycell_id AS component,
+    exp_type,
     clean,
     rawExp.camera,

trunk/ippTools/share/disttool_pending_warp_bg.sql

@@ -6 +6 @@
     stage_id,
     warpBackgroundSkyfile.skycell_id AS component,
+    exp_type,
     clean,
     rawExp.camera,