Changeset 27301 for trunk/ippTools

Timestamp:

Mar 16, 2010, 12:39:45 PM (16 years ago)

Author:

Paul Price

Message:

Make destreaking care about whether we used dynamic masking (so that we need to care about the camera mask or only use the chip mask). This we get from the (current) recipe, which is not ideal, but better than simply looking whether the file exists (it may not be available over NFS or Nebulous). Though I have discussed these fixes with Bill, I have not yet tested the code.

Location:

trunk/ippTools/share

Files:

• magicdstool_todestreak_camera.sql (modified) (1 diff)
• magicdstool_todestreak_chip.sql (modified) (2 diffs)
• magicdstool_todestreak_diff.sql (modified) (1 diff)
• magicdstool_todestreak_raw.sql (modified) (2 diffs)
• magicdstool_todestreak_warp.sql (modified) (1 diff)

trunk/ippTools/share/magicdstool_todestreak_camera.sql

@@ -5 +5 @@
     magicDSRun.label,
     camera,
-    magicMask.uri as streaks_uri,
+    magicMask.uri AS streaks_uri,
     CAST(NULL AS CHAR(255)) AS inv_streaks_uri,
     stage,
     stage_id,
-    'exposure' as component,
+    'exposure' AS component,
     CAST(NULL AS CHAR(255)) AS uri,
     camProcessedExp.path_base,
     magicRun.inverse,
-    camProcessedExp.path_base as cam_path_base,
+    camProcessedExp.path_base AS cam_path_base,
+    camRun.reduction AS cam_reduction,
     outroot,
     recoveryroot,

trunk/ippTools/share/magicdstool_todestreak_chip.sql

@@ -5 +5 @@
     magicDSRun.label,
     camera,
-    magicMask.uri as streaks_uri,
+    magicMask.uri AS streaks_uri,
     CAST(NULL AS CHAR(255)) AS inv_streaks_uri,
     stage,
     stage_id,
-    class_id as component,
+    class_id AS component,
     chipProcessedImfile.uri,
     chipProcessedImfile.path_base,
     magicRun.inverse,
-    camProcessedExp.path_base as cam_path_base,
+    camProcessedExp.path_base AS cam_path_base,
+    camRun.reduction AS cam_reduction,
     outroot,
     recoveryroot,
@@ -21 +22 @@
 JOIN magicMask USING (magic_id)
 JOIN magicRun USING(magic_id)
+JOIN camRun USING(cam_id)
 JOIN camProcessedExp USING(cam_id)
 JOIN chipRun ON chip_id = stage_id

trunk/ippTools/share/magicdstool_todestreak_diff.sql

@@ -6 +6 @@
     magicDSRun.label,
     rawExp.camera,
-    magicMask.uri as streaks_uri,
+    magicMask.uri AS streaks_uri,
     CAST(NULL AS CHAR(255)) AS inv_streaks_uri,
     stage,
-    magicRun.diff_id as stage_id,
-    diffSkyfile.skycell_id as component,
+    magicRun.diff_id AS stage_id,
+    diffSkyfile.skycell_id AS component,
     CAST(NULL AS CHAR(255)) AS uri,
     diffSkyfile.path_base,
     magicRun.inverse,
-    CAST(NULL AS CHAR(255)) as cam_path_base,
+    CAST(NULL AS CHAR(255)) AS cam_path_base,
+    CAST(NULL AS CHAR(255)) AS cam_reduction,
     outroot,
     recoveryroot,

trunk/ippTools/share/magicdstool_todestreak_raw.sql

@@ -14 +14 @@
     magicRun.inverse,
     camProcessedExp.path_base as cam_path_base,
+    camRun.reduction AS cam_reduction,
     outroot,
     recoveryroot,
@@ -21 +22 @@
 JOIN magicMask USING (magic_id)
 JOIN magicRun USING (magic_id)
+JOIN camRun USING(cam_id)
 JOIN camProcessedExp USING(cam_id)
 JOIN rawImfile ON magicRun.exp_id = rawImfile.exp_id

trunk/ippTools/share/magicdstool_todestreak_warp.sql

@@ -14 +14 @@
     magicRun.inverse,
     CAST(NULL AS CHAR(255)) as cam_path_base,
+    CAST(NULL AS CHAR(255)) as cam_reduction,
     outroot,
     recoveryroot,