Index: trunk/ippTools/share/Makefile.am
===================================================================
--- trunk/ippTools/share/Makefile.am	(revision 25420)
+++ trunk/ippTools/share/Makefile.am	(revision 25423)
@@ -173,4 +173,5 @@
      magicdstool_getrunids.sql \
      magicdstool_getskycells.sql \
+     magicdstool_revertdestreakedfile.sql \
      magicdstool_todestreak_camera.sql \
      magicdstool_todestreak_chip.sql \
@@ -179,5 +180,4 @@
      magicdstool_todestreak_warp.sql \
      magicdstool_toremove.sql \
-     magicdstool_torestore.sql \
      magicdstool_torevert_raw.sql \
      magicdstool_torevert_chip.sql \
Index: trunk/ippTools/share/magicdstool_torestore.sql
===================================================================
--- trunk/ippTools/share/magicdstool_torestore.sql	(revision 25420)
+++ 	(revision )
@@ -1,12 +1,0 @@
-SELECT 
-    magic_ds_id,
-    stage,
-    stage_id
-    component,
-    backup_path_base,
-    recovery_path_base
-FROM magicDSFile
-JOIN magicDSRun USING(magic_ds_id)
-WHERE magicDSRun.state = 'goto_restored'
-    AND backup_path_base IS NOT NULL
-    AND recovery_path_base IS NOT NULL
Index: trunk/ippTools/share/magicdstool_torevert_camera.sql
===================================================================
--- trunk/ippTools/share/magicdstool_torevert_camera.sql	(revision 25420)
+++ trunk/ippTools/share/magicdstool_torevert_camera.sql	(revision 25423)
@@ -1,4 +1,5 @@
 SELECT
     magic_ds_id,
+    magicDSRun.state,
     exp_id,
     re_place,
@@ -20,4 +21,6 @@
 WHERE magicDSRun.stage = 'camera'
     AND ((magicDSRun.state = 'new' AND magicDSFile.fault > 0)
-       OR magicDSRun.state = 'goto_censored'
-       OR magicDSRun.state = 'goto_restored')
+         OR ((magicDSRun.state = 'goto_censored' OR magicDSRun.state = 'goto_restored')
+              AND (backup_path_base IS NOT NULL)
+            )
+        )
Index: trunk/ippTools/share/magicdstool_torevert_chip.sql
===================================================================
--- trunk/ippTools/share/magicdstool_torevert_chip.sql	(revision 25420)
+++ trunk/ippTools/share/magicdstool_torevert_chip.sql	(revision 25423)
@@ -1,4 +1,5 @@
 SELECT
     magic_ds_id,
+    magicDSRun.state,
     exp_id,
     re_place,
@@ -19,4 +20,6 @@
 WHERE magicDSRun.stage = 'chip'
     AND ((magicDSRun.state = 'new' AND magicDSFile.fault > 0)
-       OR magicDSRun.state = 'goto_censored'
-       OR magicDSRun.state = 'goto_restored')
+         OR ((magicDSRun.state = 'goto_censored' OR magicDSRun.state = 'goto_restored')
+              AND ((backup_path_base IS NOT NULL) OR (recovery_path_base IS NOT NULL))
+            )
+        )
Index: trunk/ippTools/share/magicdstool_torevert_diff.sql
===================================================================
--- trunk/ippTools/share/magicdstool_torevert_diff.sql	(revision 25420)
+++ trunk/ippTools/share/magicdstool_torevert_diff.sql	(revision 25423)
@@ -1,4 +1,5 @@
 SELECT
     magic_ds_id,
+    magicDSRun.state,
     exp_id,
     re_place,
@@ -19,4 +20,6 @@
 WHERE magicDSRun.stage = 'diff'
     AND ((magicDSRun.state = 'new' AND magicDSFile.fault > 0)
-       OR magicDSRun.state = 'goto_censored'
-       OR magicDSRun.state = 'goto_restored')
+         OR ((magicDSRun.state = 'goto_censored' OR magicDSRun.state = 'goto_restored')
+              AND ((backup_path_base IS NOT NULL) OR (recovery_path_base IS NOT NULL))
+            )
+        )
Index: trunk/ippTools/share/magicdstool_torevert_raw.sql
===================================================================
--- trunk/ippTools/share/magicdstool_torevert_raw.sql	(revision 25420)
+++ trunk/ippTools/share/magicdstool_torevert_raw.sql	(revision 25423)
@@ -1,4 +1,5 @@
 SELECT
     magic_ds_id,
+    magicDSRun.state,
     exp_id,
     re_place,
@@ -15,8 +16,8 @@
     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)
-       OR magicDSRun.state = 'goto_censored'
-       OR magicDSRun.state = 'goto_restored')
+         OR ((magicDSRun.state = 'goto_censored' OR magicDSRun.state = 'goto_restored')
+              AND ((backup_path_base IS NOT NULL) OR (recovery_path_base IS NOT NULL))
+            )
+        )
Index: trunk/ippTools/share/magicdstool_torevert_warp.sql
===================================================================
--- trunk/ippTools/share/magicdstool_torevert_warp.sql	(revision 25420)
+++ trunk/ippTools/share/magicdstool_torevert_warp.sql	(revision 25423)
@@ -1,4 +1,5 @@
 SELECT
     magic_ds_id,
+    magicDSRun.state,
     exp_id,
     re_place,
@@ -22,4 +23,6 @@
 WHERE magicDSRun.stage = 'warp'
     AND ((magicDSRun.state = 'new' AND magicDSFile.fault > 0)
-       OR magicDSRun.state = 'goto_censored'
-       OR magicDSRun.state = 'goto_restored')
+         OR ((magicDSRun.state = 'goto_censored' OR magicDSRun.state = 'goto_restored')
+              AND ((backup_path_base IS NOT NULL) OR (recovery_path_base IS NOT NULL))
+            )
+        )