diff --git a/DataProc/PPass/runPPass.sh b/DataProc/PPass/runPPass.sh index 8d2e2086..99492eef 100755 --- a/DataProc/PPass/runPPass.sh +++ b/DataProc/PPass/runPPass.sh @@ -150,12 +150,7 @@ else fi fi -if [ -f tag.C ]; then - echo "Use tag.C macro passed as input" -else - echo "Use tag.C macro from AliDPG" - cp $ALIDPG_ROOT/DataProc/PPass/tag.C . -fi +# ESD tag creation removed on September 2017 after CB and PB discussions if [ -f QAtrain_duo.C ]; then echo "Use QAtrain_duo.C macro passed as input" @@ -260,29 +255,6 @@ if [ "$pass_type" == "ppass" ] && [ -n "$preclusterizeTPC" ] && [ -f TPC.RecPoin fi -echo "* Running AliRoot to generate Tags..." -echo "" -echo "running the following tag.C macro:" -cat tag.C -echo "" -echo "" >&2 -echo "tag.C" >&2 -echo executing aliroot -l -b -q -x tag.C\(\) -timeStart=`date +%s` -time aliroot -l -b -q -x tag.C\(\) &> tag.log - -exitcode=$? -timeEnd=`date +%s` -timeUsed=$(( $timeUsed+$timeEnd-$timeStart )) -delta=$(( $timeEnd-$timeStart )) -echo "tag: delta = $delta, timeUsed so far = $timeUsed" -echo "tag: delta = $delta, timeUsed so far = $timeUsed" >&2 -echo "Exit code: $exitcode" - -if [ $exitcode -ne 0 ]; then - echo "tag.C exited with code $exitcode" > validation_error.message - exit 50 -fi for file in *.stat; do mv $file $file.rec diff --git a/MC/dpgsim.sh b/MC/dpgsim.sh index 773eb0e0..8fa67360 100755 --- a/MC/dpgsim.sh +++ b/MC/dpgsim.sh @@ -690,11 +690,9 @@ if [[ $CONFIG_MODE == *"rec"* ]] || [[ $CONFIG_MODE == *"full"* ]]; then exit 2 fi - TAGC=$ALIDPG_ROOT/MC/tag.C - if [ -f tag.C ]; then - TAGC=tag.C - fi - runcommand "TAG" $TAGC tag.log 50 + +# ESD tag creation removed on September 2017 after CB and PB discussions + CHECKESDC=$ALIDPG_ROOT/MC/CheckESD.C if [ -f CheckESD.C ]; then