Changeset 28017 for branches/czw_branch/20100427/ippTools/share/magicdstool_todestreak_raw.sql

Timestamp:

May 18, 2010, 5:06:01 PM (16 years ago)

Author:

watersc1

Message:

Almost working version of the mask-stats/software revision code.

Almost.

Location:

branches/czw_branch/20100427

Files:

• . (modified) (1 prop)
• ippTools/share/magicdstool_todestreak_raw.sql (modified) (2 diffs)

branches/czw_branch/20100427/ippTools/share/magicdstool_todestreak_raw.sql

@@ -4 +4 @@
     magicRun.exp_id,
     magicDSRun.label,
-    camera,
+    rawExp.camera,
     magicMask.uri as streaks_uri,
     CAST(NULL AS CHAR(255)) AS inv_streaks_uri,
     stage,
     stage_id,
+    rawExp.magicked,
     class_id as component,
     rawImfile.uri AS uri,
@@ -25 +26 @@
 JOIN camRun USING(cam_id)
 JOIN camProcessedExp USING(cam_id)
-JOIN rawImfile ON magicRun.exp_id = rawImfile.exp_id
+JOIN rawExp ON magicRun.exp_id = rawExp.exp_id
+JOIN rawImfile ON rawExp.exp_id = rawImfile.exp_id
 LEFT JOIN magicDSFile
     ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id