Changeset 25511 for trunk/ippTools/share

Timestamp:

Sep 23, 2009, 1:45:03 PM (17 years ago)

Author:

bills

Message:

Finish implementing magictool -censorrun

Location:

trunk/ippTools/share

Files:

• Makefile.am (modified) (2 diffs)
• disttool_listinterests.sql (moved) (moved from trunk/ippTools/share/disttool_listinterest.sql ) (1 prop)
• magictool_restore_camera.sql (moved) (moved from trunk/ippTools/share/magictool_censor_camera.sql ) (1 diff, 1 prop)
• magictool_restore_chip.sql (moved) (moved from trunk/ippTools/share/magictool_censor_chip.sql ) (1 diff, 1 prop)
• magictool_restore_diff.sql (moved) (moved from trunk/ippTools/share/magictool_censor_diff.sql ) (1 diff, 1 prop)
• magictool_restore_raw.sql (moved) (moved from trunk/ippTools/share/magictool_censor_raw.sql ) (1 diff, 1 prop)
• magictool_restore_warp.sql (moved) (moved from trunk/ippTools/share/magictool_censor_warp.sql ) (1 diff, 1 prop)

trunk/ippTools/share/Makefile.am

@@ -111 +111 @@
      disttool_definebyquery_warp.sql \
      disttool_defineinterest.sql \
-     disttool_listinterest.sql \
+     disttool_listinterests.sql \
      disttool_pending_camera.sql \
      disttool_pending_chip.sql \
@@ -150 +150 @@
      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 \

trunk/ippTools/share/magictool_restore_camera.sql

@@ -1 +1 @@
 UPDATE magicRun 
     JOIN magicDSRun USING(magic_id)
-    JOIN magicDSFile USING(magic_ds_id)
-    JOIN camRun ON magic_ds_id = magicked
+    JOIN camRun ON stage = 'camera' AND stage_id = camRun.cam_id
 SET camRun.magicked = 0,
-    magicDSRun.state = 'censored',
-    magicDSFile.fault = 42
-
+    magicDSRun.state = '@NEW_STATE@'
+WHERE re_place

trunk/ippTools/share/magictool_restore_chip.sql

@@ -1 @@
-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)
+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 = 'censored', 
-    magicDSFile.fault = 42
+    magicDSRun.state = '@NEW_STATE@'
+WHERE re_place

trunk/ippTools/share/magictool_restore_diff.sql

@@ -1 @@
-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)
+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 = 'censored',
-    magicDSFile.fault = 42
+    magicDSRun.state = '@NEW_STATE@'
+WHERE re_place

trunk/ippTools/share/magictool_restore_raw.sql

@@ -1 +1 @@
 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
+    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 = 'censored', 
-    magicDSFile.fault = 42
-
+    rawExp.magicked = 0, 
+    magicDSRun.state = '@NEW_STATE@'
+WHERE re_place

trunk/ippTools/share/magictool_restore_warp.sql

@@ -1 +1 @@
 UPDATE magicRun 
     JOIN magicDSRun USING(magic_id)
-    JOIN magicDSFile USING(magic_ds_id)
-    JOIN warpRun ON magic_ds_id = magicked
+    JOIN warpRun ON stage = 'warp' AND stage_id = warp_id
     JOIN warpSkyfile using(warp_id)
 SET warpRun.magicked = 0,
     warpSkyfile.magicked = 0,
-    magicDSRun.state = 'censored',
-    magicDSFile.fault = 42
+    magicDSRun.state = '@NEW_STATE@'
+WHERE re_place