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

Timestamp:

Feb 26, 2013, 6:47:49 AM (13 years ago)

Author:

eugene

Message:

trying to fix the definition of a box (roughly constant linear width)

File:

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

trunk/ippToPsps/jython/queue.py

@@ -116 +116 @@
     
                     # starting positions
-                    ra = self.skychunk.minRa + self.skychunk.halfBox
-                    dec = self.skychunk.minDec + self.skychunk.halfBox
-    
-                    while ra <= self.skychunk.maxRa:
-                       while dec <= self.skychunk.maxDec:
+
+                    dD = 0.5*skychunk.boxSize
+                    dec = self.skychunk.minDec + 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))
+                    ra = self.skychunk.minRa + dR
+                    
+                    while dec <= self.skychunk.maxDec:
+                        
+                        # XXX EAM : need to do something special at the poles...
+                        if (dec > 85): raise
+
+                        while ra <= self.skychunk.maxRa:
             
+                           # a given box centered at RA,DEC with (linear) size of SIDE has the following bounds
+                           minRA  = ra  - dR
+                           maxRA  = ra  + dR
+                           minDEC = dec - dD
+                           maxDEC = dec + dD
+
+                           XXX EAM:
                            box_id = self.ippToPspsDb.insertBox(ra, dec)
             
+                           XXX EAM:
                            ids = self.ippToPspsDb.getItemsInThisThisBox(ra, dec)
     
@@ -133 +150 @@
                 
                            if len(ids) > 0: self.ippToPspsDb.insertPending(box_id, batchType, ids)
+                           ra = ra + 2*dR
 
-                           dec = dec + self.skychunk.boxSize
-                       dec = self.skychunk.minDec + self.skychunk.halfBox
-                       ra = ra + self.skychunk.boxSize
-            
+                         dec = dec + 2*dD
+
+                         dR = 0.5*skychunk.boxSize / math.cos(math.radians(dec))
+                         ra = self.skychunk.minRa + dR
+
                 self.logger.info("+-------------+-------------+-------------+-------------+")