Index: trunk/ippTools/share/disttool_definebyquery_raw.sql
===================================================================
--- trunk/ippTools/share/disttool_definebyquery_raw.sql	(revision 27455)
+++ trunk/ippTools/share/disttool_definebyquery_raw.sql	(revision 27456)
@@ -1,22 +1,21 @@
-SELECT DISTINCT     -- we use distinct to handle multiple chip runs. Distribution will find right chipRun
+SELECT 
     'raw' AS stage,
     rawExp.exp_id AS stage_id,
     rawExp.exp_name AS run_tag,
     rawExp.magicked,
-    chipRun.label,
-    chipRun.data_group,
+    camRun.label,
+    camRun.data_group,
     distTarget.dist_group,
     distTarget.target_id,
     distTarget.clean
 FROM rawExp
-JOIN chipRun USING(exp_id)
-JOIN distTarget ON distTarget.dist_group = chipRun.dist_group AND distTarget.stage = 'raw'
+JOIN magicDSRun ON stage = 'raw' AND magicDSRun.stage_id = exp_id
+JOIN camRun USING(cam_id)
+JOIN distTarget ON distTarget.dist_group = camRun.dist_group AND distTarget.stage = 'raw'
     AND rawExp.filter = distTarget.filter
 JOIN rcInterest USING(target_id)
-LEFT JOIN distRun ON distRun.stage_id = exp_id
-    AND distRun.target_id = distTarget.target_id
-    -- JOIN hook for magicked stuff %s
-WHERE distTarget.state = 'enabled'
+LEFT JOIN distRun ON distRun.stage_id = exp_id AND distRun.target_id = distTarget.target_id
+WHERE distRun.dist_id IS NULL           -- no existing distRun for this exposure
+    AND distTarget.state = 'enabled'    -- target and intrest are enabled
     AND rcInterest.state = 'enabled'
-    AND distRun.dist_id IS NULL      -- no existing distRun
-
+    AND magicDSRun.state = 'full'       -- destreaked files are available