Skip to content

Commit d04d5c3

Browse files
To make it possible to run without the nodownload (#1678)
1 parent b737c27 commit d04d5c3

File tree

2 files changed

+20
-15
lines changed

2 files changed

+20
-15
lines changed

DATA/production/common/getStat.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ nCTFsFilesFailed=`grep "FileFetcher: non-zero exit code [0-9]*" $1 | wc -l`
1212
nCTFsProcessed=`grep "Read CTF" $1 | tail -1 | sed 's/^.*Read CTF \([0-9]*\).*$/\1/'`
1313
nCTFsProcessed=$((nCTFsProcessed + 1))
1414

15-
if [[ $nCTFsFilesInspected != $((nCTFsFilesFailed + nCTFsFilesOK)) ]]; then
15+
if [[ $nCTFsFilesInspected -gt 0 && $nCTFsFilesInspected != $((nCTFsFilesFailed + nCTFsFilesOK)) ]]; then
1616
echo "Something went wrong with parsing the log file: CTF files inspected ($nCTFsFilesInspected) is not the sum of those successfully processed ($nCTFsFilesOK) and those that failed ($nCTFsFilesFailed)"
1717
exit 8
1818
fi

DATA/production/configurations/asyncReco/async_pass.sh

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,28 @@ timeStartFullProcessing=`date +%s`
2323
export inputarg="${1}"
2424

2525
if [[ "${1##*.}" == "root" ]]; then
26-
#echo ${1##*.}
27-
#echo "alien://${1}" > list.list
28-
#export MODE="remote"
29-
echo "${1}" > list.list
30-
if [[ ! -z $ASYNC_BENCHMARK_ITERATIONS ]]; then
31-
for i in `seq 1 $ASYNC_BENCHMARK_ITERATIONS`; do echo "${1}" >> list.list; done
32-
fi
33-
export MODE="LOCAL"
34-
shift
26+
#echo ${1##*.}
27+
#echo "alien://${1}" > list.list
28+
#export MODE="remote"
29+
echo "${1}" > list.list
30+
if [[ ! -z $ASYNC_BENCHMARK_ITERATIONS ]]; then
31+
for i in `seq 1 $ASYNC_BENCHMARK_ITERATIONS`; do echo "${1}" >> list.list; done
32+
fi
33+
export MODE="LOCAL"
34+
shift
3535
elif [[ "${1##*.}" == "xml" ]]; then
36+
if [[ $ALIEN_JDL_DOWNLOADINPUTFILES == "1" ]]; then
37+
echo "Downloading input files done by the job agent"
38+
sed -rn 's/.*file\ name="(o2_ctf[^"]*)".*/\1/p' $1 > list.list
39+
else
3640
sed -rn 's/.*turl="([^"]*)".*/\1/p' $1 > list.list
37-
export MODE="remote"
38-
shift
41+
fi
42+
export MODE="remote"
43+
shift
3944
elif [[ $1 != "list.list" && "${1##*.}" == "list" ]]; then
40-
cp $1 list.list
41-
export MODE="remote"
42-
shift
45+
cp $1 list.list
46+
export MODE="remote"
47+
shift
4348
fi
4449

4550
# Could need sometimes to iterate just a subset of the input files

0 commit comments

Comments
 (0)