Index: trunk/ippTools/share/Makefile.am
===================================================================
--- trunk/ippTools/share/Makefile.am	(revision 25493)
+++ trunk/ippTools/share/Makefile.am	(revision 25511)
@@ -111,5 +111,5 @@
      disttool_definebyquery_warp.sql \
      disttool_defineinterest.sql \
-     disttool_listinterest.sql \
+     disttool_listinterests.sql \
      disttool_pending_camera.sql \
      disttool_pending_chip.sql \
@@ -150,9 +150,9 @@
      flatcorr_dropcamera.sql \
      magictool_addmask.sql \
-     magictool_censor_raw.sql \
-     magictool_censor_chip.sql \
-     magictool_censor_camera.sql \
-     magictool_censor_warp.sql \
-     magictool_censor_diff.sql \
+     magictool_restore_camera.sql \
+     magictool_restore_chip.sql \
+     magictool_restore_diff.sql \
+     magictool_restore_raw.sql \
+     magictool_restore_warp.sql \
      magictool_create_tmp_warpcomplete.sql \
      magictool_definebyquery_insert.sql \
Index: trunk/ippTools/share/disttool_listinterest.sql
===================================================================
--- trunk/ippTools/share/disttool_listinterest.sql	(revision 25493)
+++ 	(revision )
@@ -1,13 +1,0 @@
-SELECT 
-    int_id,
-    rcInterest.state AS state,
-    dest_id,
-    name AS dest_name,
-    rcDestination.state as dest_state,
-    label,
-    filter,
-    stage,
-    distTarget.state as target_state
-FROM rcInterest 
-    JOIN distTarget USING(target_id)
-    JOIN rcDestination USING(dest_id)
Index: trunk/ippTools/share/disttool_listinterests.sql
===================================================================
--- trunk/ippTools/share/disttool_listinterests.sql	(revision 25511)
+++ trunk/ippTools/share/disttool_listinterests.sql	(revision 25511)
@@ -0,0 +1,13 @@
+SELECT 
+    int_id,
+    rcInterest.state AS state,
+    dest_id,
+    name AS dest_name,
+    rcDestination.state as dest_state,
+    label,
+    filter,
+    stage,
+    distTarget.state as target_state
+FROM rcInterest 
+    JOIN distTarget USING(target_id)
+    JOIN rcDestination USING(dest_id)
Index: trunk/ippTools/share/magictool_censor_camera.sql
===================================================================
--- trunk/ippTools/share/magictool_censor_camera.sql	(revision 25493)
+++ 	(revision )
@@ -1,8 +1,0 @@
-UPDATE magicRun 
-    JOIN magicDSRun USING(magic_id)
-    JOIN magicDSFile USING(magic_ds_id)
-    JOIN camRun ON magic_ds_id = magicked
-SET camRun.magicked = 0,
-    magicDSRun.state = 'censored',
-    magicDSFile.fault = 42
-
Index: trunk/ippTools/share/magictool_censor_chip.sql
===================================================================
--- trunk/ippTools/share/magictool_censor_chip.sql	(revision 25493)
+++ 	(revision )
@@ -1,9 +1,0 @@
-UPDATE chipRun 
-    JOIN chipProcessedImfile USING(chip_id, exp_id) 
-    JOIN magicDSRun ON stage_id = chip_id AND stage = 'chip' AND re_place
-    JOIN magicDSFile USING(magic_ds_id) 
-    JOIN magicRun using(magic_id)
-SET chipProcessedImfile.magicked = 0, 
-    chipRun.magicked = 0, 
-    magicDSRun.state = 'censored', 
-    magicDSFile.fault = 42
Index: trunk/ippTools/share/magictool_censor_diff.sql
===================================================================
--- trunk/ippTools/share/magictool_censor_diff.sql	(revision 25493)
+++ 	(revision )
@@ -1,9 +1,0 @@
-UPDATE diffRun
-    JOIN diffSkyfile USING(diff_id)
-    JOIN magicRun USING(diff_id)
-    JOIN magicDSRun ON stage = 'diff' AND stage_id = diff_id AND re_place
-    JOIN magicDSFile USING(magic_ds_id)
-SET diffRun.magicked = 0,
-    diffSkyfile.magicked = 0,
-    magicDSRun.state = 'censored',
-    magicDSFile.fault = 42
Index: trunk/ippTools/share/magictool_censor_raw.sql
===================================================================
--- trunk/ippTools/share/magictool_censor_raw.sql	(revision 25493)
+++ 	(revision )
@@ -1,10 +1,0 @@
-UPDATE magicRun
-    JOIN magicDSRun USING(magic_id)
-    JOIN magicDSFile USING(magic_ds_id) 
-    JOIN rawImfile ON rawImfile.magicked = magic_ds_id
---    JOIN rawExp ON rawExp.magicked = magic_ds_id
-SET rawImfile.magicked = 0, 
---    rawExp.magicked = 0, 
---    magicDSRun.state = 'censored', 
-    magicDSFile.fault = 42
-
Index: trunk/ippTools/share/magictool_censor_warp.sql
===================================================================
--- trunk/ippTools/share/magictool_censor_warp.sql	(revision 25493)
+++ 	(revision )
@@ -1,9 +1,0 @@
-UPDATE magicRun 
-    JOIN magicDSRun USING(magic_id)
-    JOIN magicDSFile USING(magic_ds_id)
-    JOIN warpRun ON magic_ds_id = magicked
-    JOIN warpSkyfile using(warp_id)
-SET warpRun.magicked = 0,
-    warpSkyfile.magicked = 0,
-    magicDSRun.state = 'censored',
-    magicDSFile.fault = 42
Index: trunk/ippTools/share/magictool_restore_camera.sql
===================================================================
--- trunk/ippTools/share/magictool_restore_camera.sql	(revision 25511)
+++ trunk/ippTools/share/magictool_restore_camera.sql	(revision 25511)
@@ -0,0 +1,6 @@
+UPDATE magicRun 
+    JOIN magicDSRun USING(magic_id)
+    JOIN camRun ON stage = 'camera' AND stage_id = camRun.cam_id
+SET camRun.magicked = 0,
+    magicDSRun.state = '@NEW_STATE@'
+WHERE re_place
Index: trunk/ippTools/share/magictool_restore_chip.sql
===================================================================
--- trunk/ippTools/share/magictool_restore_chip.sql	(revision 25511)
+++ trunk/ippTools/share/magictool_restore_chip.sql	(revision 25511)
@@ -0,0 +1,8 @@
+UPDATE magicRun
+    JOIN magicDSRun USING(magic_id)
+    JOIN chipRun ON stage = 'chip' AND stage_id = chip_id
+    JOIN chipProcessedImfile USING(chip_id)
+SET chipProcessedImfile.magicked = 0, 
+    chipRun.magicked = 0, 
+    magicDSRun.state = '@NEW_STATE@'
+WHERE re_place
Index: trunk/ippTools/share/magictool_restore_diff.sql
===================================================================
--- trunk/ippTools/share/magictool_restore_diff.sql	(revision 25511)
+++ trunk/ippTools/share/magictool_restore_diff.sql	(revision 25511)
@@ -0,0 +1,8 @@
+UPDATE magicRun 
+    JOIN magicDSRun USING(magic_id)
+    JOIN diffRun ON stage = 'diff' AND stage_id = diffRun.diff_id
+    JOIN diffSkyfile ON diffRun.diff_id = diffSkyfile.diff_id
+SET diffRun.magicked = 0,
+    diffSkyfile.magicked = 0,
+    magicDSRun.state = '@NEW_STATE@'
+WHERE re_place
Index: trunk/ippTools/share/magictool_restore_raw.sql
===================================================================
--- trunk/ippTools/share/magictool_restore_raw.sql	(revision 25511)
+++ trunk/ippTools/share/magictool_restore_raw.sql	(revision 25511)
@@ -0,0 +1,8 @@
+UPDATE magicRun
+    JOIN magicDSRun USING(magic_id)
+    JOIN rawExp ON stage = 'raw' AND stage_id = rawExp.exp_id
+    JOIN rawImfile ON rawExp.exp_id = rawImfile.exp_id
+SET rawImfile.magicked = 0, 
+    rawExp.magicked = 0, 
+    magicDSRun.state = '@NEW_STATE@'
+WHERE re_place
Index: trunk/ippTools/share/magictool_restore_warp.sql
===================================================================
--- trunk/ippTools/share/magictool_restore_warp.sql	(revision 25511)
+++ trunk/ippTools/share/magictool_restore_warp.sql	(revision 25511)
@@ -0,0 +1,8 @@
+UPDATE magicRun 
+    JOIN magicDSRun USING(magic_id)
+    JOIN warpRun ON stage = 'warp' AND stage_id = warp_id
+    JOIN warpSkyfile using(warp_id)
+SET warpRun.magicked = 0,
+    warpSkyfile.magicked = 0,
+    magicDSRun.state = '@NEW_STATE@'
+WHERE re_place