Index: trunk/ippTools/share/Makefile.am
===================================================================
--- trunk/ippTools/share/Makefile.am	(revision 24682)
+++ trunk/ippTools/share/Makefile.am	(revision 24683)
@@ -159,4 +159,8 @@
      magicdstool_toremove.sql \
      magicdstool_torestore.sql \
+     magicdstool_torevert_raw.sql \
+     magicdstool_torevert_chip.sql \
+     magicdstool_torevert_warp.sql \
+     magicdstool_torevert_diff.sql \
      pstamptool_addjob_otherjob.sql \
      pstamptool_addjob_stampjob.sql \
Index: trunk/ippTools/share/magicdstool_completed_runs.sql
===================================================================
--- trunk/ippTools/share/magicdstool_completed_runs.sql	(revision 24682)
+++ trunk/ippTools/share/magicdstool_completed_runs.sql	(revision 24683)
@@ -16,5 +16,5 @@
     GROUP BY
         magicDSRun.magic_ds_id,
-        rawImfile.exp_id
+        stage_id
     HAVING
         COUNT(rawImfile.class_id) = COUNT(magicDSFile.component)
@@ -35,8 +35,25 @@
     GROUP BY
         magic_ds_id,
-        chip_id
+        stage_id
     HAVING
         COUNT(chipProcessedImfile.class_id) = COUNT(magicDSFile.component)
         AND SUM(magicDSFile.fault) = 0
+UNION
+-- camera stage
+SELECT
+    magicDSRun.magic_ds_id
+    FROM magicDSRun
+    JOIN camProcessedExp ON stage_id = camProcessedExp.cam_id
+    LEFT JOIN magicDSFile
+        ON magicDSFile.magic_ds_id = magicDSRun.magic_ds_id
+        AND magicDSFile.component IS NOT NULL
+    WHERE
+        magicDSRun.state = 'new'
+        AND magicDSRun.stage = 'camera'
+        AND camProcessedExp.quality = 0
+        AND magicDSFile.fault = 0
+    GROUP BY
+        magic_ds_id,
+        stage_id
 UNION
 -- warp stage
@@ -55,5 +72,5 @@
     GROUP BY
         magicDSRun.magic_ds_id,
-        warp_id
+        stage_id
     HAVING
         COUNT(warpSkyfile.skycell_id) = COUNT(magicDSFile.component)
Index: trunk/ippTools/share/magicdstool_todestreak.sql
===================================================================
--- trunk/ippTools/share/magicdstool_todestreak.sql	(revision 24682)
+++ trunk/ippTools/share/magicdstool_todestreak.sql	(revision 24683)
@@ -67,4 +67,42 @@
     AND chipProcessedImfile.fault = 0
     AND chipProcessedImfile.quality = 0
+    AND magicDSFile.component IS NULL
+UNION
+  -- camProcessedExp
+SELECT DISTINCT
+    magicDSRun.magic_ds_id,
+    magicDSRun.magic_id,
+    chipRun.exp_id,
+    magicDSRun.label,
+    camera,
+    magicMask.uri as streaks_uri,
+    stage,
+    stage_id,
+    'exposure' as component,
+    NULL AS uri,
+    camProcessedExp.path_base,
+    magicRun.inverse,
+    camProcessedExp.path_base as cam_path_base,
+    outroot,
+    recoveryroot,
+    re_place,
+    remove
+FROM magicDSRun
+JOIN magicMask USING (magic_id)
+JOIN magicRun USING(magic_id)
+JOIN camRun ON magicDSRun.stage_id = camRun.cam_id
+JOIN camProcessedExp ON camRun.cam_id = camProcessedExp.cam_id
+JOIN chipRun USING(chip_id)
+JOIN rawExp ON chipRun.exp_id = rawExp.exp_id
+LEFT JOIN magicDSFile
+    ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
+WHERE
+    magicDSRun.state = 'new'
+    AND magicDSRun.stage = 'camera'
+    AND camRun.state = 'full'
+    AND chipRun.state = 'full'
+    AND chipRun.magicked
+    AND camProcessedExp.fault = 0
+    AND camProcessedExp.quality = 0
     AND magicDSFile.component IS NULL
 UNION
