Changeset 35203 for trunk/ippToPsps/jython/ipptopspsdb.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/ipptopspsdb.py (modified) (5 diffs)

trunk/ippToPsps/jython/ipptopspsdb.py

@@ -4 +4 @@
 import sys
 import os
+import math
 import logging
 
@@ -997 +998 @@
 
             self.skychunk.boxSize = rs.getDouble(10)
-            self.skychunk.halfBox = self.skychunk.boxSize/2.0
-            self.skychunk.boxSizeWithBorder = self.skychunk.boxSize + (self.skychunk.BORDER * 2)
+            # self.skychunk.halfBox = self.skychunk.boxSize/2.0
+            # self.skychunk.boxSizeWithBorder = self.skychunk.boxSize + (self.skychunk.BORDER * 2)
 
             self.skychunk.basePath = rs.getString(11)
@@ -1031 +1032 @@
     '''
     Gets id of box with these coords
+    XXX EAM : this code implies we can have multiple boxes at the same location for the same
+    XXX EAM : skychunk distinguished by having different sizes.  that seems quite bad
     '''
     def getBoxId(self, ra, dec):
@@ -1037 +1040 @@
                WHERE skychunk  = '" + self.skychunk.name + "' \
                AND ra_center = " + str(ra) + " \
-               AND dec_center = " + str(dec) + " \
-               AND box_side = " + str(self.skychunk.boxSize)
+               AND dec_center = " + str(dec)
+
+               # AND box_side = " + str(self.skychunk.boxSize)
 
         id = -1
@@ -1325 +1329 @@
         boxDim['SIDE'] = rs.getFloat(3)
 
+        # SIDE is the linear full-width of the box
+
+        # XXX EAM : need to do something special at the poles...
+        if (boxDim['DEC'] > 85): raise
+
+        # a given box centered at RA,DEC with (linear) size of SIDE has the following bounds
+        dR = 0.5*boxDim['SIDE'] / math.cos(math.radians(boxDim['DEC']))
+        dD = 0.5*boxDim['SIDE']
+
+        boxDim['minRA']  = boxDim['RA']  - dR
+        boxDim['maxRA']  = boxDim['RA']  + dR
+        boxDim['minDEC'] = boxDim['DEC'] - dD
+        boxDim['maxDEC'] = boxDim['DEC'] + dD
+
         return boxDim