Fixed LFN issues

diff --git a/bin/1D_CreaPhase.sh b/bin/1D_CreaPhase.sh
index 0e0e6c2ce757f26aa7b52a3bd8de7b3ba314024f..f9ef57905d311401e101f123617c2a402d07ccfe 100755 (executable)
--- a/bin/1D_CreaPhase.sh
+++ b/bin/1D_CreaPhase.sh
@@ -73,7 +73,9 @@ fi
 
 # Arguments parsing #
 RES=$1
 
 # Arguments parsing #
 RES=$1

-COMM_LINE=`echo "${@:2:$(($#-2))}"`
+COMM_LINE=`echo "${@:2:$(($#-4))}"`
+MU=`echo "${@:$(($#-2)):1}"`
+DELTA=`echo "${@:$(($#-1)):1}"`

 # Command-line construction #
 
 #echo "COMM line is $COMM_LINE"
 # Command-line construction #
 
 #echo "COMM line is $COMM_LINE"


@@ -93,6 +95,8 @@ DIROUT="dirOut"
 cat << DOCKERJOB > .dockerjob.sh
 #!/bin/bash -l
 cd /CreaPhase
 cat << DOCKERJOB > .dockerjob.sh
 #!/bin/bash -l
 cd /CreaPhase

+cp /gasw-dir/$MU ./
+cp /gasw-dir/$DELTA ./

 ${BOUTIQUES_COMMAND_LINE}
 DOCKERJOB
 
 ${BOUTIQUES_COMMAND_LINE}
 DOCKERJOB
 

diff --git a/gasw/1D_CreaPhase.xml b/gasw/1D_CreaPhase.xml
index 6a79eef857744e23e1591235770f4a5540af9de0..fea75f4d258d1e79ecad74aabc3a02c7ee9ea94b 100644 (file)
--- a/gasw/1D_CreaPhase.xml
+++ b/gasw/1D_CreaPhase.xml
@@ -7,9 +7,9 @@
     <executor value="LOCAL"/>
     <input name="results-directory" option="no1"> 
     </input>
     <executor value="LOCAL"/>
     <input name="results-directory" option="no1"> 
     </input>

-    <input name="oversamp" option=","> 
+    <input name="basename" option="no2"> 

     </input>
     </input>

-    <input name="basename" option=","> 
+    <input name="oversamp" option=","> 

     </input>
     <input name="dist" option=","> 
     </input>
     </input>
     <input name="dist" option=","> 
     </input>


@@ -25,12 +25,6 @@
     </input>
     <input name="modelFresnel" option=","> 
     </input>
     </input>
     <input name="modelFresnel" option=","> 
     </input>

-    <input name="muMat" option="no2"> 
-      <access type="LFN" cached="true">
-    </input>
-    <input name="deltaMat" option="no3"> 
-      <access type="LFN" cached="true">
-    </input>

     <input name="muMat" option=","> 
     </input>
     <input name="deltaMat" option=","> 
     <input name="muMat" option=","> 
     </input>
     <input name="deltaMat" option=","> 


@@ -41,6 +35,12 @@
     </input>
     <input name="noiseAmount" option=","> 
     </input>
     </input>
     <input name="noiseAmount" option=","> 
     </input>

+    <input name="muLfn" option="no3"> 
+      <access type="LFN" cached="true"/>
+    </input>
+    <input name="deltaLfn" option="no4"> 
+      <access type="LFN" cached="true"/>
+    </input>

     <output name="resultTarball" option="no20">
       <template value="$dir1/$na1/result.tgz"/>
       <access type="LFN"/>
     <output name="resultTarball" option="no20">
       <template value="$dir1/$na1/result.tgz"/>
       <access type="LFN"/>