[Swift-commit] r4334 - in SwiftApps/Montage: . etc exec

[jonmon at ci.uchicago.edu]

Author: jonmon
Date: 2011-04-11 13:16:23 -0500 (Mon, 11 Apr 2011)
New Revision: 4334

Added:
   SwiftApps/Montage/etc/
   SwiftApps/Montage/etc/swift_montage.properties
Removed:
   SwiftApps/Montage/swift_montage.properties
Modified:
   SwiftApps/Montage/exec/montage.sh
Log:
o SwiftApps/Montage/etc
  -- Added directory. Currently only holds swift properties file

o SwiftApps/Montage/exec/montage.sh
  -- Minor change


Added: SwiftApps/Montage/etc/swift_montage.properties
===================================================================
--- SwiftApps/Montage/etc/swift_montage.properties	                        (rev 0)
+++ SwiftApps/Montage/etc/swift_montage.properties	2011-04-11 18:16:23 UTC (rev 4334)
@@ -0,0 +1,7 @@
+execution.retries=0
+sitedir.keep=true
+status.mode=provider
+wrapper.log.always.transfer=true
+foreach.maxthreads=1024
+wrapper.parameter.mode=files
+

Modified: SwiftApps/Montage/exec/montage.sh
===================================================================
--- SwiftApps/Montage/exec/montage.sh	2011-04-11 17:54:47 UTC (rev 4333)
+++ SwiftApps/Montage/exec/montage.sh	2011-04-11 18:16:23 UTC (rev 4334)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-EXPECTED_ARGS=1
+EXPECTED_ARGS=2
 
 if [ $# -ne $EXPECTED_ARGS ]
 then
@@ -29,6 +29,8 @@
 
 mv sites.xml ${WORK_DIRECTORY}
 mv tc.data ${WORK_DIRECTORY}
-cp montage.swift ${WORK_DIRECTORY}
+cp $2 ${WORK_DIRECTORY}
+cd ${WORK_DIRECTORY}
+#swift -tc.file tc.data -sites.file sites.xml -config ${SWIFT_MONTAGE}/etcswift_montage.properties
 
 #clear ; swiftrun -sites localhost pads -input raw_dir header.hdr -script m101_montage.swift

Deleted: SwiftApps/Montage/swift_montage.properties
===================================================================
--- SwiftApps/Montage/swift_montage.properties	2011-04-11 17:54:47 UTC (rev 4333)
+++ SwiftApps/Montage/swift_montage.properties	2011-04-11 18:16:23 UTC (rev 4334)
@@ -1,7 +0,0 @@
-execution.retries=0
-sitedir.keep=true
-status.mode=provider
-wrapper.log.always.transfer=true
-foreach.maxthreads=1024
-wrapper.parameter.mode=files
-