diff --git a/Reconstruction/RecExample/RecExRecoTest/test/collateDigest.sh b/Reconstruction/RecExample/RecExRecoTest/test/collateDigest.sh new file mode 100755 index 0000000000000000000000000000000000000000..3a29e3086ffb4418d5d2776f85473055ec3eb58e --- /dev/null +++ b/Reconstruction/RecExample/RecExRecoTest/test/collateDigest.sh @@ -0,0 +1,4 @@ +#!/bin/bash +diff $1 $2 | tee temp.log +grep nTopo $1 | sed 's/^/ /g' >& grep.log +cat grep.log temp.log >& $3 diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_compare_SerialAndThreadedAthenas.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_compare_SerialAndThreadedAthenas.sh index 96785387e715c0d1b066f4f41595ee20c3d9a1d5..a0e2e369f75bf49365dc9f6bb50919954929ea01 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_compare_SerialAndThreadedAthenas.sh +++ b/Reconstruction/RecExample/RecExRecoTest/test/test_compare_SerialAndThreadedAthenas.sh @@ -4,6 +4,7 @@ echo "Creating new serial directory" mkdir serial; cd serial athena $1 | tee athenaSerial.log rc=${PIPESTATUS[0]} +xAODDigest.py myAOD.pool.root | tee digestSerial.log echo "art-result: $rc Serial" test_postProcessing_Errors.sh athenaSerial.log | tee errorsSerial.log @@ -14,6 +15,7 @@ mkdir threadOne; cd threadOne athena --threads=1 $1 | tee athenaOneThread.log rc1=${PIPESTATUS[0]} +xAODDigest.py myAOD.pool.root | tee digestOneThread.log echo "art-result: $rc1 OneThread" test_postProcessing_Errors.sh athenaOneThread.log | tee errorsOneThread.log @@ -27,6 +29,7 @@ then echo "Compare two directories" art.py compare ref --entries 10 --mode=semi-detailed --order-trees --diff-root . ../serial/ | tee diffSerialOneThread.log rcDiff1=${PIPESTATUS[0]} + collateDigest.sh digestOneThread.log ../serial/digestSerial.log digestDiffSerialOneThread.log echo "art-result: $rcDiff1 Diff-Serial-OneThread" fi @@ -36,6 +39,7 @@ mkdir threadTwo; cd threadTwo athena --threads=2 $1 | tee athenaTwoThreads.log rc2=${PIPESTATUS[0]} +xAODDigest.py myAOD.pool.root | tee digestTwoThreads.log echo "art-result: $rc2 TwoThreads" test_postProcessing_Errors.sh athenaTwoThreads.log | tee errorsTwoThreads.log @@ -45,6 +49,7 @@ then echo "Compare two directories" art.py compare ref --entries 10 --mode=semi-detailed --order-trees --diff-root . ../threadOne | tee diffTwoThreadsOneThread.log rcDiff2=${PIPESTATUS[0]} + collateDigest.sh digestTwoThreads.log ../threadOne/digestOneThread.log digestDiffTwoThreadsOneThread.log echo "art-result: $rcDiff2 Diff-OneThread-TwoThreads" fi @@ -54,6 +59,7 @@ mkdir threadFive; cd threadFive athena --threads=5 $1 | tee athenaFiveThreads.log rc5=${PIPESTATUS[0]} +xAODDigest.py myAOD.pool.root | tee digestFiveThreads.log echo "art-result: $rc5 FiveThreads" test_postProcessing_Errors.sh athenaFiveThreads.log | tee errorsFiveThreads.log @@ -63,5 +69,6 @@ then echo "Compare two directories" art.py compare ref --entries 10 --mode=semi-detailed --order-trees --diff-root . ../threadTwo | tee diffFiveThreadsTwoThreads.log rcDiff5=${PIPESTATUS[0]} + ollateDigest.sh digestFiveThreads.log ../threadTwo/digestTwoThreads.log digestDiffFiveThreadsTwoThread.log echo "art-result: $rcDiff5 Diff-TwoThreads-FiveThreads" fi diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareFiveThreads.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareFiveThreads.sh index 5e1167874eee24c3b8ef4579f7df1a490724f0b8..80fa528b6f307c668ddfef84c7df150dbc50dcb3 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareFiveThreads.sh +++ b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareFiveThreads.sh @@ -28,7 +28,7 @@ then echo "Compare two directories" art.py compare ref --entries 10 --mode=semi-detailed --order-trees --diff-root . ../runOne/ | tee diffFiveThreads.log rcDiff=${PIPESTATUS[0]} - diff digestTwo.log ../runOne/digestOne.log | tee digestDiffOneTwo.log + collateDigest.sh digestTwo.log ../runOne/digestOne.log digestDiffOneTwo.log echo "art-result: $rcDiff Diff-Serial-OneThread" fi diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareSerialFiveThreads_Long.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareSerialFiveThreads_Long.sh index 590081d013f70789622c293ad68945f8adc8c475..a84759a748cb9f69bf8fd77ea88668eab62a1e8b 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareSerialFiveThreads_Long.sh +++ b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareSerialFiveThreads_Long.sh @@ -14,12 +14,14 @@ preExecStringTwo="ESDtoAOD:from RecExConfig.RecFlags import rec;rec.doTrigger.se mkdir runOne; cd runOne Reco_tf.py --athenaopts="--threads=5" --maxEvents=1000 --steering "no" --AMI=q431 --preExec "${preExecStringOne}" "${preExecStringTwo}" --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenarunOne.log rc1=${PIPESTATUS[0]} +xAODDigest.py myAOD.pool.root | tee digestOne.log echo "art-result: $rc1 runOne" cd ../ mkdir runTwo; cd runTwo Reco_tf.py --athenaopts="--threads=5" --maxEvents=1000 --steering "no" --AMI=q431 --preExec "${preExecStringOne}" "${preExecStringTwo}" --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenarunTwo.log rc2=${PIPESTATUS[0]} +xAODDigest.py myAOD.pool.root | tee digestTwo.log echo "art-result: $rc2 runTwo" if [[ $rc1 -eq 0 ]] && [[ $rc2 -eq 0 ]] @@ -27,6 +29,7 @@ then echo "Compare two directories" art.py compare ref --entries 10 --mode=semi-detailed --order-trees --diff-root . ../runOne/ | tee diffFiveThreads.log rcDiff=${PIPESTATUS[0]} + collateDigest.sh digestTwo.log ../runOne/digestOne.log digestDiffOneTwo.log echo "art-result: $rcDiff Diff-Serial-OneThread" fi diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_reco_tf_compare_SerialAndThreadedAthenas.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_reco_tf_compare_SerialAndThreadedAthenas.sh index ef4e085d4c1e1395a1df3c3abfa9a5f507e0ebd5..0cda81d3a2d2a629bf6686cad7b09377a8685789 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_reco_tf_compare_SerialAndThreadedAthenas.sh +++ b/Reconstruction/RecExample/RecExRecoTest/test/test_reco_tf_compare_SerialAndThreadedAthenas.sh @@ -7,6 +7,7 @@ echo "Creating new serial directory" mkdir serial; cd serial Reco_tf.py --steering "no" --AMI=$1 --preExec "${preExecStringOne}" "${preExecStringTwo}" --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenaSerial.log rc=${PIPESTATUS[0]} +xAODDigest.py myAOD.pool.root | tee digestSerial.log echo "art-result: $rc Serial" test_postProcessing_Errors.sh athenaSerial.log | tee errorsSerial.log @@ -17,6 +18,7 @@ mkdir threadOne; cd threadOne Reco_tf.py --steering "no" --athenaopts="--threads=1" --AMI=$1 --preExec "${preExecStringOne}" "${preExecStringTwo}" --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenaOneThread.log rc1=${PIPESTATUS[0]} +xAODDigest.py myAOD.pool.root | tee digestOneThread.log echo "art-result: $rc1 OneThread" test_postProcessing_Errors.sh athenaOneThread.log | tee errorsOneThread.log @@ -30,6 +32,7 @@ then echo "Compare two directories" art.py compare ref --entries 10 --mode=semi-detailed --order-trees --diff-root . ../serial/ | tee diffSerialOneThread.log rcDiff1=${PIPESTATUS[0]} + collateDigest.sh digestOneThread.log ../serial/digestSerial.log digestDiffSerialOneThread.log echo "art-result: $rcDiff1 Diff-Serial-OneThread" fi @@ -39,6 +42,7 @@ mkdir threadTwo; cd threadTwo Reco_tf.py --steering "no" --athenaopts="--threads=2" --AMI=$1 --preExec "${preExecStringOne}" "${preExecStringTwo}" --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenaTwoThreads.log rc2=${PIPESTATUS[0]} +xAODDigest.py myAOD.pool.root | tee digestTwoThreads.log echo "art-result: $rc2 TwoThreads" test_postProcessing_Errors.sh athenaTwoThreads.log | tee errorsTwoThreads.log @@ -48,6 +52,7 @@ then echo "Compare two directories" art.py compare ref --entries 10 --mode=semi-detailed --order-trees --diff-root . ../threadOne | tee diffTwoThreadsOneThread.log rcDiff2=${PIPESTATUS[0]} + collateDigest.sh digestTwoThreads.log ../threadOne/digestOneThread.log digestDiffTwoThreadsOneThread.log echo "art-result: $rcDiff2 Diff-OneThread-TwoThreads" fi @@ -57,6 +62,7 @@ mkdir threadFive; cd threadFive Reco_tf.py --steering "no" --athenaopts="--threads=5" --AMI=$1 --preExec "${preExecStringOne}" "${preExecStringTwo}" --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root | tee athenaFiveThreads.log rc5=${PIPESTATUS[0]} +xAODDigest.py myAOD.pool.root | tee digestFiveThreads.log echo "art-result: $rc5 FiveThreads" test_postProcessing_Errors.sh athenaFiveThreads.log | tee errorsFiveThreads.log @@ -66,5 +72,6 @@ then echo "Compare two directories" art.py compare ref --entries 10 --mode=semi-detailed --order-trees --diff-root . ../threadTwo | tee diffFiveThreadsTwoThreads.log rcDiff5=${PIPESTATUS[0]} + collateDigest.sh digestFiveThreads.log ../threadTwo/digestTwoThreads.log digestDiffFiveThreadsTwoThread.log echo "art-result: $rcDiff5 Diff-TwoThreads-FiveThreads" fi