Index: trunk/ippTools/share/magicdstool_torevert_chip.sql
===================================================================
--- trunk/ippTools/share/magicdstool_torevert_chip.sql	(revision 24683)
+++ trunk/ippTools/share/magicdstool_torevert_chip.sql	(revision 24683)
@@ -0,0 +1,20 @@
+SELECT
+    magic_ds_id,
+    re_place,
+    camera,
+    stage,
+    stage_id,
+    component,
+    outroot,
+    chipProcessedImfile.path_base,
+    camProcessedExp.path_base AS cam_path_base,
+    0 AS bytes,
+    0 AS md5sum
+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 rawExp using(exp_id)
+WHERE magicDSRun.stage = 'chip'
+    AND magicDSRun.state = 'new'
+    AND magicDSFile.fault > 0
Index: trunk/ippTools/share/magicdstool_torevert_diff.sql
===================================================================
--- trunk/ippTools/share/magicdstool_torevert_diff.sql	(revision 24683)
+++ trunk/ippTools/share/magicdstool_torevert_diff.sql	(revision 24683)
@@ -0,0 +1,20 @@
+SELECT
+    magic_ds_id,
+    re_place,
+    camera,
+    stage,
+    stage_id,
+    component,
+    outroot,
+    diffSkyfile.path_base,
+    NULL AS cam_path_base,
+    0 AS bytes,
+    0 AS md5sum
+FROM magicDSRun
+    JOIN magicRun using(magic_id)
+    JOIN magicDSFile USING(magic_ds_id)
+    JOIN diffSkyfile ON (stage_id = diffSkyfile.diff_id AND component = skycell_id)
+    JOIN rawExp USING(exp_id)
+WHERE magicDSRun.stage = 'diff'
+    AND magicDSRun.state = 'new'
+    AND magicDSFile.fault > 0
Index: trunk/ippTools/share/magicdstool_torevert_raw.sql
===================================================================
--- trunk/ippTools/share/magicdstool_torevert_raw.sql	(revision 24683)
+++ trunk/ippTools/share/magicdstool_torevert_raw.sql	(revision 24683)
@@ -0,0 +1,20 @@
+SELECT
+    magic_ds_id,
+    re_place,
+    rawImfile.camera,
+    stage,
+    stage_id,
+    component,
+    outroot,
+    rawImfile.uri AS path_base,
+    NULL AS cam_path_base,
+    bytes,
+    md5sum
+FROM magicDSRun
+    JOIN magicDSFile using(magic_ds_id)
+    JOIN rawImfile ON (stage_id = exp_id AND component = class_id)
+    JOIN summitImfile ON (rawImfile.exp_name = summitImfile.exp_name 
+                      AND rawImfile.tmp_class_id = summitImfile.class_id)
+WHERE magicDSRun.stage = 'raw'
+    AND magicDSRun.state = 'new'
+    AND magicDSFile.fault > 0
Index: trunk/ippTools/share/magicdstool_torevert_warp.sql
===================================================================
--- trunk/ippTools/share/magicdstool_torevert_warp.sql	(revision 24683)
+++ trunk/ippTools/share/magicdstool_torevert_warp.sql	(revision 24683)
@@ -0,0 +1,23 @@
+SELECT
+    magic_ds_id,
+    re_place,
+    camera,
+    stage,
+    stage_id,
+    component,
+    outroot,
+    warpSkyfile.path_base,
+    "NULL" AS cam_path_base,
+    0 AS bytes,
+    0 AS md5sum
+FROM magicDSRun
+    JOIN magicDSFile USING(magic_ds_id)
+    JOIN warpSkyfile ON (stage_id = warp_id AND component = skycell_id)
+    JOIN warpRun USING(warp_id)
+    JOIN fakeRun USING(fake_id)
+    JOIN camRun ON fakeRun.cam_id = camRun.cam_id
+    JOIN chipRun USING(chip_id)
+    JOIN rawExp USING(exp_id)
+WHERE magicDSRun.stage = 'warp'
+    AND magicDSRun.state = 'new'
+    AND magicDSFile.fault > 0