[Swift-commit] r4584 - SwiftApps/Montage/exec

[jonmon at ci.uchicago.edu]

Author: jonmon
Date: 2011-06-08 16:45:21 -0500 (Wed, 08 Jun 2011)
New Revision: 4584

Modified:
   SwiftApps/Montage/exec/montage.sh
Log:
Minor edits to the execution script


Modified: SwiftApps/Montage/exec/montage.sh
===================================================================
--- SwiftApps/Montage/exec/montage.sh	2011-06-08 17:49:33 UTC (rev 4583)
+++ SwiftApps/Montage/exec/montage.sh	2011-06-08 21:45:21 UTC (rev 4584)
@@ -9,26 +9,31 @@
 fi
 
 # Fix this. Not sure how to set this variable if it not set or even what the error message should be
-if [ "X$SWIFT_MONTAGE" == "X" ]; then
+if [ "X$SWIFT_MONTAGE" = "X" ] ; then
     echo "Please set the SWIFT_MONTAGE environment variable to where the Swift_Montage wrappers home directory is."
     exit 1
 fi
 
+if [ "X$SWIFT_MONTAGE_WORK" = "X" ] ; then
+    echo "Please set the SWIFT_MONTAGE_WORK environment varible to where the montage work should be done."
+    exit 1
+fi
+
 RUN_DIRECTORY=(`ls | grep run | tail -n 1`)
 NUM=`echo $RUN_DIRECTORY | awk -F . '{print $NF}'`
 WORK_DIRECTORY=(`printf "run.%04d" $((NUM+1))`)
 
 mkdir ${WORK_DIRECTORY}
 
-if [ $HOSTNAME == "login2.pads.ci.uchicago.edu" ]; then
-    echo "#site pads-proj-coasters.xml internalhostname=192.5.86.6" >> sites.properties
-    echo "#site pads-diff-coasters.xml internalhostname=192.5.86.6" >> sites.properties
-    echo "#site pads-fit-coasters.xml internalhostname=192.5.86.6"  >> sites.properties
-elif [ $HOSTNAME == "login1.pads.ci.uchicago.edu" ]; then
-    echo "#site pads-proj-coasters.xml internalhostname=192.5.86.5" >> sites.properties
-    echo "#site pads-diff-coasters.xml internalhostname=192.5.86.5" >> sites.properties
-    echo "#site pads-fit-coasters.xml internalhostname=192.5.86.5"  >> sites.properties
-fi
+# if [ $HOSTNAME == "login2.pads.ci.uchicago.edu" ]; then
+#     echo "#site pads-proj-coasters.xml internalhostname=192.5.86.6" >> sites.properties
+#     echo "#site pads-diff-coasters.xml internalhostname=192.5.86.6" >> sites.properties
+#     echo "#site pads-fit-coasters.xml internalhostname=192.5.86.6"  >> sites.properties
+# elif [ $HOSTNAME == "login1.pads.ci.uchicago.edu" ]; then
+#     echo "#site pads-proj-coasters.xml internalhostname=192.5.86.5" >> sites.properties
+#     echo "#site pads-diff-coasters.xml internalhostname=192.5.86.5" >> sites.properties
+#     echo "#site pads-fit-coasters.xml internalhostname=192.5.86.5"  >> sites.properties
+# fi
 
 echo "#site pads-proj-coasters.xml work=/gpfs/pads/jonmon/Swift/work/pads" >> sites.properties
 echo "#site pads-proj-coasters.xml slots=$1"                               >> sites.properties
@@ -36,11 +41,12 @@
 echo "#site pads-diff-coasters.xml work=/gpfs/pads/jonmon/Swift/work/pads" >> sites.properties
 echo "#site pads-diff-coasters.xml slots=$2"                               >> sites.properties
 
-echo "#site pads-fit-coasters.xml work=/gpfs/pads/jonmon/Swift/work/pads" >> sites.properties
-echo "#site pads-fit-coasters.xml slots=$3"                               >> sites.properties
+echo "#site pads-fit-coasters.xml work=/gpfs/pads/jonmon/Swift/work/pads"  >> sites.properties
+echo "#site pads-fit-coasters.xml slots=$3"                                >> sites.properties
 
-echo "#site local.xml work=/gpfs/pads/jonmon/Swift/work/local"            >> sites.properties
+echo "#site local.xml work=/gpfs/pads/jonmon/Swift/work/local"             >> sites.properties
 
+
 echo "<config>"                                                                   >  sites.xml
 echo ""                                                                           >> sites.xml
 
@@ -62,8 +68,8 @@
 
 mv sites.xml ${WORK_DIRECTORY}
 cp tc.data ${WORK_DIRECTORY}
-cp $4 ${WORK_DIRECTORY}
+cp -r $4 ${WORK_DIRECTORY}
 cd ${WORK_DIRECTORY}
-#swift -tc.file tc.data -sites.file sites.xml -config ${SWIFT_MONTAGE}/etc swift_montage.properties
+echo "swift -tc.file tc.data -sites.file sites.xml -config ${SWIFT_MONTAGE}/etc swift_montage.properties ${SWIFT_MONTAGE}/scripts/montage.swift"
 
 #clear ; swiftrun -sites localhost pads -input raw_dir header.hdr -script m101_montage.swift