Changeset 32495

Timestamp:

Oct 5, 2011, 5:01:52 PM (15 years ago)

Author:

rhenders

Message:

now reading eq-coords from config, if there are any

File:

• trunk/ippToPsps/jython/metrics.py (modified) (3 diffs)

trunk/ippToPsps/jython/metrics.py

@@ -52 +52 @@
 
     # get a master list of IDs in DVO for this batch type
-    allIDs = gpc1Db.getIDsInThisDVODbForThisStage(DVOLABEL, batchType)
+    if MINRA and MAXRA and MINDEC and MAXDEC:
+        allIDs = gpc1Db.getIDsInThisDVODbForThisStage(DVOLABEL, batchType, MINRA, MAXRA, MINDEC, MAXDEC)
+    else:
+        allIDs = gpc1Db.getIDsInThisDVODbForThisStage(DVOLABEL, batchType)
     prevList = allIDs
     numEverything = len(allIDs)
@@ -72 +75 @@
        numFail = len(fail)
        numPending = len(pending)
+
+       #if stage == 'processed':
+       #    for n in pending: print n
 
        str = "\033[1;34m%5s\033[1;m \033[1;32m%5s\033[1;m \033[1;31m%5s\033[1;m  " % (getIntAsString(numPending), getIntAsString(numSuccess), getIntAsString(numFail))
@@ -125 +131 @@
 gpc1Db = Gpc1Db(logger, configDoc)
 
+MINRA = None
+MAXRA = None
+MINDEC = None
+MAXDEC = None
+
 DVOLABEL = configDoc.find("dvo/gpc1Label").text
+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
+   
 EPOCH = configDoc.find("options/epoch").text