Changeset 35204

Timestamp:

Feb 26, 2013, 8:50:05 AM (13 years ago)

Author:

eugene

Message:

box sizes are linear dimensions; actual areas are now scaled by cos(DEC)

Location:

trunk/ippToPsps

Files:

• jython/ipptopspsdb.py (modified) (5 diffs)
• jython/queue.py (modified) (4 diffs)
• test/fulltest.sh (modified) (1 diff)
• test/widetest.sh (added)

trunk/ippToPsps/jython/ipptopspsdb.py

@@ -1037 +1037 @@
     def getBoxId(self, ra, dec):
 
+        # for the float comparison, need to use a small window
+        minRA = ra - 0.01
+        maxRA = ra + 0.01
+        minDEC = dec - 0.01
+        maxDEC = dec + 0.01
+
         sql = "SELECT id FROM box \
                WHERE skychunk  = '" + self.skychunk.name + "' \
-               AND ra_center = " + str(ra) + " \
-               AND dec_center = " + str(dec)
+               AND ra_center BETWEEN " + str(minRA) + " AND " + str(maxRA) + " \
+               AND dec_center BETWEEN " + str(minDEC) + " AND " + str(maxDEC)
 
                # AND box_side = " + str(self.skychunk.boxSize)
 
+        # print "sql for boxid: ", sql
+       
         id = -1
         try:
@@ -1140 +1148 @@
     def insertPending(self, box_id, batchType, ids):
 
+        # print "starting insert pending"
+
         # first delete old pending items
         self.execute("DELETE FROM pending \
                 WHERE box_id = " + str(box_id) + " \
                 AND batch_type = '" + batchType + "'")
+
+        # print "deleted old items"
 
         for id in ids:
@@ -1151 +1163 @@
                (" + str(box_id) + ", '" + batchType + "', " + str(id) + ")"
 
+            # print "sql: ", sql
             self.execute(sql)
 
@@ -1455 +1468 @@
     Gets all items in the all_pending temporary table within the bounds of this box
     '''
-    def getItemsInThisThisBox(self, ra, dec):
-
-        halfSide = self.skychunk.boxSize/2.0
-        minRa =  ra-halfSide
-        maxRa = ra+halfSide
-        minDec = dec-halfSide
-        maxDec = dec+halfSide
+    def getItemsInThisBox(self, minRA, maxRA, minDEC, maxDEC):
+
+        # the old linear size is ill-conceived
+        ## XX halfSide = self.skychunk.boxSize/2.0
+        ## XX minRa =  ra-halfSide
+        ## XX maxRa = ra+halfSide
+        ## XX minDec = dec-halfSide
+        ## XX maxDec = dec+halfSide
 
         ids = []
@@ -1467 +1481 @@
         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 BETWEEN " + str(minRA) + " AND " + str(maxRA) + " \
+               AND dec_bore BETWEEN " + str(minDEC) + " AND " + str(maxDEC)
 
         try:

trunk/ippToPsps/jython/queue.py

@@ -8 +8 @@
 import sys
 import os
+import math
 import logging.config
 
@@ -117 +118 @@
                     # starting positions
 
-                    dD = 0.5*skychunk.boxSize
+                    dD = 0.5*self.skychunk.boxSize
                     dec = self.skychunk.minDec + dD
+                    if (dec > 85): raise
+
+                    # print "dec, dD: ", dec, dD
 
                     # a given box centered at RA,DEC with (linear) size of SIDE has the following bounds
-                    dR = 0.5*skychunk.boxSize / math.cos(math.radians(dec))
+                    dR = 0.5*self.skychunk.boxSize / math.cos(math.radians(dec))
                     ra = self.skychunk.minRa + dR
                     
+                    # print "ra, dR: ", ra, dR
+
+                    # XXX not sure why this is not done with a for-loop...
                     while dec <= self.skychunk.maxDec:
-                        
-                        # XXX EAM : need to do something special at the poles...
-                        if (dec > 85): raise
-
                         while ra <= self.skychunk.maxRa:
             
@@ -137 +140 @@
                            maxDEC = dec + dD
 
-                           XXX EAM:
+                           # this function inserts the box with given center and (linear) skychunk.boxSize 
                            box_id = self.ippToPspsDb.insertBox(ra, dec)
             
-                           XXX EAM:
-                           ids = self.ippToPspsDb.getItemsInThisThisBox(ra, dec)
+                           ids = self.ippToPspsDb.getItemsInThisBox(minRA, maxRA, minDEC, maxDEC)
     
                            self.logger.info("|    %5.1f    |    %5.1f    |  %9d  |  %9d  |" % (
@@ -149 +151 @@
                                        len(ids)))
                 
+                           # print "box_id: ", box_id
+
                            if len(ids) > 0: self.ippToPspsDb.insertPending(box_id, batchType, ids)
+                           # print "inserted pending"
                            ra = ra + 2*dR
-
-                         dec = dec + 2*dD
-
-                         dR = 0.5*skychunk.boxSize / math.cos(math.radians(dec))
-                         ra = self.skychunk.minRa + dR
+                           # print "new ra: ", ra
+
+                        dec = dec + 2*dD
+                        if (dec > 85): raise
+
+                        dR = 0.5*self.skychunk.boxSize / math.cos(math.radians(dec))
+                        ra = self.skychunk.minRa + dR
 
                 self.logger.info("+-------------+-------------+-------------+-------------+")

trunk/ippToPsps/test/fulltest.sh

@@ -26 +26 @@
 
 set mkgpc1       = 0
-set initdb       = 1
-set initscratch  = 1
+set initdb       = 0
+set initscratch  = 0
 set camqueue     = 1
-set initbatch    = 1
-set cambatch     = 1
+set initbatch    = 0
+set cambatch     = 0
 set stackqueue   = 0
 set stackbatch   = 0