From f4969ace248c8b077f28a3b59a81bee00e1b1222 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Thu, 7 Jun 2007 09:23:41 +0000 Subject: [PATCH] wofkflow-specific file names --- org.glite.jp/examples/pch06/align.sh | 10 ++++----- org.glite.jp/examples/pch06/functions.sh | 2 +- org.glite.jp/examples/pch06/pch06.jdl-template | 30 +++++++++++++------------- org.glite.jp/examples/pch06/pch06.runme | 6 +++--- org.glite.jp/examples/pch06/reslice.sh | 12 +++++------ 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/org.glite.jp/examples/pch06/align.sh b/org.glite.jp/examples/pch06/align.sh index d6279b2..3a396cb 100644 --- a/org.glite.jp/examples/pch06/align.sh +++ b/org.glite.jp/examples/pch06/align.sh @@ -21,19 +21,19 @@ globus-url-copy $1/$3.hdr file://$PWD/reference.hdr GLOBAL_MAXIMUM=`./scanheader anatomy.img | grep '^global maximum=' | sed 's/global maximum=//'` echo $GLOBAL_MAXIMUM -globus-url-copy file://$PWD/warp $1/$2.warp +globus-url-copy file://$PWD/warp $1/$2-$4.warp # Log LB user_tags init_log_event log_event "IPAW_STAGE" "1" log_event "IPAW_PROGRAM" "align_warp" -log_file_event "IPAW_INPUT" "$2" "$1/$2.img" -log_file_event "IPAW_INPUT" "$3" "$1/$3.img" -log_file_event "IPAW_OUTPUT" "$2" "$1/$2.warp" +log_file_event "IPAW_INPUT" "$2" +log_file_event "IPAW_INPUT" "$3" +log_file_event "IPAW_OUTPUT" "$2-$4.warp" log_event "IPAW_PARAM" "-m 12" log_event "IPAW_PARAM" "-q" log_event "IPAW_HEADER" "GLOBAL_MAXIMUM=$GLOBAL_MAXIMUM" -globus-url-copy file://$PWD/$$.err $1/$2.align-err +globus-url-copy file://$PWD/$$.err $1/$2-$4.align-err diff --git a/org.glite.jp/examples/pch06/functions.sh b/org.glite.jp/examples/pch06/functions.sh index 173f3a2..71a40c1 100644 --- a/org.glite.jp/examples/pch06/functions.sh +++ b/org.glite.jp/examples/pch06/functions.sh @@ -37,6 +37,6 @@ log_file_event_cool_but_unused() #1 - attr.name #2 file.name #3 file.uri... log_file_event() #1 - attr.name #2 file.name #3 file.uri... { attr="$1" - str="" + str="urn:challenge:$2" log_event "$attr" "$str" } diff --git a/org.glite.jp/examples/pch06/pch06.jdl-template b/org.glite.jp/examples/pch06/pch06.jdl-template index f756877..1ef5dcf 100644 --- a/org.glite.jp/examples/pch06/pch06.jdl-template +++ b/org.glite.jp/examples/pch06/pch06.jdl-template @@ -24,68 +24,68 @@ InputSandbox = { nodes = [ align1 = [ description = [ executable = "align.sh"; - arguments = "PREFIX BASE1 REFERENCE"; + arguments = "PREFIX BASE1 REFERENCE WFID"; ] ]; align2 = [ description = [ executable = "align.sh"; - arguments = "PREFIX BASE2 REFERENCE"; + arguments = "PREFIX BASE2 REFERENCE WFID"; ] ]; align3 = [ description = [ executable = "align.sh"; - arguments = "PREFIX BASE3 REFERENCE"; + arguments = "PREFIX BASE3 REFERENCE WFID"; ] ]; align4 = [ description = [ executable = "align.sh"; - arguments = "PREFIX BASE4 REFERENCE"; + arguments = "PREFIX BASE4 REFERENCE WFID"; ] ]; reslice1 = [ description = [ executable = "reslice.sh"; - arguments = "PREFIX BASE1"; + arguments = "PREFIX BASE1 WFID"; ] ]; reslice2 = [ description = [ executable = "reslice.sh"; - arguments = "PREFIX BASE2"; + arguments = "PREFIX BASE2 WFID"; ] ]; reslice3 = [ description = [ executable = "reslice.sh"; - arguments = "PREFIX BASE3"; + arguments = "PREFIX BASE3 WFID"; ] ]; reslice4 = [ description = [ executable = "reslice.sh"; - arguments = "PREFIX BASE4"; + arguments = "PREFIX BASE4 WFID"; ] ]; softmean = [ description = [ executable = "softmean.sh"; - arguments = "PREFIX BASE1 BASE2 BASE3 BASE4 ATLAS"; + arguments = "PREFIX BASE1-WFID BASE2-WFID BASE3-WFID BASE4-WFID ATLAS-WFID"; ] ]; slicerx = [ description = [ executable = "slicer.sh"; - arguments = "PREFIX ATLAS x"; + arguments = "PREFIX ATLAS-WFID x"; ] ]; slicery = [ description = [ executable = "slicer.sh"; - arguments = "PREFIX ATLAS y"; + arguments = "PREFIX ATLAS-WFID y"; ] ]; slicerz = [ description = [ executable = "slicer.sh"; - arguments = "PREFIX ATLAS z"; + arguments = "PREFIX ATLAS-WFID z"; ] ]; convertx = [ description = [ executable = "convert.sh"; - arguments = "PREFIX ATLAS x"; + arguments = "PREFIX ATLAS-WFID x"; ] ]; converty = [ description = [ executable = "convert.sh"; - arguments = "PREFIX ATLAS y"; + arguments = "PREFIX ATLAS-WFID y"; ] ]; convertz = [ description = [ executable = "convert.sh"; - arguments = "PREFIX ATLAS z"; + arguments = "PREFIX ATLAS-WFID z"; ] ]; ]; diff --git a/org.glite.jp/examples/pch06/pch06.runme b/org.glite.jp/examples/pch06/pch06.runme index fc7fdc0..0eabfcd 100644 --- a/org.glite.jp/examples/pch06/pch06.runme +++ b/org.glite.jp/examples/pch06/pch06.runme @@ -3,13 +3,13 @@ # sandbox='gsiftp://umbar.ics.muni.cz:1414/home/mulac/pch06' sandbox=. -if [ -z "$6" ]; then - echo usage: $0 urlprefix reference base1 base2 base3 base4 atlas +if [ -z "$8" ]; then + echo usage: $0 urlprefix reference base1 base2 base3 base4 atlas wfid echo " all args are URLs without suffix" exit 1 fi -sed "s|PREFIX|$1|; s|REFERENCE|$2|; s|BASE1|$3|; s|BASE2|$4|; s|BASE3|$5|; s|BASE4|$6|; s|ATLAS|$7|; s|SANDBOX|$sandbox|" pch06.jdl-template >pch06.jdl +sed "s|PREFIX|$1|; s|REFERENCE|$2|; s|BASE1|$3|; s|BASE2|$4|; s|BASE3|$5|; s|BASE4|$6|; s|ATLAS|$7|; s|SANDBOX|$sandbox|; s|WFID|$8|g" pch06.jdl-template >pch06.jdl # glite-wms-job-submit -a pch06.jdl diff --git a/org.glite.jp/examples/pch06/reslice.sh b/org.glite.jp/examples/pch06/reslice.sh index c124224..08c3340 100644 --- a/org.glite.jp/examples/pch06/reslice.sh +++ b/org.glite.jp/examples/pch06/reslice.sh @@ -8,22 +8,22 @@ hostname -f date echo $0 $* -globus-url-copy $1/$2.warp file://$PWD/warp +globus-url-copy $1/$2-$3.warp file://$PWD/warp globus-url-copy $1/$2.img file://$PWD/anatomy.img globus-url-copy $1/$2.hdr file://$PWD/anatomy.hdr chmod +x reslice ./reslice warp resliced -globus-url-copy file://$PWD/resliced.img $1/$2-resliced.img -globus-url-copy file://$PWD/resliced.hdr $1/$2-resliced.hdr +globus-url-copy file://$PWD/resliced.img $1/$2-$3-resliced.img +globus-url-copy file://$PWD/resliced.hdr $1/$2-$3-resliced.hdr # Log LB user_tags init_log_event log_event "IPAW_STAGE" "2" log_event "IPAW_PROGRAM" "reslice" -log_file_event "IPAW_INPUT" "$2" "$1/$2.warp" -log_file_event "IPAW_INPUT" "$2" "$1/$2.img" "$1/$2.hdr" -log_file_event "IPAW_OUTPUT" "$2-resliced" "$1/$2-resliced.img" "$1/$2-resliced.hdr" +log_file_event "IPAW_INPUT" "$2-$3.warp" +log_file_event "IPAW_INPUT" "$2" +log_file_event "IPAW_OUTPUT" "$2-$3-resliced" -- 1.8.2.3