Changeset 38152 for branches/eam_branches/ipp-20150405/ippToPsps/jython/gpc1db.py

Timestamp:

Apr 18, 2015, 6:27:41 AM (11 years ago)

Author:

eugene

Message:

merge changes from trunk (updates for pstamp, remote tools, ippToPsps schema 20)

Location:

branches/eam_branches/ipp-20150405

Files:

• . (modified) (1 prop)
• ippToPsps/jython/gpc1db.py (modified) (3 diffs)

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

@@ -113 +113 @@
 
             stage = "diff"
-            sql = "SELECT DISTINCT stage_extra1, radeg,decdeg \
+            sql = "SELECT stage_id, avg(radeg),avg(decdeg) \
                    FROM addRun \
                    JOIN addProcessedExp using (add_id) \
@@ -140 +140 @@
                    AND radeg BETWEEN " + str(minRA) + " AND " + str(maxRA) + " \
                    AND dateobs >= '" + tstart + "'\
-                   AND dateobs <= '" + tend  + "'"
-
+                   AND dateobs <= '" + tend  + "'\
+                   GROUP BY stage_id"                   
 
         elif batchType == "FW":
             
             stage = "fullforce"
-            sql = "SELECT DISTINCT add_id, radeg, decdeg FROM fullForceInput \
+            sql = "SELECT stage_id, avg(radeg), avg(decdeg) FROM fullForceInput \
                    JOIN addRun ON(fullForceInput.ff_id = addRun.stage_id AND fullForceInput.warp_id = addRun.stage_extra1) \
                    JOIN minidvodbRun USING(minidvodb_name) \
@@ -167 +167 @@
                    AND radeg BETWEEN " + str(minRA) + " AND " + str(maxRA) + " \
                    AND mjd_obs >= (to_days('" + tstart + "')-678941) \
-                   AND mjd_obs <= (to_days('" + tend + "') - 678941) "
+                   AND mjd_obs <= (to_days('" + tend + "') - 678941) \
+                   GROUP BY stage_id"
 
         try: