Changeset 39158 for trunk/ippToPsps/jython/gpc1db.py

Timestamp:

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

Author:

eugene

Message:

replace BETWEEN with >= and < constraint

File:

• trunk/ippToPsps/jython/gpc1db.py (modified) (4 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) \