Changeset 30673

Timestamp:

Feb 17, 2011, 11:31:46 AM (15 years ago)

Author:

bills

Message:

When bundling raw data for distribution, don't require that the chipProcessedImfile
be 'full' only that it has magicked != 0 and that the cameraRun is magicked. Use the camera
mask files which are never cleaned up.

Location:

tags/ipp-20101215

Files:

• ippScripts/scripts/dist_bundle.pl (modified) (1 diff, 1 prop)
• ippTools/share/disttool_pending_raw.sql (modified) (5 diffs, 1 prop)

tags/ipp-20101215/ippScripts/scripts/dist_bundle.pl

@@ -287 +287 @@
         # we can use the chip mask because disttool demands that magic have been run
         # and so the camera mask and the chip mask are the same
-        $mask = $ipprc->filename("PPIMAGE.CHIP.MASK", $chip_path_base, $component);
+        #$mask = $ipprc->filename("PPIMAGE.CHIP.MASK", $chip_path_base, $component);
+        # XXX: hack the pending query passes in the camera path base
+        $mask = $ipprc->filename("PSASTRO.OUTPUT.MASK", $chip_path_base, $component);
         my $mask_resolved = $ipprc->file_resolve($mask);
         my $fh = open_with_retries($mask_resolved);

tags/ipp-20101215/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