Changeset 35960 for trunk/ippTools/share

Timestamp:

Aug 15, 2013, 4:05:13 PM (13 years ago)

Author:

bills

Message:

various changes for support of distribution of skycal results

Location:

trunk/ippTools/share

Files:

• Makefile.am (modified) (1 diff)
• disttool_pending_skycal.sql (modified) (1 diff)
• disttool_toadvance.sql (modified) (1 diff)
• staticskytool_export_skycalresult.sql (added)
• staticskytool_export_skycalrun.sql (added)
• staticskytool_skycalresult.sql (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -410 +410 @@
         staticskytool_export_input.sql \
         staticskytool_export_result.sql \
+        staticskytool_export_skycalrun.sql \
+        staticskytool_export_skycalresult.sql \
         staticskytool_inputs.sql \
         staticskytool_todo.sql \

trunk/ippTools/share/disttool_pending_skycal.sql

@@ -38 +38 @@
 JOIN chipRun
     USING(chip_id)
-    -- ON camRun.chip_id = chipRun.chip_id
 JOIN rawExp 
      USING (exp_id)

trunk/ippTools/share/disttool_toadvance.sql

@@ -262 +262 @@
         AND distComponent.fault = 0
 UNION
+-- skycal stage
+-- NOTE this assumes that there is only one component per skycalRun
+-- (one skycell)
+SELECT
+    distRun.dist_id,
+    stage,
+    stage_id,
+    outroot,
+    label,
+    clean
+    FROM distRun
+    JOIN skycalResult on stage_id = skycal_id
+    LEFT JOIN distComponent
+        ON distRun.dist_id = distComponent.dist_id
+    WHERE
+        distRun.state = 'new'
+        AND distRun.fault = 0
+        AND distRun.stage = 'skycal'
+        AND distComponent.component IS NOT NULL
+        AND distComponent.fault = 0
+UNION
 -- SSdiff stage
 SELECT

trunk/ippTools/share/staticskytool_skycalresult.sql

@@ -2 +2 @@
     skycalResult.*,
     skycalRun.stack_id,
+    skycalRun.workdir,
     stackRun.filter,
     skycalRun.state,