Changeset 35063 for branches/eam_branches/ipp-20121219/ippToPsps/jython/dvo.py

Timestamp:

Jan 27, 2013, 5:58:25 AM (13 years ago)

Author:

eugene

Message:

enable test mode from command-line (-test, after jython module); add parallel dvo option; make database selection more consistent and variable on test/not-test

File:

• branches/eam_branches/ipp-20121219/ippToPsps/jython/dvo.py (modified) (3 diffs)

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

@@ -33 +33 @@
 
     '''
-    def __init__(self, logger, config, scratchDbName="ipptopsps_test_scratch"):
+    def __init__(self, logger, config, scratchDbName=None):
 
         # set up logging
@@ -49 +49 @@
         self.useStilts = 0
 
-        # connect to the specified scratch database
+        # connect to the specified scratch database, if a name is given, otherwise use the first version
         try:
-            self.scratchDb = ScratchDb(self.logger, self.config, scratchDbName)
+            self.scratchDb = ScratchDb(self.logger, self.config, '1', scratchDbName)
         except: raise
 
@@ -617 +617 @@
         cmd += " " + str(decCenter+halfSize)
 
+        if self.config.parallel:
+            cmd += " -parallel"
+
         self.logger.infoPair("Running dvopsps", cmd)
         p = Popen(cmd, shell=True, stdout=PIPE)