Changeset 32579

Timestamp:

Oct 27, 2011, 1:40:40 PM (15 years ago)

Author:

rhenders

Message:

Now reading ra/dec coords from config when queueing-up

File:

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

trunk/ippToPsps/jython/load.py

@@ -55 +55 @@
         logger.errorPair("Problem loading IDs from config under", "options/ids/id") 
 
-    # no config dictated IDs, so get from DVO instead
     if len(allIDs) > 0:
         logger.infoPair("Using config IDs (not DVO)", "%d" % len(allIDs))
+    # no config dictated IDs, so get from DVO instead
     else:
-        allIDs = gpc1Db.getIDsInThisDVODbForThisStage(DVOGPC1LABEL, batchType)
+
+        if MINRA and MAXRA and MINDEC and MAXDEC:
+            allIDs = gpc1Db.getIDsInThisDVODbForThisStage(DVOGPC1LABEL, batchType, MINRA, MAXRA, MINDEC, MAXDEC)
+        else:
+            allIDs = gpc1Db.getIDsInThisDVODbForThisStage(DVOGPC1LABEL, batchType)
+
         logger.infoPair("All %s items in DVO" % batchType, "%d" % len(allIDs))
 
@@ -170 +175 @@
 SURVEY = configDoc.find("options/survey").text
 
+# get equatorial coord limits, if any
+MINRA = None
+MAXRA = None
+MINDEC = None
+MAXDEC = None
+try:
+    MINRA = float(configDoc.find("dvo/minRA").text)
+    MAXRA = float(configDoc.find("dvo/maxRA").text)
+    MINDEC = float(configDoc.find("dvo/minDec").text)
+    MAXDEC = float(configDoc.find("dvo/maxDec").text)
+except:
+    pass
+
 # prompt user: FORCE and PUBLISH is a dangerous combination
 if FORCE and PUBLISH and not QUEUE_IN: