Changeset 35235 for branches/eam_branches/ipp-20130207/ippToPsps/jython/queue.py

Timestamp:

Mar 5, 2013, 2:23:09 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130207/ippToPsps

Files:

• . (modified) (1 prop)
• jython/queue.py (modified) (6 diffs)

branches/eam_branches/ipp-20130207/ippToPsps/jython/queue.py

@@ -8 +8 @@
 import sys
 import os
+import math
 import logging.config
 
@@ -15 +16 @@
 from dvoobjects import DvoObjects
 from batch import Batch
+from scratchdb import ScratchDb
 
 '''
@@ -27 +29 @@
         super(Queue, self).__init__(argv)
 
+        print "inited ipptopsps"
+
         # create various objects
         self.gpc1Db = Gpc1Db(self.logger, self.config)
+        print "connect to gpc1"
+
         self.datastore = Datastore(self.logger, self.skychunk, self.ippToPspsDb)
 
+        print "made datastore"
+
+        # connect to scratch database
+        self.scratchDb = ScratchDb(self.logger, self.config)
+
+        print "connect to scratchdb"
+
         try:
-            self.dvoObjects = DvoObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb)
+            self.dvoObjects = DvoObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb)
         except:
             self.exitProgram("Unable to create instance of DvoObject")
             raise
+
+        print "got objects"
 
         self.skychunk.printAll()
@@ -56 +71 @@
             for batchType in self.skychunk.batchTypes: 
 
-                self.logger.infoTitle("Previous failed datastore loads")
-                self.publishAnyUnpublishedBatches(batchType)
+                # self.logger.infoTitle("Previous failed datastore loads")
+                # self.publishAnyUnpublishedBatches(batchType)
 
                 # get totals for whole area to check if there is anything to do
@@ -116 +131 @@
     
                     # 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*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*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:
+                        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
+
+                           # this function inserts the box with given center and (linear) skychunk.boxSize 
                            box_id = self.ippToPspsDb.insertBox(ra, dec)
             
-                           ids = self.ippToPspsDb.getItemsInThisThisBox(ra, dec)
+                           ids = self.ippToPspsDb.getItemsInThisBox(minRA, maxRA, minDEC, maxDEC)
     
                            self.logger.info("|    %5.1f    |    %5.1f    |  %9d  |  %9d  |" % (
@@ -132 +165 @@
                                        len(ids)))
                 
+                           # print "box_id: ", box_id
+
                            if len(ids) > 0: self.ippToPspsDb.insertPending(box_id, batchType, ids)
-
-                           dec = dec + self.skychunk.boxSize
-                       dec = self.skychunk.minDec + self.skychunk.halfBox
-                       ra = ra + self.skychunk.boxSize
-            
+                           # print "inserted pending"
+                           ra = ra + 2*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("+-------------+-------------+-------------+-------------+")