Changeset 33527 for trunk/ippToPsps/jython/gpc1db.py

Timestamp:

Mar 15, 2012, 11:45:05 AM (14 years ago)

Author:

rhenders

Message:

Now using Bill's skycells database to determine RA/Dec for stacks

File:

• trunk/ippToPsps/jython/gpc1db.py (modified) (2 diffs)

trunk/ippToPsps/jython/gpc1db.py

@@ -41 +41 @@
     '''
     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):
@@ -72 +73 @@
 
             stage = "staticsky_multi"
-            # no way to get RA/Decl for stacks, so default to provided min RA/Dec
-            sql = "SELECT DISTINCT stack_id, " + str(minRA) + ", " + str(minDec) + " FROM staticskyInput \
+            sql = "SELECT DISTINCT stack_id, ra, decl 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) \
                    WHERE minidvodbRun.minidvodb_group = '" + dvoDb + "' \
                    AND minidvodbRun.state = 'merged' \
                    AND minidvodbProcessed.fault = 0 \
                    AND addRun.stage = '" + stage + "' \
-                   AND addRun.state = 'full'"
+                   AND addRun.state = 'full' \
+                   AND decl BETWEEN " + str(minDec) + " AND " + str(maxDec) + " \
+                   AND ra BETWEEN " + str(minRA) + " AND " + str(maxRA) 
 
         try: