Changeset 35076 for branches/eam_branches/ipp-20121219/ippToPsps/jython/dvoobjects.py

Timestamp:

Jan 31, 2013, 4:13:09 PM (14 years ago)

Author:

eugene

Message:

split out config (static info) and skychunk (area being processed)

File:

• branches/eam_branches/ipp-20121219/ippToPsps/jython/dvoobjects.py (modified) (4 diffs)

branches/eam_branches/ipp-20121219/ippToPsps/jython/dvoobjects.py

@@ -12 +12 @@
 from dvo import Dvo
 
-
 '''
 A class for ingesting DVO detections into MySQL
@@ -21 +20 @@
     Constructor
     '''
-    def __init__(self, logger, config, scratchDbName=None):
+    def __init__(self, logger, config, skychunk, scratchDbName=None):
 
-        super(DvoObjects, self).__init__(logger, config, scratchDbName)
+        super(DvoObjects, self).__init__(logger, config, skychunk, scratchDbName)
 
         # declare DVO file types of interest
@@ -38 +37 @@
        for fileType in self.ingestFileTypes:
 
-           path = self.config.dvoLocation + "/" + region + "." + fileType
+           path = self.skychunk.dvoLocation + "/" + region + "." + fileType
            tableName = self.scratchDb.getDbFriendlyTableName(region + "." + fileType)
 
@@ -64 +63 @@
         cmd += " -dbuser " + self.scratchDb.dbUser
         cmd += " -dbpass " + self.scratchDb.dbPass
-        cmd += " -D CATDIR " + self.config.dvoLocation
+        cmd += " -D CATDIR " + self.skychunk.dvoLocation
         cmd += " -cpt " + region
 
-        if self.config.parallel:
+        if self.skychunk.parallel:
             cmd += " -parallel"