Changeset 35217 for trunk/ippToPsps/jython/ipptopspsdb.py

Timestamp:

Mar 1, 2013, 1:27:47 PM (13 years ago)

Author:

eugene

Message:

fix the plotter stuff (HAF); use boxes scaled by cos(DEC); use ranges for ra float comparisons; use installed perl programs (in PATH); do not attempt to re-publish automatically

File:

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

trunk/ippToPsps/jython/ipptopspsdb.py

@@ -1214 +1214 @@
                 self.logger.errorPair("No outstanding boxes to steal", "no stripe obtained")
 
+        # tests against ra_center need to use a finite box
+        minRA = raCenter - 0.01
+        maxRA = raCenter + 0.01
+
         self.logger.infoPair("Using RA stripe", "%f" % raCenter)
         sql = "SELECT DISTINCT id \
                FROM box \
                JOIN pending ON (id = box_id) \
-               WHERE ra_center = " + str(raCenter) + " \
+               WHERE ra_center BETWEEN " + str(minRA) + " AND " + str(maxRA) + " \
                AND batch_type = '" + batchType + "' \
                AND skychunk = '" + self.skychunk.name + "' \
@@ -1280 +1284 @@
                 self.logger.errorPair("No outstanding boxes to steal", "no stripe obtained")
 
+        # tests against ra_center need to use a finite box
+        minRA = raCenter - 0.01
+        maxRA = raCenter + 0.01
+
         self.logger.infoPair("Using RA stripe", "%f" % raCenter)
         sql = "SELECT DISTINCT id \
                FROM box \
                JOIN pending ON (id = box_id) \
-               WHERE ra_center = " + str(raCenter) + " \
+               WHERE ra_center BETWEEN " + str(minRA) + " AND " + str(maxRA) + " \
                AND skychunk = '" + self.skychunk.name + "' \
                ORDER BY dec_center DESC"