|
40 | 40 | done |
41 | 41 |
|
42 | 42 | # last argument is input file stub: |
43 | | -webFileStub="${@: -1}" |
| 43 | +stub="${@: -1}" |
44 | 44 |
|
45 | 45 | # sanity check on filestub name, |
46 | 46 | # just to error with reasonable message before proceeding: |
47 | | -case $webFileStub in |
| 47 | +case $stub in |
48 | 48 | # electron in forward, hadron in forward: |
49 | 49 | electronproton) |
50 | 50 | ;; |
@@ -79,7 +79,7 @@ case $webFileStub in |
79 | 79 | electrondeuteronC) |
80 | 80 | ;; |
81 | 81 | *) |
82 | | - echo Invalid input evio file: $webFileStub |
| 82 | + echo Invalid input evio file: $stub |
83 | 83 | exit 1 |
84 | 84 | esac |
85 | 85 |
|
@@ -122,28 +122,28 @@ then |
122 | 122 | fi |
123 | 123 |
|
124 | 124 | # download test files, if necessary: |
125 | | - wget -N --no-check-certificate $webDir/${webFileStub}.hipo |
| 125 | + wget -N --no-check-certificate $webDir/${stub}.hipo |
126 | 126 | if [ $? != 0 ] ; then echo "wget validation files failure" ; exit 1 ; fi |
127 | 127 |
|
128 | 128 | # update the schema dictionary: (no longer necessary now that recon-util does it) |
129 | | - #rm -f up_${webFileStub}.hipo |
130 | | - #../../coatjava/bin/hipo-utils -update -d ../../coatjava/etc/bankdefs/hipo4/ -o up_${webFileStub}.hipo ${webFileStub}.hipo |
| 129 | + #rm -f up_${stub}.hipo |
| 130 | + #../../coatjava/bin/hipo-utils -update -d ../../coatjava/etc/bankdefs/hipo4/ -o up_${stub}.hipo ${stub}.hipo |
131 | 131 |
|
132 | 132 | # run reconstruction: |
133 | | - rm -f out_${webFileStub}.hipo |
| 133 | + rm -f out_${stub}.hipo |
134 | 134 | if [ $useClara -eq 0 ] |
135 | 135 | then |
136 | 136 | GEOMDBVAR=$geoDbVariation |
137 | 137 | export GEOMDBVAR |
138 | | - ../../coatjava/bin/recon-util -i ${webFileStub}.hipo -o out_${webFileStub}.hipo -c 2 |
| 138 | + ../../coatjava/bin/recon-util -i ${stub}.hipo -o out_${stub}.hipo -c 2 |
139 | 139 | else |
140 | 140 | echo "set inputDir $PWD/" > cook.clara |
141 | 141 | echo "set outputDir $PWD/" >> cook.clara |
142 | 142 | echo "set threads 7" >> cook.clara |
143 | 143 | echo "set javaMemory 2" >> cook.clara |
144 | 144 | echo "set session s_cook" >> cook.clara |
145 | 145 | echo "set description d_cook" >> cook.clara |
146 | | - ls ${webFileStub}.hipo > files.list |
| 146 | + ls ${stub}.hipo > files.list |
147 | 147 | echo "set fileList $PWD/files.list" >> cook.clara |
148 | 148 | echo "run local" >> cook.clara |
149 | 149 | echo "exit" >> cook.clara |
|
152 | 152 | fi |
153 | 153 |
|
154 | 154 | # run Event Builder tests: |
155 | | -java -DCLAS12DIR="$COAT" -Xmx1536m -Xms1024m -cp $classPath2 -DINPUTFILE=out_${webFileStub}.hipo org.junit.runner.JUnitCore eb.EBTwoTrackTest |
| 155 | +java -DCLAS12DIR="$COAT" -Xmx1536m -Xms1024m -cp $classPath2 -DINPUTFILE=out_${stub}.hipo org.junit.runner.JUnitCore eb.EBTwoTrackTest |
156 | 156 | if [ $? != 0 ] ; then echo "EBTwoTrackTest unit test failure" ; exit 1 ; else echo "EBTwoTrackTest passed unit tests" ; fi |
157 | 157 |
|
158 | 158 | exit 0 |
|
0 commit comments