Changeset 33948 for branches/eam_branches/ipp-20120405/ippToPsps/jython/gpc1db.py

Timestamp:

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

Author:

eugene

Message:

merging changes from trunk

File:

• branches/eam_branches/ipp-20120405/ippToPsps/jython/gpc1db.py (modified) (4 diffs)

branches/eam_branches/ipp-20120405/ippToPsps/jython/gpc1db.py

@@ -72 +72 @@
         elif batchType == "ST":       
 
-            stage = "staticsky_multi"
-            sql = "SELECT DISTINCT stack_id, ra, decl FROM staticskyInput \
+            stage = "staticsky"
+            sql = "SELECT DISTINCT stack_id, radeg, decdeg FROM staticskyInput \
                    JOIN addRun ON(staticskyInput.sky_id = addRun.stage_id) \
                    JOIN minidvodbRun USING(minidvodb_name) \
                    JOIN minidvodbProcessed USING(minidvodb_id) \
-                   JOIN  stackRun USING(stack_id) JOIN skycells.skycell USING(skycell_id) \
+                   JOIN  stackRun USING(stack_id) JOIN skycell USING(skycell_id) \
                    WHERE minidvodbRun.minidvodb_group = '" + dvoDb + "' \
                    AND minidvodbRun.state = 'merged' \
@@ -83 +83 @@
                    AND addRun.stage = '" + stage + "' \
                    AND addRun.state = 'full' \
-                   AND decl BETWEEN " + str(minDec) + " AND " + str(maxDec) + " \
-                   AND ra BETWEEN " + str(minRA) + " AND " + str(maxRA) 
+                   AND decdeg BETWEEN " + str(minDec) + " AND " + str(maxDec) + " \
+                   AND radeg BETWEEN " + str(minRA) + " AND " + str(maxRA) 
 
         try:
@@ -266 +266 @@
                AND minidvodbRun.minidvodb_group = '" + dvoDb + "' \
                AND minidvodbRun.state = 'merged' \
-               AND stage = 'staticsky_multi'"
+               AND stage = 'staticsky'"
         '''
 
@@ -282 +282 @@
                AND mergedvodbRun.state = 'full' \
                AND mergedvodbRun.mergedvodb = '" + dvoDb + "' \
-               AND stage = 'staticsky_multi'"
+               AND stage = 'staticsky'"