Changeset 27838 for branches/tap_branches/ippTools/share/magicdstool_todestreak_chip.sql

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

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

branches/tap_branches/ippTools/share/magicdstool_todestreak_chip.sql

@@ -5 +5 @@
     magicDSRun.label,
     camera,
-    magicMask.uri as streaks_uri,
+    magicMask.uri AS streaks_uri,
     CAST(NULL AS CHAR(255)) AS inv_streaks_uri,
     stage,
     stage_id,
-    class_id as component,
+    class_id AS component,
     chipProcessedImfile.uri,
     chipProcessedImfile.path_base,
     magicRun.inverse,
-    camProcessedExp.path_base as cam_path_base,
+    camProcessedExp.path_base AS cam_path_base,
+    camRun.reduction AS cam_reduction,
     outroot,
     recoveryroot,
@@ -21 +22 @@
 JOIN magicMask USING (magic_id)
 JOIN magicRun USING(magic_id)
+JOIN camRun USING(cam_id)
 JOIN camProcessedExp USING(cam_id)
-JOIN chipRun ON chip_id = stage_id
-JOIN chipProcessedImfile USING(chip_id)
+JOIN chipRun ON chipRun.chip_id = stage_id
+JOIN chipProcessedImfile ON chipRun.chip_id = chipProcessedImfile.chip_id
 JOIN rawExp ON chipRun.exp_id = rawExp.exp_id
 LEFT JOIN magicDSFile
@@ -31 +33 @@
     magicDSRun.state = 'new'
     AND magicDSRun.stage = 'chip'
-    AND chipRun.state = 'full'
+    AND (chipRun.state = 'full' OR (chipRun.state = 'update' and chipProcessedImfile.data_state = 'full'))
     AND chipProcessedImfile.fault = 0
     AND chipProcessedImfile.quality = 0