From 34d539faa9f0944986b1ca9b7229c6326a0425ef Mon Sep 17 00:00:00 2001
From: Mark Hodgkinson <mhodgkin@aiatlas025.cern.ch>
Date: Wed, 16 Dec 2020 14:30:12 +0100
Subject: [PATCH 1/2] Update mcLatest tests to use recommended settings in
RDOtoRDOTrigger. Remove large radius tracking (LRT) test because LRT is now
on by default.
---
.../test/test_mcLatest_13TeV.sh | 2 +-
.../test_mcLatest_13TeV_largeRadiusTrackingOn.sh | 15 ---------------
.../test/test_mcLatest_nopileup_13TeV.sh | 2 +-
.../test_mcLatest_nopileup_stdcmalloc_13TeV.sh | 2 +-
4 files changed, 3 insertions(+), 18 deletions(-)
delete mode 100755 Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV_largeRadiusTrackingOn.sh
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV.sh
index c8c0af161901..ce865d3746f5 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV.sh
@@ -7,7 +7,7 @@
# art-include: master/Athena
export TRF_ECHO=True;
-Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --inputHighPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/HITS.10501933._000008.pool.root.1 --inputLowPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/HITS.10501925._000027.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False
+Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --inputHighPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/HITS.10501933._000008.pool.root.1 --inputLowPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/HITS.10501925._000027.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False --athenaopts "RDOtoRDOTrigger:--imf --threads=1 --concurrent-events=1"
RES=$?
echo "art-result: $RES Reco"
if [ $RES -ne 0 ];then
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV_largeRadiusTrackingOn.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV_largeRadiusTrackingOn.sh
deleted file mode 100755
index b6302ccef134..000000000000
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_13TeV_largeRadiusTrackingOn.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# art-description: Run reco with a latest (September 2020) MC setup with pileup. This test also enables Large Radius Tracking.
-# art-output: log.*
-# art-athena-mt: 4
-# art-type: grid
-# art-include: master/Athena
-
-export TRF_ECHO=True;
-Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --inputHighPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/HITS.10501933._000008.pool.root.1 --inputLowPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/HITS.10501925._000027.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False --preExec r2e:'from InDetRecExample.InDetJobProperties import InDetFlags; InDetFlags.doR3LargeD0.set_Value_and_Lock(True);InDetFlags.storeSeparateLargeD0Container.set_Value_and_Lock(True);'
-RES=$?
-echo "art-result: $RES Reco"
-if [ $RES -ne 0 ];then
-return $RES
-fi
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_13TeV.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_13TeV.sh
index acaae2dd55c7..cda40e1f6ec7 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_13TeV.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_13TeV.sh
@@ -6,7 +6,7 @@
# art-include: master/Athena
export TRF_ECHO=True;
-Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False
+Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False --athenaopts "RDOtoRDOTrigger:--imf --threads=1 --concurrent-events=1"
RES=$?
echo "art-result: $RES Reco"
if [ $RES -ne 0 ];then
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_stdcmalloc_13TeV.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_stdcmalloc_13TeV.sh
index 8f58826b79aa..185774a7f8c0 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_stdcmalloc_13TeV.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mcLatest_nopileup_stdcmalloc_13TeV.sh
@@ -7,7 +7,7 @@
# art-include: master/Athena
export TRF_ECHO=True;
-Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False --athenaopts="--stdcmalloc"
+Reco_tf.py --AMI=r11976 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc16_13TeV/valid1/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3227/HITS.12560240._000287.pool.root.1 --maxEvents=500 --jobNumber=1 --imf False --athenaopts "all:--stdcmalloc" "RDOtoRDOTrigger:--imf --threads=1 --concurrent-events=1"
RES=$?
echo "art-result: $RES Reco"
if [ $RES -ne 0 ];then
--
GitLab
From 89c2fd1008b8926a0721ac5f49a6223c7f6049b2 Mon Sep 17 00:00:00 2001
From: Mark Hodgkinson <mhodgkin@aiatlas025.cern.ch>
Date: Wed, 16 Dec 2020 14:31:35 +0100
Subject: [PATCH 2/2] Bug fix to AOD file name in comparison script. When
running from ESD the AOD is called AOD.pool.root and not myAOD.pool.root.
---
.../test/test_compare_SerialAndThreadedAthenas.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_compare_SerialAndThreadedAthenas.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_compare_SerialAndThreadedAthenas.sh
index a0e2e369f75b..6ceca97222e0 100755
--- a/Reconstruction/RecExample/RecExRecoTest/test/test_compare_SerialAndThreadedAthenas.sh
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_compare_SerialAndThreadedAthenas.sh
@@ -4,7 +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
+xAODDigest.py AOD.pool.root | tee digestSerial.log
echo "art-result: $rc Serial"
test_postProcessing_Errors.sh athenaSerial.log | tee errorsSerial.log
@@ -15,7 +15,7 @@ mkdir threadOne; cd threadOne
athena --threads=1 $1 | tee athenaOneThread.log
rc1=${PIPESTATUS[0]}
-xAODDigest.py myAOD.pool.root | tee digestOneThread.log
+xAODDigest.py AOD.pool.root | tee digestOneThread.log
echo "art-result: $rc1 OneThread"
test_postProcessing_Errors.sh athenaOneThread.log | tee errorsOneThread.log
@@ -39,7 +39,7 @@ mkdir threadTwo; cd threadTwo
athena --threads=2 $1 | tee athenaTwoThreads.log
rc2=${PIPESTATUS[0]}
-xAODDigest.py myAOD.pool.root | tee digestTwoThreads.log
+xAODDigest.py AOD.pool.root | tee digestTwoThreads.log
echo "art-result: $rc2 TwoThreads"
test_postProcessing_Errors.sh athenaTwoThreads.log | tee errorsTwoThreads.log
@@ -59,7 +59,7 @@ mkdir threadFive; cd threadFive
athena --threads=5 $1 | tee athenaFiveThreads.log
rc5=${PIPESTATUS[0]}
-xAODDigest.py myAOD.pool.root | tee digestFiveThreads.log
+xAODDigest.py AOD.pool.root | tee digestFiveThreads.log
echo "art-result: $rc5 FiveThreads"
test_postProcessing_Errors.sh athenaFiveThreads.log | tee errorsFiveThreads.log
--
GitLab