Changeset 34041 for branches/meh_branches/ppstack_test/ippToPsps/jython/gpc1db.py

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

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

branches/meh_branches/ppstack_test/ippToPsps/jython/gpc1db.py

@@ -32 +32 @@
 
     '''
-    Gets a list of ids in this DVO database for this stage, could be cam or staticsky, for a box with defined center and side length
-    '''
-    def getIDsInThisDVODbForThisStageInThisBox(self, dvoDb, batchType, ra=180., dec=0., side=181.):
+    Gets a list of ids, ra and dec in this DVO database for this stage, could be cam or staticsky, for a box with defined center and side length
+    '''
+    def getItemsInThisDVODbForThisStageInThisBox(self, dvoDb, batchType, ra=180., dec=0., side=181.):
 
         halfSide = side/2.0
-        return self.getIDsInThisDVODbForThisStage(dvoDb, batchType, ra-halfSide, ra+halfSide, dec-halfSide, dec+halfSide)
-
-
-    '''
-    Gets a list of ids in this DVO database for this stage, could be cam or staticsky, and a box can be defined with equatorial coordinates
-    '''
-    def getIDsInThisDVODbForThisStage(self, dvoDb, batchType, minRA=-999, maxRA=999, minDec=-999, maxDec=999):
+        return self.getItemsInThisDVODbForThisStage(dvoDb, batchType, ra-halfSide, ra+halfSide, dec-halfSide, dec+halfSide)
+
+    '''
+    Gets a list of ids, ra and dec in this DVO database for this stage, could be cam or staticsky, and a box can be defined with equatorial coordinates
+    NB this uses Bill's potentially temporary 'skycells' database when finding RA/Dec for stacks.
+    '''
+    def getItemsInThisDVODbForThisStage(self, dvoDb, batchType, minRA=-999, maxRA=999, minDec=-999, maxDec=999):
 
         self.logger.debugPair("GPC1 RA range", "%.2f -> %.2f" % (minRA, maxRA))
         self.logger.debugPair("GPC1 Dec range", "%.2f -> %.2f" % (minDec, maxDec))
 
-        ids = []
-
-        if batchType == "P2": # TODO define these someplace 
+        rows = []
+
+        if batchType == "P2": # TODO define these some place 
 
             stage = "cam"
-            sql = "SELECT DISTINCT stage_id \
+            sql = "SELECT DISTINCT stage_id, DEGREES(ra), DEGREES(decl) \
                    FROM addRun \
                    JOIN minidvodbRun USING(minidvodb_name) \
@@ -72 +72 @@
         elif batchType == "ST":       
 
-            stage = "staticsky_multi"
-            sql = "SELECT DISTINCT stack_id 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 skycell USING(skycell_id) \
                    WHERE minidvodbRun.minidvodb_group = '" + dvoDb + "' \
                    AND minidvodbRun.state = 'merged' \
                    AND minidvodbProcessed.fault = 0 \
                    AND addRun.stage = '" + stage + "' \
-                   AND addRun.state = 'full'"
-
-        try:
-            rs = self.executeQuery(sql)
-            while (rs.next()): ids.append(rs.getInt(1))
+                   AND addRun.state = 'full' \
+                   AND decdeg BETWEEN " + str(minDec) + " AND " + str(maxDec) + " \
+                   AND radeg BETWEEN " + str(minRA) + " AND " + str(maxRA) 
+
+        try:
+            rs = self.executeQuery(sql)
+            while (rs.next()): 
+               rows.append([rs.getInt(1), rs.getFloat(2), rs.getFloat(3)])
             rs.close()
         except:
             self.logger.exception("Can't query for ids in DVO")
-            return ids
-
-
-        self.logger.debug("Found %d items in DVO database '%s' for stage='%s'" % (len(ids), dvoDb, stage))
-
-        return ids
+            return rows
+
+        self.logger.debug("Found %d items in DVO database '%s' for stage='%s'" % (len(rows), dvoDb, stage))
+
+        return rows
 
     '''
@@ -263 +266 @@
                AND minidvodbRun.minidvodb_group = '" + dvoDb + "' \
                AND minidvodbRun.state = 'merged' \
-               AND stage = 'staticsky_multi'"
+               AND stage = 'staticsky'"
         '''
 
@@ -279 +282 @@
                AND mergedvodbRun.state = 'full' \
                AND mergedvodbRun.mergedvodb = '" + dvoDb + "' \
-               AND stage = 'staticsky_multi'"
+               AND stage = 'staticsky'"