Changeset 35179 for trunk/ippToPsps/jython/loader.py

Timestamp:

Feb 19, 2013, 9:09:36 AM (13 years ago)

Author:

eugene

Message:

set box border based on cos(DEC); add ipp008-010 to loader list

File:

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

trunk/ippToPsps/jython/loader.py

@@ -8 +8 @@
 import sys
 import os
+import math
 import traceback
 import logging.config
@@ -158 +159 @@
                     self.logger.infoPair("Box dimensions", "%.1f / %.1f / %.1f" % (boxDim['RA'], boxDim['DEC'], boxDim['SIDE']))
                     self.logger.infoPair(batchType + " items found in this box", "%d" % len(ids))
-                    boxSizeWithBorder = boxDim['SIDE'] + (self.skychunk.BORDER * 2)
+                    boxSizeWithBorder = boxDim['SIDE'] + (self.skychunk.BORDER * 2 / math.cos(math.radians(boxDim['DEC'])))
                     boxSizeSansBorder = boxDim['SIDE']
-                    self.logger.infoPair("got here", "ok")
+                    boxSize = boxSizeWithBorder
+                    self.logger.infoPair("using box of size", str(boxSize))
                     useFullTables = 0
                     if batchType != "OB":
@@ -167 +169 @@
                             # look in DVO for this box (with extra border)
                             self.logger.infoPair("Querying DVO for this sky area", "")
-                            self.dvoDetections.setSkyAreaAsBox(boxDim['RA'], boxDim['DEC'], boxSizeWithBorder)
+                            self.dvoDetections.setSkyAreaAsBox(boxDim['RA'], boxDim['DEC'], boxSize)
                             #self.dvoDetections.setSkyArea()
                             sizeToBeIngested = self.dvoDetections.getDiskSizeOfRegionsToBeIngested()
@@ -194 +196 @@
                             # impact of mysql insertion
                             if not self.ippToPspsDb.isBoxIngested(boxId):
-                                self.dvoDetections.nativeIngestDetections(boxId, boxDim['RA'], boxDim['DEC'], boxSizeWithBorder)
+                                self.dvoDetections.nativeIngestDetections(boxId, boxDim['RA'], boxDim['DEC'], boxSize)
 
                             useFullTables = 1