Changeset 26567 for trunk/ippTools/share

Timestamp:

Jan 12, 2010, 2:07:51 PM (17 years ago)

Author:

bills

Message:

Make update processing compatible with magic. Fix some bugs in update for the warp stage
Make script changes to implement update for diff stage.
Change value of 'magicked' in the various runs and files to contain the value
the magic_id of the magicRun that corresponds to the streaks file used for desreaking.

Location:

trunk/ippTools/share

Files:

• camtool_find_pendingexp.sql (modified) (1 diff)
• camtool_queue_chip_id.sql (modified) (1 diff)
• chiptool_change_exp_state.sql (modified) (1 diff)
• chiptool_completely_processed_exp.sql (modified) (2 diffs)
• difftool_change_run_state.sql (modified) (1 diff)
• difftool_change_skyfile_data_state.sql (modified) (1 diff)
• difftool_todiffskyfile.sql (modified) (1 diff)
• disttool_pending_camera.sql (modified) (1 diff)
• disttool_pending_chip.sql (modified) (1 diff)
• disttool_pending_diff.sql (modified) (1 diff)
• disttool_pending_warp.sql (modified) (1 diff)
• warptool_change_run_state.sql (modified) (2 diffs)
• warptool_change_skyfile_data_state.sql (modified) (1 diff)
• warptool_finish_run.sql (modified) (1 diff)
• warptool_finished_run_select.sql (modified) (1 diff)
• warptool_towarped.sql (modified) (1 diff)

trunk/ippTools/share/camtool_find_pendingexp.sql

@@ -9 +9 @@
     rawExp.camera,
     rawExp.telescope,
-    rawExp.filelevel
+    rawExp.filelevel,
+    chipRun.magicked AS chip_magicked
 FROM camRun
 JOIN chipRun

trunk/ippTools/share/camtool_queue_chip_id.sql

@@ -16 +16 @@
         '%s',           -- tess_id
         '%s',           -- end_stage
-        0,              -- magicked
-        '%s'           -- note
+        %lld,           -- magicked
+        '%s'            -- note
     FROM chipRun
     WHERE

trunk/ippTools/share/chiptool_change_exp_state.sql

@@ -4 +4 @@
 -- the chipProcessedImfile sub query
 UPDATE chipRun
-    SET state = '%s'
+JOIN rawExp using(exp_id)
+    SET chipRun.state = '%s'
+    -- set magicked hook %s
     WHERE
     chipRun.chip_id = %lld

trunk/ippTools/share/chiptool_completely_processed_exp.sql

@@ -14 +14 @@
     tess_id,
     end_stage,
-    all_files_magicked as magicked,
+    imfile_magicked as magicked,
     note
 FROM
@@ -21 +21 @@
         rawImfile.class_id as rawimfile_class_id,
         chipProcessedImfile.class_id,
-        SUM(!chipProcessedImfile.magicked) = 0 as all_files_magicked
+        -- XXX using chipProcessedImfile assumes that all imfile's have
+        -- the same magicked value if that isn't right then more than one 
+        -- row will be returned. In practice this is the case but bugs could
+        -- cause it to not be true.
+        -- We could use rawExp.magicked but that would make it possible for
+        -- the chipRun to have a different magicked value than the imfiles
+        chipProcessedImfile.magicked AS imfile_magicked
     FROM chipRun
     JOIN rawImfile

trunk/ippTools/share/difftool_change_run_state.sql

@@ -5 +5 @@
 UPDATE diffRun
     SET state = '%s'
+    -- set magicked hook %s
     WHERE
     diffRun.diff_id = %lld

trunk/ippTools/share/difftool_change_skyfile_data_state.sql

@@ -5 +5 @@
     SET 
     data_state = '%s'
+    -- magicked hook %s
 WHERE
     diff_id = %lld

trunk/ippTools/share/difftool_todiffskyfile.sql

@@ -65 +65 @@
     OR (diffRun.state = 'update'
     AND diffSkyfile.fault = 0
-    AND diffSkyfile.quality = 0)
+    AND diffSkyfile.data_state = 'cleaned')
     )
 -- Ensure input warps are available

trunk/ippTools/share/disttool_pending_camera.sql

