Changeset 24683 for trunk/ippTools/share

Timestamp:

Jul 6, 2009, 12:52:22 PM (17 years ago)

Author:

bills

Message:

Add hooks for carefully reverting faulted destreaked files. Support "destreak" operation at
camera stage. (For censoring detections)

Location:

trunk/ippTools/share

Files:

• Makefile.am (modified) (1 diff)
• magicdstool_completed_runs.sql (modified) (3 diffs)
• magicdstool_todestreak.sql (modified) (1 diff)
• magicdstool_torevert_chip.sql (added)
• magicdstool_torevert_diff.sql (added)
• magicdstool_torevert_raw.sql (added)
• magicdstool_torevert_warp.sql (added)

trunk/ippTools/share/Makefile.am

@@ -159 +159 @@
      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 \

trunk/ippTools/share/magicdstool_completed_runs.sql

@@ -16 +16 @@
     GROUP BY
         magicDSRun.magic_ds_id,
-        rawImfile.exp_id
+        stage_id
     HAVING
         COUNT(rawImfile.class_id) = COUNT(magicDSFile.component)
@@ -35 +35 @@
     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 +72 @@
     GROUP BY
         magicDSRun.magic_ds_id,
-        warp_id
+        stage_id
     HAVING
         COUNT(warpSkyfile.skycell_id) = COUNT(magicDSFile.component)

trunk/ippTools/share/magicdstool_todestreak.sql

@@ -67 +67 @@
     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