From 804d282563df6477f5bbda674a0edb6a87608bc1 Mon Sep 17 00:00:00 2001
From: Mark Hodgkinson <mhodgkin@aiatlas025.cern.ch>
Date: Thu, 3 Dec 2020 12:48:24 +0100
Subject: [PATCH 1/3] Update usage of xAODDigest such that the resulting log
file has headers showing what the printed data refer to.
---
.../test/test_recexreco_art_q431_compareFiveThreads.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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 5e1167874eee..c2b4b9947253 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,9 @@ 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
+ diff digestTwo.log ../runOne/digestOne.log | tee temp.log
+ grep nTopo digestTwo.log | sed 's/^/ /g' >& grep.log
+ cat grep.log temp.log >& digestDiffOneTwo.log
echo "art-result: $rcDiff Diff-Serial-OneThread"
fi
--
GitLab
From a1c274688013f3109c0d962bb193376de45afa6a Mon Sep 17 00:00:00 2001
From: Mark Hodgkinson <mhodgkin@aiatlas025.cern.ch>
Date: Thu, 3 Dec 2020 17:27:40 +0100
Subject: [PATCH 2/3] Update test to use new collateDigest script.
---
Reconstruction/RecExample/RecExRecoTest/test/collateDigest.sh | 4 ++++
.../test/test_recexreco_art_q431_compareFiveThreads.sh | 4 +---
2 files changed, 5 insertions(+), 3 deletions(-)
create mode 100755 Reconstruction/RecExample/RecExRecoTest/test/collateDigest.sh
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/collateDigest.sh b/Reconstruction/RecExample/RecExRecoTest/test/collateDigest.sh
new file mode 100755
index 000000000000..3a29e3086ffb
--- /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_recexreco_art_q431_compareFiveThreads.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareFiveThreads.sh
index c2b4b9947253..80fa528b6f30 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareFiveThreads.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareFiveThreads.sh
@@ -28,9 +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 temp.log
- grep nTopo digestTwo.log | sed 's/^/ /g' >& grep.log
- cat grep.log temp.log >& digestDiffOneTwo.log
+ collateDigest.sh digestTwo.log ../runOne/digestOne.log digestDiffOneTwo.log
echo "art-result: $rcDiff Diff-Serial-OneThread"
fi
--
GitLab
From 3fb8d8de6f65b3eb8e545b539f0a5012babdde8c Mon Sep 17 00:00:00 2001
From: Mark Hodgkinson <mhodgkin@aiatlas025.cern.ch>
Date: Mon, 7 Dec 2020 14:46:21 +0100
Subject: [PATCH 3/3] Add xAODFigest diagnostics to additional tests.
---
.../test/test_compare_SerialAndThreadedAthenas.sh | 7 +++++++
...est_recexreco_art_q431_compareSerialFiveThreads_Long.sh | 3 +++
.../test/test_reco_tf_compare_SerialAndThreadedAthenas.sh | 7 +++++++
3 files changed, 17 insertions(+)
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_compare_SerialAndThreadedAthenas.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_compare_SerialAndThreadedAthenas.sh
index 96785387e715..a0e2e369f75b 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_compareSerialFiveThreads_Long.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_q431_compareSerialFiveThreads_Long.sh
index 590081d013f7..a84759a748cb 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 ef4e085d4c1e..0cda81d3a2d2 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
--
GitLab