Changeset 33949 for branches/eam_branches/ipp-20120405/ippTools/share

Timestamp:

May 29, 2012, 5:08:07 PM (14 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/eam_branches/ipp-20120405/ippTools/share

Files:

• Makefile.am (modified) (1 diff)
• camtool_find_pendingimfile.sql (modified) (1 prop)
• chiptool_pendingimfile.sql (modified) (1 diff)
• chiptool_setimfiletoupdate.sql (modified) (1 prop)
• pstamptool_revertreq_deletejobs.sql (modified) (1 diff)
• pxadmin_create_tables.sql (modified) (1 prop)
• sctool_list.sql (copied) (copied from trunk/ippTools/share/sctool_list.sql )
• staticskytool_definebyquery_inputs.sql (modified) (1 diff)
• staticskytool_definebyquery_select.sql (modified) (2 diffs)
• staticskytool_result.sql (modified) (1 diff)
• warptool_towarped.sql (modified) (1 prop)

branches/eam_branches/ipp-20120405/ippTools/share/Makefile.am

@@ -450 +450 @@
         vptool_pendingrun.sql \
         vptool_processedcell.sql \
-        vptool_revertrun.sql
+        vptool_revertrun.sql \
+        sctool_list.sql
 

branches/eam_branches/ipp-20120405/ippTools/share/chiptool_pendingimfile.sql

@@ -6 +6 @@
     rawImfile.magicked as raw_magicked,
     (rawImfile.user_1 is not NULL and rawImfile.user_1 > 0.5) as deburned,
+    rawImfile.burntool_state as burntool_state,
+    rawImfile.video_cells as video_cells,
     rawExp.exp_tag,
     rawExp.exp_name,

branches/eam_branches/ipp-20120405/ippTools/share/pstamptool_revertreq_deletejobs.sql

@@ -3 +3 @@
 FROM pstampJob
     JOIN pstampRequest USING(req_id)
-WHERE pstampRequest.state = 'new'
+WHERE pstampRequest.state = 'new' 
+    AND pstampRequest.fault > 0

branches/eam_branches/ipp-20120405/ippTools/share/staticskytool_definebyquery_inputs.sql

@@ -6 +6 @@
   FROM stackRun
   JOIN stackSumSkyfile USING(stack_id)
+  JOIN skycell USING(tess_id, skycell_id)
   WHERE stackRun.state = 'full'
       AND stackSumSkyfile.fault = 0

branches/eam_branches/ipp-20120405/ippTools/share/staticskytool_definebyquery_select.sql

@@ -10 +10 @@
   FROM stackRun
   JOIN stackSumSkyfile USING(stack_id)
+  JOIN skycell using(tess_id, skycell_id)
   WHERE stackRun.state = 'full'
       AND stackSumSkyfile.fault = 0
@@ -29 +30 @@
     JOIN stackRun USING(stack_id)
     JOIN stackSumSkyfile USING(stack_id)
+    JOIN skycell USING(tess_id, skycell_id)
     WHERE 1
     -- restrict by selected filters, stackSumSkyfile.good_frac, stackRun.skycell_id, stackRun.label

branches/eam_branches/ipp-20120405/ippTools/share/staticskytool_result.sql

@@ -6 +6 @@
     stackRun.tess_id,
     stackRun.skycell_id,
-    count(stackRun.filter) AS num_filters
+    count(stackRun.filter) AS num_filters,
+    skycell.glong,
+    skycell.glat
 FROM staticskyRun
 JOIN staticskyResult USING(sky_id)
 JOIN staticskyInput USING(sky_id)
-JOIN stackRun using(stack_id)
+JOIN stackRun USING(stack_id)
+LEFT JOIN skycell USING(tess_id, skycell_id)