Changeset 35204 for trunk/ippToPsps/jython/queue.py

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)

File:

• trunk/ippToPsps/jython/queue.py (modified) (4 diffs)

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("+-------------+-------------+-------------+-------------+")