Changeset 32001 for trunk/ippToPsps/jython/batch.py

Timestamp:

Aug 3, 2011, 12:37:58 PM (15 years ago)

Author:

rhenders

Message:

now taking config path into constructor and using it to run dvograbber program

File:

• trunk/ippToPsps/jython/batch.py (modified) (5 diffs)

trunk/ippToPsps/jython/batch.py

@@ -35 +35 @@
     def __init__(self, 
                  logger, 
+                 configPath,
                  doc,
                  gpc1Db,
@@ -45 +46 @@
         self.everythingOK = False
         self.readHeader = False
+        self.configPath = configPath
         self.doc = doc
         self.fits = fits
@@ -65 +67 @@
         # get dvo info from config
         dvoName = self.doc.find("dvo/name").text
+        dvoGpc1Label = self.doc.find("dvo/gpc1Label").text
         self.dvoLocation = self.doc.find("dvo/location").text
         self.useFullTables = int(self.doc.find("dvo/useFullTables").text)
@@ -90 +93 @@
                 self.id,
                 survey,
-                dvoName, 
+                dvoGpc1Label, 
                 self.datastore.product)
 
@@ -429 +432 @@
 
         # TODO path to DVO prog hardcoded temporarily
-        cmd = "../src/dvograbber " + self.dvoLocation
+        cmd = "../src/dvograbber " + self.configPath + " " + self.dvoLocation
         self.logger.infoPair("Running DVO", cmd)
         p = Popen(cmd, shell=True, stdout=PIPE)