From 05d8f755ce48ea5e1541507b4e3ff849fad4b528 Mon Sep 17 00:00:00 2001
From: John Derek Chapman <chapman@hep.phy.cam.ac.uk>
Date: Wed, 12 May 2021 11:48:39 +0000
Subject: [PATCH] Merge branch 'swp43415' into '21.3'

Manual sweep of !43415 (Use new Run3 simulation tag in ART tests)

See merge request atlas/athena!43416

(cherry picked from commit 5c4662393654322a9c1caf0a0d438a7af66d13db)

2840612a manual sweep of !43415
b9366be7 add back R3S
---
 .../MuonRecRTT/test/test_Run3_asymmetric_fullChain.sh         | 4 +---
 .../MuonRecRTT/test/test_Run3_symmetric_fullChain.sh          | 3 ++-
 .../MuonRecRTT/test/test_Run4_muon_fullChain.sh               | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run3_asymmetric_fullChain.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run3_asymmetric_fullChain.sh
index 1d528a5e4cb6..a4993a576a79 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run3_asymmetric_fullChain.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run3_asymmetric_fullChain.sh
@@ -19,8 +19,7 @@
 # run simulation on 25 events using the asymmetric Run3 layout
 LOG_SIM="log_Run3_asymmetric_sim.log"
 Sim_tf.py --inputEVNTFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayMonitoringRTT/mc16_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.merge.EVNT.e3601_e5984/EVNT.12228944._002158.pool.root.1 \
-          --geometryVersion 'default:ATLAS-R3-2021-01-00-02_VALIDATION' \
-          --AMI=s3512 \
+          --AMI=s3680 \
           --maxEvents 25 \
           --imf False \
           --outputHITSFile OUT_HITS.root &> ${LOG_SIM}
@@ -85,7 +84,6 @@ Reco_tf.py --inputRDOFile OUT_RDO.root \
            --autoConfiguration everything \
            --imf False \
            --postInclude MuonPRDTest/NSWPRDValAlg.reco.py \
-           --postExec 'conddb.addOverride("/MDT/RTBLOB","MDTRT_Sim-R3ASYM-01");conddb.addOverride("/MDT/T0BLOB","MDTT0_Sim-R3ASYM-01")' \
            --outputESDFile OUT_ESD.root &> ${LOG_RECO}
 exit_code=$?
 echo  "art-result: ${exit_code} Reco_tf.py"
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run3_symmetric_fullChain.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run3_symmetric_fullChain.sh
index eb488f1791dc..18843c64ad13 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run3_symmetric_fullChain.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run3_symmetric_fullChain.sh
@@ -20,7 +20,7 @@
 LOG_SIM="log_Run3_symmetric_sim.log"
 Sim_tf.py --inputEVNTFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayMonitoringRTT/mc16_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.merge.EVNT.e3601_e5984/EVNT.12228944._002158.pool.root.1 \
           --geometryVersion 'default:ATLAS-R3S-2021-01-00-02_VALIDATION' \
-          --AMI=s3512 \
+          --AMI=s3680 \
           --maxEvents 25 \
           --imf False \
           --outputHITSFile OUT_HITS.root &> ${LOG_SIM}
@@ -80,6 +80,7 @@ fi
 # now use the produced RDO file and run reconstruction
 # the postInclude adds a validation algorithm which writes out an ntuple for digit/RDO/PRD validation
 # (without the postInclude, a standard reconstruction job would run)
+# the postExec is needed to specify the correct (symmetric) MDT calibration setup matching the layout (ATLAS-R3S-2021-01-00-02)
 LOG_RECO="log_Run3_symmetric_reco.log"
 Reco_tf.py --inputRDOFile OUT_RDO.root \
            --autoConfiguration everything \
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run4_muon_fullChain.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run4_muon_fullChain.sh
index 81010e5f068a..c97f431197ae 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run4_muon_fullChain.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run4_muon_fullChain.sh
@@ -17,11 +17,11 @@
 # art-output: muonPerformance_xAOD.txt
 
 #####################################################################
-# run simulation on 50 Zmumu events using the Run4 muon layout on top of the latest Run3 ATLAS layout
+# run simulation on 50 Zmumu events using the Run4 muon layout on top of the latest Run3 setup (s3680) with the symmetric layout ATLAS-R3S-2021-01-00-02
 # the postExec overrides the muon geometry to use the Run4 muon layout
 Sim_tf.py --inputEVNTFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayMonitoringRTT/mc16_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.merge.EVNT.e3601_e5984/EVNT.12228944._002158.pool.root.1 \
+          --AMI=s3680 \
           --geometryVersion 'default:ATLAS-R3S-2021-01-00-02_VALIDATION' \
-          --AMI=s3512 \
           --maxEvents 50 \
           --imf False \
           --postExec 'from GeoModelSvc.GeoModelSvcConf import GeoModelSvc;GeoModelSvc = GeoModelSvc();GeoModelSvc.MuonVersionOverride="MuonSpectrometer-R.10.01"' \
-- 
GitLab