@@ -30 +30 @@
     AND distRun.stage = 'camera'
     AND distComponent.dist_id IS NULL
-    AND (distRun.clean OR (chipRun.magicked AND camRun.magicked) OR distRun.no_magic)
+    AND (((chipRun.magicked > 0) AND (camRun.magicked > 0)) OR distRun.no_magic)
     AND (camRun.state = 'full' OR (distRun.clean AND camRun.state = 'cleaned'))

trunk/ippTools/share/disttool_pending_chip.sql

@@ -28 +28 @@
     AND distRun.stage = 'chip'
     AND distComponent.dist_id IS NULL
-    AND (distRun.clean OR chipRun.magicked OR distRun.no_magic)
+    AND ((chipRun.magicked > 0) OR distRun.no_magic)
     AND (chipRun.state = 'full' OR (distRun.clean AND chipRun.state = 'cleaned'))

trunk/ippTools/share/disttool_pending_diff.sql

@@ -36 +36 @@
     AND distRun.stage = 'diff'
     AND distComponent.dist_id IS NULL
-    AND (distRun.clean OR diffRun.magicked OR distRun.no_magic)
+    AND ((diffRun.magicked > 0) OR distRun.no_magic)
     AND (diffRun.state = 'full' OR (distRun.clean AND diffRun.state = 'cleaned'))

trunk/ippTools/share/disttool_pending_warp.sql

@@ -31 +31 @@
     AND distRun.stage = 'warp'
     AND distComponent.dist_id IS NULL
-    AND (distRun.clean OR warpRun.magicked OR distRun.no_magic)
+    AND ((warpRun.magicked > 0) OR distRun.no_magic)
     AND (warpRun.state = 'full' OR (distRun.clean AND warpRun.state = 'cleaned'))

trunk/ippTools/share/warptool_change_run_state.sql

@@ -4 +4 @@
 -- the chipProcessedImfile sub query
 UPDATE warpRun
-    SET state = '%s'
+JOIN fakeRun USING(fake_id)
+JOIN camRun USING(cam_id)
+JOIN chipRun USING(chip_id)
+    SET warpRun.state = '%s'
+    -- set magicked  hook %s
     WHERE
     warpRun.warp_id = %lld
@@ -12 +16 @@
         WHERE
             warpSkyfile.warp_id = warpRun.warp_id
-            AND data_state != '%s'
+            AND warpSkyfile.data_state != '%s'
         ) = 0

trunk/ippTools/share/warptool_change_skyfile_data_state.sql

@@ -1 +1 @@
 -- handle changes in warpSkyfile.data_state.
--- Used for the modes tocleanedskyfile and topurgedskyfile
--- args are new data_state, warp_id, skycell_id and current expected state for warpRun
+-- Used for the modes tofullskyfile, tocleanedskyfile and topurgedskyfile
+-- args are new data_state, string for magic hook, warp_id, skycell_id and current expected state for warpRun
 UPDATE warpSkyfile
+JOIN warpRun USING(warp_id)
+JOIN fakeRun USING(fake_id)
+JOIN camRun USING(cam_id)
+JOIN chipRun USING(chip_id)
     SET 
     data_state = '%s'
+    -- set magicked hook %s
 WHERE
     warp_id = %lld

trunk/ippTools/share/warptool_finish_run.sql

@@ -1 +1 @@
 UPDATE warpRun
     SET state = 'full',
-    magicked = %d
+    magicked = %lld
 WHERE warp_id = %lld
 

trunk/ippTools/share/warptool_finished_run_select.sql

@@ -8 +8 @@
        warpSkyCellMap.warp_id as foo,
        warpSkyfile.warp_id as bar,
-       SUM(!warpSkyfile.magicked) = 0 as magicked
+       warpSkyfile.magicked as magicked
    FROM warpRun
    JOIN warpSkyCellMap

trunk/ippTools/share/warptool_towarped.sql

@@ -40 +40 @@
         AND warpSkyfile.tess_id IS NULL)
     OR (warpRun.state = 'update'
+        AND chipRun.magicked >= 0
+        AND warpSkyfile.fault = 0
         AND warpSkyfile.data_state = 'cleaned')
     )