Index: trunk/ippTools/share/magicdstool_todestreak_camera.sql
===================================================================
--- trunk/ippTools/share/magicdstool_todestreak_camera.sql	(revision 27929)
+++ trunk/ippTools/share/magicdstool_todestreak_camera.sql	(revision 27945)
@@ -3,4 +3,5 @@
     magicDSRun.magic_id,
     chipRun.exp_id,
+    camRun.magicked,
     magicDSRun.label,
     camera,
Index: trunk/ippTools/share/magicdstool_todestreak_chip.sql
===================================================================
--- trunk/ippTools/share/magicdstool_todestreak_chip.sql	(revision 27929)
+++ trunk/ippTools/share/magicdstool_todestreak_chip.sql	(revision 27945)
@@ -3,4 +3,5 @@
     magicDSRun.magic_id,
     chipRun.exp_id,
+    chipRun.magicked,
     magicDSRun.label,
     camera,
Index: trunk/ippTools/share/magicdstool_todestreak_diff.sql
===================================================================
--- trunk/ippTools/share/magicdstool_todestreak_diff.sql	(revision 27929)
+++ trunk/ippTools/share/magicdstool_todestreak_diff.sql	(revision 27945)
@@ -10,4 +10,5 @@
     stage,
     magicRun.diff_id AS stage_id,
+    diffRun.magicked,
     diffSkyfile.skycell_id AS component,
     CAST(NULL AS CHAR(255)) AS uri,
@@ -47,13 +48,14 @@
     magicDSRun.label,
     rawExp.camera,
-    magicMask.uri as streaks_uri,
+    magicMask.uri AS streaks_uri,
     (SELECT uri from magicMask where magic_id = inv_magic_id) AS inv_streaks_uri,
     stage,
-    magicRun.diff_id as stage_id,
-    diffSkyfile.skycell_id as component,
+    magicRun.diff_id AS stage_id,
+    diffRun.magicked,
+    diffSkyfile.skycell_id AS component,
     CAST(NULL AS CHAR(255)) AS uri,
     diffSkyfile.path_base,
     magicRun.inverse,
-    CAST(NULL AS CHAR(255)) as cam_path_base,
+    CAST(NULL AS CHAR(255)) AS cam_path_base,
     CAST(NULL AS CHAR(255)) AS cam_reduction,
     outroot,
@@ -80,5 +82,5 @@
     AND diffSkyfile.quality = 0
     AND magicDSFile.component IS NULL
-) as magicDSRun
+) AS magicDSRun
 -- we need the following so this query is compatible with the other stages
 WHERE magic_ds_id IS NOT NULL
Index: trunk/ippTools/share/magicdstool_todestreak_raw.sql
===================================================================
--- trunk/ippTools/share/magicdstool_todestreak_raw.sql	(revision 27929)
+++ trunk/ippTools/share/magicdstool_todestreak_raw.sql	(revision 27945)
@@ -4,9 +4,10 @@
     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,5 +26,6 @@
 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
Index: trunk/ippTools/share/magicdstool_todestreak_warp.sql
===================================================================
--- trunk/ippTools/share/magicdstool_todestreak_warp.sql	(revision 27929)
+++ trunk/ippTools/share/magicdstool_todestreak_warp.sql	(revision 27945)
@@ -9,4 +9,5 @@
     stage,
     stage_id,
+    warpRun.magicked,
     warpSkyfile.skycell_id as component,
     warpSkyfile.uri,
Index: trunk/ippTools/share/magicdstool_torevert_camera.sql
===================================================================
--- trunk/ippTools/share/magicdstool_torevert_camera.sql	(revision 27929)
+++ trunk/ippTools/share/magicdstool_torevert_camera.sql	(revision 27945)
@@ -13,5 +13,6 @@
     0 AS bothways,
     0 AS bytes,
-    0 AS md5sum
+    0 AS md5sum,
+    camRun.magicked
 FROM magicDSRun
     JOIN magicDSFile using(magic_ds_id)
Index: trunk/ippTools/share/magicdstool_torevert_chip.sql
===================================================================
--- trunk/ippTools/share/magicdstool_torevert_chip.sql	(revision 27929)
+++ trunk/ippTools/share/magicdstool_torevert_chip.sql	(revision 27945)
@@ -13,9 +13,12 @@
     0 AS bothways,
     0 AS bytes,
-    0 AS md5sum
+    0 AS md5sum,
+    chipRun.magicked
 FROM magicDSRun
     JOIN magicDSFile using(magic_ds_id)
     JOIN camProcessedExp using(cam_id)
-    JOIN chipProcessedImfile ON (stage_id = chipProcessedImfile.chip_id AND component = class_id)
+    JOIN chipRun ON (stage_id = chipRun.chip_id)
+    -- JOIN chipProcessedImfile ON (stage_id = chipProcessedImfile.chip_id AND component = class_id)
+    JOIN chipProcessedImfile USING(chip_id, exp_id)
     JOIN rawExp using(exp_id)
 WHERE magicDSRun.stage = 'chip'
Index: trunk/ippTools/share/magicdstool_torevert_diff.sql
===================================================================
--- trunk/ippTools/share/magicdstool_torevert_diff.sql	(revision 27929)
+++ trunk/ippTools/share/magicdstool_torevert_diff.sql	(revision 27945)
@@ -13,5 +13,6 @@
     CAST(diffRun.bothways AS SIGNED) AS bothways,
     0 AS bytes,
-    0 AS md5sum
+    0 AS md5sum,
+    diffRun.magicked
 FROM magicDSRun
     JOIN magicRun using(magic_id)
Index: trunk/ippTools/share/magicdstool_torevert_raw.sql
===================================================================
--- trunk/ippTools/share/magicdstool_torevert_raw.sql	(revision 27929)
+++ trunk/ippTools/share/magicdstool_torevert_raw.sql	(revision 27945)
@@ -10,8 +10,9 @@
     outroot,
     rawImfile.uri AS path_base,
-    NULL AS cam_path_base,
+    CAST(NULL AS CHAR(255)) AS cam_path_base, 
     0 AS bothways,
     bytes,
-    md5sum
+    md5sum,
+    0 AS magicked
 FROM magicDSRun
     JOIN magicDSFile using(magic_ds_id)
Index: trunk/ippTools/share/magicdstool_torevert_warp.sql
===================================================================
--- trunk/ippTools/share/magicdstool_torevert_warp.sql	(revision 27929)
+++ trunk/ippTools/share/magicdstool_torevert_warp.sql	(revision 27945)
@@ -13,5 +13,6 @@
     0 AS bothways,
     0 AS bytes,
-    0 AS md5sum
+    0 AS md5sum,
+    warpRun.magicked
 FROM magicDSRun
     JOIN magicDSFile USING(magic_ds_id)