Changeset 37066 for branches/eam_branches/ipp-ops-20130712/ippToPsps/jython/queue.py

Timestamp:

Jul 17, 2014, 12:30:45 PM (12 years ago)

Author:

eugene

Message:

merge changes (from past YEAR) into trunk

Location:

branches/eam_branches/ipp-ops-20130712/ippToPsps

Files:

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

branches/eam_branches/ipp-ops-20130712/ippToPsps/jython/queue.py

@@ -45 +45 @@
 
         try:
+            print "why doesn't this work"
             self.dvoObjects = DvoObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb)
         except:
@@ -71 +72 @@
             for batchType in self.skychunk.batchTypes: 
                 self.logger.infoPair("BatchType",batchType)
-                # 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
@@ -81 +82 @@
                 # 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,
@@ -98 +100 @@
                             self.skychunk.maxRa, 
                             self.skychunk.minDec, 
-                            self.skychunk.maxDec)
+                            self.skychunk.maxDec,
+                            self.skychunk.trange_start,
+                            self.skychunk.trange_end)
 
                 # EAM TEST I/O