Changeset 33191 for trunk/ippToPsps

Timestamp:

Feb 1, 2012, 2:31:08 PM (14 years ago)

Author:

rhenders

Message:

better way of setting default RA/Dec limits if none specified in config

Location:

trunk/ippToPsps/jython

Files:

• load.py (modified) (3 diffs)
• metrics.py (modified) (2 diffs)

trunk/ippToPsps/jython/load.py

@@ -60 +60 @@
     else:
 
-        if MINRA and MAXRA and MINDEC and MAXDEC:
-            allIDs = gpc1Db.getIDsInThisDVODbForThisStage(DVOGPC1LABEL, batchType, MINRA, MAXRA, MINDEC, MAXDEC)
-        else:
-            allIDs = gpc1Db.getIDsInThisDVODbForThisStage(DVOGPC1LABEL, batchType)
+        allIDs = gpc1Db.getIDsInThisDVODbForThisStage(
+                DVOGPC1LABEL, 
+                batchType, 
+                MINRA, 
+                MAXRA, 
+                MINDEC, 
+                MAXDEC)
 
         logger.infoPair("All %s items in DVO" % batchType, "%d" % len(allIDs))
@@ -176 +179 @@
 
 # get equatorial coord limits, if any
-MINRA = None
-MAXRA = None
-MINDEC = None
-MAXDEC = None
 try:
     MINRA = float(configDoc.find("dvo/minRA").text)
@@ -186 +185 @@
     MAXDEC = float(configDoc.find("dvo/maxDec").text)
 except:
-    pass
+    MINRA = 0.0
+    MAXRA = 360.0
+    MINDEC = -30.0
+    MAXDEC = 90.0
 
 # prompt user: FORCE and PUBLISH is a dangerous combination

trunk/ippToPsps/jython/metrics.py

@@ -163 +163 @@
 
     # get equatorial coord constraints, if any
-    MINRA = None
-    MAXRA = None
-    MINDEC = None
-    MAXDEC = None
-
     try:
         MINRA = float(configDoc.find("dvo/minRA").text)
@@ -173 +168 @@
         MINDEC = float(configDoc.find("dvo/minDec").text)
         MAXDEC = float(configDoc.find("dvo/maxDec").text)
-        logger.infoPair("Coordinates", "%.1f to %.1f RA, %.1f to %.1f Dec" % (MINRA, MAXRA, MINDEC, MAXDEC))
     except:
-        pass
-   
+        MINRA = 0.0
+        MAXRA = 360.0
+        MINDEC = -30.0
+        MAXDEC = 90.0
+
+    logger.infoPair("RA limits", "%.1f to %.1f" % (MINRA, MAXRA))
+    logger.infoPair("Dec limits", "%.1f to %.1f" % (MINDEC, MAXDEC))
 
     logger.info("+----+------------------+---------------+-------------------+------------------+----------------+")