Changeset 34735 for branches/eam_branches/ipp-20120905/ippTools/share

Timestamp:

Nov 29, 2012, 2:15:01 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120905

Files:

• . (modified) (1 prop)
• ippTools/share/bgtool_towarp.sql (modified) (1 diff)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/chiptool_setimfiletoupdate.sql (modified) (1 prop)
• ippTools/share/magicdstool_torevert_camera.sql (modified) (1 diff)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 prop)
• ippTools/share/regtool_processedexp.sql (modified) (1 prop) ( previous)
• ippTools/share/staticskytool_result.sql (modified) (1 diff)
• ippTools/share/staticskytool_todo.sql (modified) (1 diff)
• ippTools/share/warptool_towarped.sql (modified) (1 prop)

branches/eam_branches/ipp-20120905/ippTools/share/bgtool_towarp.sql

@@ -1 @@
-SELECT
+SELECT DISTINCT
     warpBackgroundRun.*,
     warpRun.tess_id,

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

@@ -23 +23 @@
     JOIN rawExp using(exp_id)
 WHERE magicDSRun.stage = 'camera'
+    AND camProcessedExp.fault = 0
+    AND camRun.state = 'full'
     AND ((magicDSRun.state = 'new' AND magicDSFile.fault > 0)
          OR ((magicDSRun.state = 'goto_censored' OR magicDSRun.state = 'goto_restored')

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

@@ -7 +7 @@
     stackRun.skycell_id,
     count(stackRun.filter) AS num_filters,
+    TRUNCATE(skycell.radeg/15., 4) AS rahours,
+    skycell.radeg,
+    skycell.decdeg,
     skycell.glong,
     skycell.glat

branches/eam_branches/ipp-20120905/ippTools/share/staticskytool_todo.sql

@@ -7 +7 @@
     stackRun.tess_id,
     stackRun.skycell_id,
+    TRUNCATE(skycell.radeg/15., 4) as rahours,
+    skycell.radeg,
+    skycell.decdeg,
+    skycell.glong,
+    skycell.glat,
     IFNULL(Label.priority, 10000) AS priority
 FROM staticskyRun
 JOIN staticskyInput USING (sky_id)
 JOIN stackRun USING (stack_id)
+JOIN skycell USING(tess_id, skycell_id)
 LEFT JOIN staticskyResult USING(sky_id)
 LEFT JOIN Label ON staticskyRun.label = Label.label