Changeset 39158 for trunk

Timestamp:

Nov 18, 2015, 10:56:15 AM (11 years ago)

Author:

eugene

Message:

replace BETWEEN with >= and < constraint

Location:

trunk/ippToPsps/jython

Files:

• gpc1db.py (modified) (4 diffs)
• ipptopspsdb.py (modified) (7 diffs)

trunk/ippToPsps/jython/gpc1db.py

@@ -79 +79 @@
                    AND addRun.stage = '" + stage + "' \
                    AND addRun.state = 'full' \
-                   AND decl BETWEEN RADIANS(" + str(minDec) + ") AND RADIANS(" + str(maxDec) + ") \
-                   AND ra BETWEEN RADIANS(" + str(minRA) + ") AND RADIANS(" + str(maxRA) + ") \
+                   AND decl >= RADIANS(" + str(minDec) + ") AND decl < RADIANS(" + str(maxDec) + ") \
+                   AND ra >= RADIANS(" + str(minRA) + ") AND ra < RADIANS(" + str(maxRA) + ") \
                    AND dateobs >= '" + tstart + "'\
                    AND dateobs <= '" + tend  + "'"
@@ -103 +103 @@
                    AND addRun.stage = '" + stage + "' \
                    AND addRun.state = 'full' \
-                   AND decdeg BETWEEN " + str(minDec) + " AND " + str(maxDec) + " \
-                   AND radeg BETWEEN " + str(minRA) + " AND " + str(maxRA) + " \
+                   AND decdeg >= " + str(minDec) + " AND decdeg < " + str(maxDec) + " \
+                   AND radeg >= " + str(minRA) + " AND radeg < " + str(maxRA) + " \
                    AND mjd_obs >= (to_days('" + tstart + "')-678941) \
                    AND mjd_obs <= (to_days('" + tend + "') - 678941) "
@@ -137 +137 @@
                    AND addRun.stage = '" + stage + "' \
                    AND addRun.state = 'full' \
-                   AND decdeg BETWEEN " + str(minDec) + " AND " + str(maxDec) + " \
-                   AND radeg BETWEEN " + str(minRA) + " AND " + str(maxRA) + " \
+                   AND decdeg >= " + str(minDec) + " AND decdeg < " + str(maxDec) + " \
+                   AND radeg >= " + str(minRA) + " AND radeg < " + str(maxRA) + " \
                    AND dateobs >= '" + tstart + "'\
                    AND dateobs <= '" + tend  + "'\
@@ -164 +164 @@
                    AND addRun.stage = '" + stage + "' \
                    AND addRun.state = 'full' \
-                   AND decdeg BETWEEN " + str(minDec) + " AND " + str(maxDec) + " \
-                   AND radeg BETWEEN " + str(minRA) + " AND " + str(maxRA) + " \
+                   AND decdeg >= " + str(minDec) + " AND decdeg < " + str(maxDec) + " \
+                   AND radeg >= " + str(minRA) + " AND radeg < " + str(maxRA) + " \
                    AND mjd_obs >= (to_days('" + tstart + "')-678941) \
                    AND mjd_obs <= (to_days('" + tend + "') - 678941) \

trunk/ippToPsps/jython/ipptopspsdb.py

@@ -324 +324 @@
                AND processed = 1 \
                AND loaded_to_datastore = 1 \
-               AND timestamp BETWEEN now() - INTERVAL " + interval + " AND now()"
+               AND timestamp >= now() - INTERVAL " + interval + " AND timestamp < now()"
 
         total = -1
@@ -421 +421 @@
                AND timestamp > '" + self.skychunk.epoch + "' \
                AND dvo_db = '" + self.skychunk.dvoLabel + "' \
-               AND timestamp BETWEEN now() - INTERVAL " + interval + " AND now()"
+               AND timestamp >= now() - INTERVAL " + interval + " AND timestamp < now()"
 
         try:
@@ -545 +545 @@
                AND dvo_db = '" + self.skychunk.dvoLabel + "' \
                AND batch_type != 'IN' \
-               AND timestamp BETWEEN now() - INTERVAL 12 HOUR AND now()"
+               AND timestamp >= now() - INTERVAL 12 HOUR AND timestamp < now()"
 
         try:
@@ -1238 +1238 @@
         sql = "SELECT id FROM box \
                WHERE skychunk  = '" + self.skychunk.name + "' \
-               AND ra_center BETWEEN " + str(minRA) + " AND " + str(maxRA) + " \
-               AND dec_center BETWEEN " + str(minDEC) + " AND " + str(maxDEC)
+               AND ra_center >= " + str(minRA) + " AND ra_center < " + str(maxRA) + " \
+               AND dec_center >= " + str(minDEC) + " AND dec_center < " + str(maxDEC)
 
                # AND box_side = " + str(self.skychunk.boxSize)
@@ -1422 +1422 @@
                FROM box \
                JOIN pending ON (id = box_id) \
-               WHERE ra_center BETWEEN " + str(minRA) + " AND " + str(maxRA) + " \
+               WHERE ra_center >= " + str(minRA) + " AND ra_center < " + str(maxRA) + " \
                AND batch_type = '" + batchType + "' \
                AND skychunk = '" + self.skychunk.name + "' \
@@ -1501 +1501 @@
                FROM box \
                JOIN pending ON (id = box_id) \
-               WHERE ra_center BETWEEN " + str(minRA) + " AND " + str(maxRA) + " \
+               WHERE ra_center >= " + str(minRA) + " AND ra_center < " + str(maxRA) + " \
                AND skychunk = '" + self.skychunk.name + "' \
                ORDER BY dec_center DESC"
@@ -1710 +1710 @@
         sql = "SELECT DISTINCT stage_id \
                FROM all_pending \
-               WHERE ra_bore BETWEEN " + str(minRA) + " AND " + str(maxRA) + " \
-               AND dec_bore BETWEEN " + str(minDEC) + " AND " + str(maxDEC)
+               WHERE ra_bore >= " + str(minRA) + " AND ra_bore < " + str(maxRA) + " \
+               AND dec_bore >= " + str(minDEC) + " AND dec_bore < " + str(maxDEC)
 
         try: