Changeset 30675 for branches/eam_branches/ipp-20110213/ippTools/share

Timestamp:

Feb 17, 2011, 3:19:36 PM (15 years ago)

Author:

eugene

Message:

merge changes from the trunk

Location:

branches/eam_branches/ipp-20110213/ippTools/share

Files:

• camtool_find_pendingimfile.sql (modified) (1 prop)
• disttool_pending_raw.sql (modified) (5 diffs)
• 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)
• pxadmin_create_tables.sql (modified) (1 prop)

branches/eam_branches/ipp-20110213/ippTools/share/disttool_pending_raw.sql

@@ -12 +12 @@
     TRIM(TRAILING '.fits' FROM rawImfile.uri) AS path_base,
     CAST(NULL AS CHAR(255)) AS alt_path_base,
-    chipProcessedImfile.path_base as chip_path_base,
+    -- pass camera stage path base since we want the camera mask file. The script knows what to do
+    camProcessedExp.path_base as chip_path_base,
     CAST(NULL AS CHAR(255)) AS state,
     CAST(NULL AS CHAR(255)) AS data_state,
@@ -26 +27 @@
 JOIN chipProcessedImfile
     USING(chip_id, class_id)
+JOIN camRun USING(chip_id)
+JOIN camProcessedExp using(cam_id)
 LEFT JOIN distComponent 
     ON distRun.dist_id = distComponent.dist_id 
@@ -36 +39 @@
     AND distComponent.dist_id IS NULL
     AND (rawExp.magicked OR distRun.no_magic)
+    -- need to have magicked the chip image which makes the camera mask
+    AND chipProcessedImfile.magicked != 0
+    AND camRun.magicked > 0 
     AND (Label.active OR Label.active IS NULL)
 UNION
@@ -52 +58 @@
     TRIM(TRAILING '.fits' FROM rawImfile.uri) AS path_base,
     magicDSFile.backup_path_base AS alt_path_base,
-    chipProcessedImfile.path_base AS chip_path_base,
+    -- pass camera stage path base since we want the camera mask file. The script knows what to do
+    camProcessedExp.path_base AS chip_path_base,
     CAST('full' AS CHAR(255)) AS state,
     CAST('full' AS CHAR(255)) AS data_state,
@@ -77 +84 @@
     AND distRun.clean = 0
     AND distComponent.dist_id IS NULL
-    AND chipProcessedImfile.data_state = 'full'
-    AND chipProcessedImfile.magicked > 0
+    AND chipProcessedImfile.magicked != 0
+    AND camRun.magicked > 0 
     AND (Label.active OR Label.active IS NULL)
 UNION

branches/eam_branches/ipp-20110213/ippTools/share/magicdstool_torevert_camera.sql

@@ -11 +11 @@
     camProcessedExp.path_base,
     camProcessedExp.path_base AS cam_path_base,
+    recovery_path_base,
     0 AS bothways,
     0 AS bytes,

branches/eam_branches/ipp-20110213/ippTools/share/magicdstool_torevert_chip.sql

@@ -11 +11 @@
     chipProcessedImfile.path_base,
     camProcessedExp.path_base AS cam_path_base,
+    recovery_path_base,
     0 AS bothways,
     0 AS bytes,

branches/eam_branches/ipp-20110213/ippTools/share/magicdstool_torevert_diff.sql

@@ -13 +13 @@
     magicDSFile.recovery_path_base,
     "NULL" AS cam_path_base,
+    recovery_path_base,
     CAST(diffRun.bothways AS SIGNED) AS bothways,
     0 AS bytes,

branches/eam_branches/ipp-20110213/ippTools/share/magicdstool_torevert_raw.sql

@@ -11 +11 @@
     rawImfile.uri AS path_base,
     CAST(NULL AS CHAR(255)) AS cam_path_base, 
+    recovery_path_base,
     0 AS bothways,
     bytes,

branches/eam_branches/ipp-20110213/ippTools/share/magicdstool_torevert_warp.sql

@@ -11 +11 @@
     warpSkyfile.path_base,
     "NULL" AS cam_path_base,
+    recovery_path_base,
     0 AS bothways,
     0 AS bytes,