Skip to content

Commit

Permalink
To make it possible to run without the nodownload
Browse files Browse the repository at this point in the history
  • Loading branch information
chiarazampolli committed Jun 26, 2024
1 parent 483bc65 commit a8a11dd
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 15 deletions.
2 changes: 1 addition & 1 deletion DATA/production/common/getStat.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ nCTFsFilesFailed=`grep "FileFetcher: non-zero exit code [0-9]*" $1 | wc -l`
nCTFsProcessed=`grep "Read CTF" $1 | tail -1 | sed 's/^.*Read CTF \([0-9]*\).*$/\1/'`
nCTFsProcessed=$((nCTFsProcessed + 1))

if [[ $nCTFsFilesInspected != $((nCTFsFilesFailed + nCTFsFilesOK)) ]]; then
if [[ $nCTFsFilesInspected > 0 && $nCTFsFilesInspected != $((nCTFsFilesFailed + nCTFsFilesOK)) ]]; then

Check failure on line 15 in DATA/production/common/getStat.sh

View workflow job for this annotation

GitHub Actions / Shellcheck

> is for string comparisons. Use -gt instead.
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)"
exit 8
fi
Expand Down
33 changes: 19 additions & 14 deletions DATA/production/configurations/asyncReco/async_pass.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,28 @@ timeStartFullProcessing=`date +%s`
export inputarg="${1}"

if [[ "${1##*.}" == "root" ]]; then
#echo ${1##*.}
#echo "alien://${1}" > list.list
#export MODE="remote"
echo "${1}" > list.list
if [[ ! -z $ASYNC_BENCHMARK_ITERATIONS ]]; then
for i in `seq 1 $ASYNC_BENCHMARK_ITERATIONS`; do echo "${1}" >> list.list; done
fi
export MODE="LOCAL"
shift
#echo ${1##*.}
#echo "alien://${1}" > list.list
#export MODE="remote"
echo "${1}" > list.list
if [[ ! -z $ASYNC_BENCHMARK_ITERATIONS ]]; then
for i in `seq 1 $ASYNC_BENCHMARK_ITERATIONS`; do echo "${1}" >> list.list; done
fi
export MODE="LOCAL"
shift
elif [[ "${1##*.}" == "xml" ]]; then
if [[ $ALIEN_JDL_DOWNLOADINPUTFILES == "1" ]]; then
echo "Downloading input files done by the job agent"
sed -rn 's/.*file\ name="(o2_ctf[^"]*)".*/\1/p' $1 > list.list
else
sed -rn 's/.*turl="([^"]*)".*/\1/p' $1 > list.list
export MODE="remote"
shift
fi
export MODE="remote"
shift
elif [[ $1 != "list.list" && "${1##*.}" == "list" ]]; then
cp $1 list.list
export MODE="remote"
shift
cp $1 list.list
export MODE="remote"
shift
fi

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

0 comments on commit a8a11dd

Please sign in to comment.