Changeset 39008 for trunk/ippToPsps/jython/loader.py

Timestamp:

Oct 29, 2015, 5:28:11 PM (11 years ago)

Author:

eugene

Message:

fix typos and other minor issues with forced galaxy stuff

File:

• trunk/ippToPsps/jython/loader.py (modified) (3 diffs)

trunk/ippToPsps/jython/loader.py

@@ -17 +17 @@
 from datastore import Datastore
 from batch import Batch
-from dvodetections import DvoDetections
+from dvo import Dvo
 
 from initbatch import InitBatch
@@ -102 +102 @@
         except: return ret
            
-        self.dvoDetections = DvoDetections(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb, self.gpc1Db)
-#       self.dvoDetections = DvoDetections(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb)
+        self.dvo = Dvo(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb, self.gpc1Db)
 
         return ret
@@ -173 +172 @@
                     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):
+                            if not self.dvo.nativeIngestDetections(boxId, boxDim):
                                 self.logger.error("Unable to ingest detections with nativeIngest")
                                 return False