Changeset 37403 for branches/eam_branches/ps2-tc3-20130727/ippToPsps/jython/queue.py

Timestamp:

Sep 19, 2014, 4:05:27 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

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

branches/eam_branches/ps2-tc3-20130727/ippToPsps/jython/queue.py

@@ -29 +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:
-            print "why doesn't this work"
             self.dvoObjects = DvoObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb)
         except:
@@ -51 +43 @@
             raise
 
-        print "got objects"
-
         self.skychunk.printAll()
 
@@ -63 +53 @@
     '''
     def run(self):
-        print "here"
+        self.logger.info("------------- starting queue.run -----------------")
         # 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: 
@@ -77 +67 @@
                 # 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
-                if batchType == "OB":
+
+                # for object-like batches, info comes from dvo
+                if (batchType == "OB" or batchType =="DO" or batchType =="FO"):
                     self.dvoObjects.setSkyArea(
                             self.skychunk.minRa,
@@ -143 +134 @@
                     if (dec > 85): raise
 
-                    print "dec, dD: ", dec, dD ,self.skychunk.maxDec
+                    # print "dec, dD: ", dec, dD ,self.skychunk.maxDec
 
                     # a given box centered at RA,DEC with (linear) size of SIDE has the following bounds
@@ -151 +142 @@
                     ra = self.skychunk.minRa + dR
                     
-                    print "ra, dR, maxRa", ra, dR, self.skychunk.maxRa
+                    # 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
@@ -174 +164 @@
                                        len(ids)))
                 
-                           print "box_id: ", box_id
-
                            if len(ids) > 0: self.ippToPspsDb.insertPending(box_id, batchType, ids)
                            # print "inserted pending"