Changeset 35748 for branches/eam_branches/ipp-20130509/ippToPsps/jython/queue.py

Timestamp:

Jul 3, 2013, 1:44:20 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130509/ippToPsps

Files:

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

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

@@ -37 +37 @@
         self.datastore = Datastore(self.logger, self.skychunk, self.ippToPspsDb)
 
-        # print "made datastore"
+        print "made datastore"
 
         # connect to scratch database
         self.scratchDb = ScratchDb(self.logger, self.config)
 
-        # print "connect to scratchdb"
+        print "connect to scratchdb"
 
         try:
@@ -50 +50 @@
             raise
 
-        # print "got objects"
+        print "got objects"
 
         self.skychunk.printAll()
@@ -62 +62 @@
     '''
     def run(self):
-
+        print "here"
         # this outer while loop simply waits a few minutes then starts queuing again (as more stuff may appear in DVO over time)
         while True:
 
             self.ippToPspsDb.removeAllBoxes()
-        
+            print "remove boxes" 
             # queue up batches that are processed but not loaded to datastore
             for batchType in self.skychunk.batchTypes: 
-
+                self.logger.infoPair("BatchType",batchType)
                 # self.logger.infoTitle("Previous failed datastore loads")
                 # self.publishAnyUnpublishedBatches(batchType)
@@ -76 +76 @@
                 # get totals for whole area to check if there is anything to do
                 processedIDs = self.ippToPspsDb.getProcessedIDs(batchType)
+                print "got processed ids"
                 consistantlyFailedIDs = self.ippToPspsDb.getConsistentlyFailedIDs(batchType)
-
+                print "got here"
                 # for object batches, get full list of stuff from Dvo
                 # XXX : need to fix 'dvo.setSkyArea' or this may not return the full list for a parallel dvo
@@ -133 +134 @@
 
                     dD = 0.5*self.skychunk.boxSize
+                    
                     dec = self.skychunk.minDec + dD
+                    #dec = self.skychunk.minDec
+
                     if (dec > 85): raise
 
-                    # print "dec, dD: ", dec, dD
+                    print "dec, dD: ", dec, dD ,self.skychunk.maxDec
 
                     # 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))
+                    #dR = 0.5*self.skychunk.boxSize / math.cos(math.radians(dec))
+                    dR = 0.5*self.skychunk.boxSize
+                                        
                     ra = self.skychunk.minRa + dR
                     
-                    # print "ra, dR: ", ra, dR
+                    print "ra, dR, maxRa", ra, dR, self.skychunk.maxRa
 
                     # XXX not sure why this is not done with a for-loop...
                     while dec <= self.skychunk.maxDec:
                         while ra <= self.skychunk.maxRa:
-            
+                           print "here" 
                            # a given box centered at RA,DEC with (linear) size of SIDE has the following bounds
                            minRA  = ra  - dR
@@ -165 +171 @@
                                        len(ids)))
                 
-                           # print "box_id: ", box_id
+                           print "box_id: ", box_id
 
                            if len(ids) > 0: self.ippToPspsDb.insertPending(box_id, batchType, ids)
@@ -175 +181 @@
                         if (dec > 85): raise
 
-                        dR = 0.5*self.skychunk.boxSize / math.cos(math.radians(dec))
+                        #dR = 0.5*self.skychunk.boxSize / math.cos(math.radians(dec))
+                        dR = 0.5*self.skychunk.boxSize
                         ra = self.skychunk.minRa + dR