[Swift-commit] r8340 - SwiftApps/dsp-swift

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2014-12-12 09:26:45 -0600 (Fri, 12 Dec 2014)
New Revision: 8340

Modified:
   SwiftApps/dsp-swift/swiftjumpdsp.py
Log:
cleanup py

Modified: SwiftApps/dsp-swift/swiftjumpdsp.py
===================================================================
--- SwiftApps/dsp-swift/swiftjumpdsp.py	2014-12-12 15:18:17 UTC (rev 8339)
+++ SwiftApps/dsp-swift/swiftjumpdsp.py	2014-12-12 15:26:45 UTC (rev 8340)
@@ -48,15 +48,18 @@
         sys.exit(1)
 
     #which swift
+    baseloc="/home/ketan/SwiftApps/dsp-swift"
     swift = "/home/ketan/swift-0.95/cog/modules/swift/dist/swift-svn/bin/swift"
     swiftargs="-loc="+inloc+" -a="+a+" -n="+n+"  -pval="+p+" -I="+I+" -outloc="+outloc
-    
-    BASEDIR = os.path.dirname(os.path.realpath(__file__))
-    
+    siteval=baseloc+"/sites.local.xml"
+
+    if local_or_compute == "compute":
+        siteval=baseloc+"/sites.blues.xml"
+
     #Invocation
     logfile="/tmp/std.err"
     with open(logfile,"wb") as errfile:
-        exitcode=subprocess.check_call([swift, "-sites.file", "/home/ketan/SwiftApps/dsp-swift/sites.local.xml", "-tc.file", "/home/ketan/SwiftApps/dsp-swift/apps", "-config", "/home/ketan/SwiftApps/dsp-swift/cf", "/home/ketan/SwiftApps/dsp-swift/dsp.blues.swift", swiftargs],stderr=errfile)
+        exitcode=subprocess.check_call([swift, "-sites.file", siteval, "-tc.file", baseloc+"/apps", "-config", baseloc+"/cf", baseloc+"/dsp.blues.swift", swiftargs],stderr=errfile)
     print exitcode
 
     #Populate output file