Changeset 25419 for trunk/ippTools/share

Timestamp:

Sep 16, 2009, 9:47:16 AM (17 years ago)

Author:

bills

Message:

Change magicdstool -todestreak to query the individual stages separately.
This greatly decreases the query time.
Add support for magicDSRun.state = 'goto_restore' and 'goto_censored' which
will restore destreaked files back to their original state.
Split up ippTasks/magic.pro into magic.pro and destreak.pro so that processing
can be easily magnaged separately

Location:

trunk/ippTools/share

Files:

• Makefile.am (modified) (2 diffs)
• magicdstool_completedrevert.sql (added)
• magicdstool_todestreak.sql (deleted)
• magicdstool_todestreak_camera.sql (added)
• magicdstool_todestreak_chip.sql (added)
• magicdstool_todestreak_diff.sql (added)
• magicdstool_todestreak_raw.sql (added)
• magicdstool_todestreak_warp.sql (added)
• magicdstool_torevert_camera.sql (modified) (1 diff)
• magicdstool_torevert_chip.sql (modified) (1 diff)
• magicdstool_torevert_diff.sql (modified) (1 diff)
• magicdstool_torevert_raw.sql (modified) (1 diff)
• magicdstool_torevert_warp.sql (modified) (1 diff)
• magictool_censor_chip.sql (modified) (1 diff)
• magictool_censor_diff.sql (modified) (1 diff)
• magictool_censor_raw.sql (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -165 +165 @@
      magictool_revertnode.sql \
      magicdstool_completed_runs.sql \
+     magicdstool_completedrevert.sql \
      magicdstool_definebyquery_raw.sql \
      magicdstool_definebyquery_chip.sql \
@@ -172 +173 @@
      magicdstool_getrunids.sql \
      magicdstool_getskycells.sql \
-     magicdstool_todestreak.sql \
+     magicdstool_todestreak_camera.sql \
+     magicdstool_todestreak_chip.sql \
+     magicdstool_todestreak_diff.sql \
+     magicdstool_todestreak_raw.sql \
+     magicdstool_todestreak_warp.sql \
      magicdstool_toremove.sql \
      magicdstool_torestore.sql \

trunk/ippTools/share/magicdstool_torevert_camera.sql

@@ -19 +19 @@
     JOIN rawExp using(exp_id)
 WHERE magicDSRun.stage = 'camera'
-    AND (magicDSRun.state = 'new' OR magicDSRun.state = 'censored')
-    AND magicDSFile.fault > 0
+    AND ((magicDSRun.state = 'new' AND magicDSFile.fault > 0)
+       OR magicDSRun.state = 'goto_censored'
+       OR magicDSRun.state = 'goto_restored')

trunk/ippTools/share/magicdstool_torevert_chip.sql

@@ -18 +18 @@
     JOIN rawExp using(exp_id)
 WHERE magicDSRun.stage = 'chip'
-    AND (magicDSRun.state = 'new' OR magicDSRun.state = 'censored')
-    AND magicDSFile.fault > 0
+    AND ((magicDSRun.state = 'new' AND magicDSFile.fault > 0)
+       OR magicDSRun.state = 'goto_censored'
+       OR magicDSRun.state = 'goto_restored')

trunk/ippTools/share/magicdstool_torevert_diff.sql

@@ -18 +18 @@
     JOIN rawExp USING(exp_id)
 WHERE magicDSRun.stage = 'diff'
-    AND (magicDSRun.state = 'new' OR magicDSRun.state = 'censored')
-    AND magicDSFile.fault > 0
+    AND ((magicDSRun.state = 'new' AND magicDSFile.fault > 0)
+       OR magicDSRun.state = 'goto_censored'
+       OR magicDSRun.state = 'goto_restored')

trunk/ippTools/share/magicdstool_torevert_raw.sql

@@ -18 +18 @@
                       AND rawImfile.tmp_class_id = summitImfile.class_id)
 WHERE magicDSRun.stage = 'raw'
-    AND (magicDSRun.state = 'new' OR magicDSRun.state = 'censored')
-    AND magicDSFile.fault > 0
+    AND ((magicDSRun.state = 'new' AND magicDSFile.fault > 0)
+       OR magicDSRun.state = 'goto_censored'
+       OR magicDSRun.state = 'goto_restored')

trunk/ippTools/share/magicdstool_torevert_warp.sql

@@ -21 +21 @@
     JOIN rawExp USING(exp_id)
 WHERE magicDSRun.stage = 'warp'
-    AND (magicDSRun.state = 'new' OR magicDSRun.state = 'censored')
-    AND magicDSFile.fault > 0
+    AND ((magicDSRun.state = 'new' AND magicDSFile.fault > 0)
+       OR magicDSRun.state = 'goto_censored'
+       OR magicDSRun.state = 'goto_restored')

trunk/ippTools/share/magictool_censor_chip.sql

@@ -1 +1 @@
 UPDATE chipRun 
     JOIN chipProcessedImfile USING(chip_id, exp_id) 
-    JOIN magicDSRun ON chipRun.magicked = magicDSRun.magic_ds_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, exp_id)
+    JOIN magicRun using(magic_id)
 SET chipProcessedImfile.magicked = 0, 
     chipRun.magicked = 0, 

trunk/ippTools/share/magictool_censor_diff.sql

@@ -1 @@
-UPDATE magicRun 
-    JOIN magicDSRun USING(magic_id)
+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)
-    JOIN diffRun ON magic_ds_id = magicked
-    JOIN diffSkyfile ON diffRun.diff_id = diffSkyfile.diff_id
 SET diffRun.magicked = 0,
     diffSkyfile.magicked = 0,

trunk/ippTools/share/magictool_censor_raw.sql

@@ -2 +2 @@
     JOIN magicDSRun USING(magic_id)
     JOIN magicDSFile USING(magic_ds_id) 
-    JOIN rawExp ON rawExp.magicked = magic_ds_id
-    JOIN rawImfile ON rawExp.exp_id = rawImfile.exp_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', 
+--    rawExp.magicked = 0, 
+--    magicDSRun.state = 'censored', 
     magicDSFile.fault = 42