Changeset 38052 for branches/eam_branches/ipp-20150112/ippToPsps/jython/loader.py

Timestamp:

Mar 28, 2015, 8:28:32 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20150112/ippToPsps/jython/loader.py (modified) (2 diffs)

branches/eam_branches/ipp-20150112/ippToPsps/jython/loader.py

@@ -27 +27 @@
 from diffobjectbatch import DiffObjectBatch
 
-#from forcedwarpbatch import ForcedWarpBatch 
-#from forcedobjectbatch import ForcedObjectBatch
+from forcedwarpbatch import ForcedWarpBatch 
+from forcedobjectbatch import ForcedObjectBatch
 #
 #
@@ -168 +168 @@
                     self.logger.infoPair("Box dimensions: ", "ra / dec / size : %.1f / %.1f / %.1f   --   sky bounds : (%.2f - %2.f, %2.f - %2.f)" % (boxDim['RA'], boxDim['DEC'], boxDim['SIDE'], boxDim['minRA'], boxDim['maxRA'], boxDim['minDEC'], boxDim['maxDEC']))
                     self.logger.infoPair(batchType + " items found in this box", "%d" % len(ids))
-
-                    if batchType != "OB":
+                    #previously said if not OB, but we don't need these for Do or FO
+                    if (batchType == "P2" or batchType == "ST" or batchType =="DF" or batchType == "FW"):
                         if self.config.resetDvo or not self.ippToPspsDb.isBoxIngested(boxId, self.scratchDb.dbHost):
                             if not self.dvoDetections.nativeIngestDetections(boxId, boxDim):