Changeset 38871

Timestamp:

Oct 17, 2015, 6:00:00 AM (11 years ago)

Author:

eugene

Message:

send dvopsps output to /tmp/files

File:

• trunk/ippToPsps/jython/dvo.py (modified) (4 diffs)

trunk/ippToPsps/jython/dvo.py

@@ -9 +9 @@
 import logging
 import glob
+import tempfile
 from subprocess import call, PIPE, Popen
 
@@ -632 +633 @@
             use_trange = 1
 
-
-        # TODO path to DVO prog hardcoded temporarily
         cmd = "dvopsps detections"
         cmd += " -dbhost " + self.scratchDb.dbHost
@@ -666 +665 @@
         for batchType in self.skychunk.batchTypes:
             self.logger.infoPair("batchType", batchType)
-            if batchType == "ST":
-                useST = 1
-            if batchType == "P2":
-                useP2 = 1
-            if batchType == "DF":
-                useDF = 1
-            if batchType == "FW":
-                useFW = 1
-                
+            if batchType == "ST": useST = 1
+            if batchType == "P2": useP2 = 1
+            if batchType == "DF": useDF = 1
+            if batchType == "FW": useFW = 1
                 
         if (useP2 == 0 and useST == 1):
@@ -704 +698 @@
             else:
                 print "need photcode for warp for gpc1 camera, default is no selection, should work, could be slow"
-
-
                 
+        (dvoStdoutFile, dvoStdoutName) = tempfile.mkstemp(prefix="dvopsps.stdout.", dir="/tmp")
+        (dvoStderrFile, dvoStderrName) = tempfile.mkstemp(prefix="dvopsps.stderr.", dir="/tmp")
+
         self.logger.infoPair("Running dvopsps", cmd)
-        p = Popen(cmd, shell=True, stdout=PIPE, stderr=PIPE)
+        self.logger.infoPair("Stdout to ", dvoStdoutName)
+        self.logger.infoPair("Stderr to ", dvoStderrName)
+        p = Popen(cmd, shell=True, stdout=dvoStdoutFile, stderr=dvoStderrFile)
         p.wait()
         if p.returncode != 0:
             self.logger.errorPair("dvopsps failed on ", self.scratchDb.dvoDetectionTable)
             raise
+
+        os.close(dvoStdoutFile)
+        os.close(dvoStderrFile)
 
         ## dvopsps can take a very long time. try 2 or 3 times to re-establish communication with the db before proceeding?