From f3492268df156e2d8e9f2436da6dc2d33c541174 Mon Sep 17 00:00:00 2001
From: Tadej Novak <tadej.novak@cern.ch>
Date: Wed, 27 Oct 2021 21:52:14 +0200
Subject: [PATCH] Update MC20 overlay ART tests

---
 .../OverlayTests/test/test_MCOverlay_MC20a_ttbar.sh    |  4 ++--
 .../test/test_MCOverlay_MC20a_ttbar_fullchain.sh       | 10 +++++-----
 .../OverlayTests/test/test_MCOverlay_MC20d_ttbar.sh    |  4 ++--
 .../test/test_MCOverlay_MC20d_ttbar_fullchain.sh       | 10 +++++-----
 .../OverlayTests/test/test_MCOverlay_MC20e_ttbar.sh    |  4 ++--
 .../test/test_MCOverlay_MC20e_ttbar_fullchain.sh       | 10 +++++-----
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20a_ttbar.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20a_ttbar.sh
index 5baa8f6753f2..f5094cdd2f95 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20a_ttbar.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20a_ttbar.sh
@@ -11,8 +11,8 @@
 # art-output: runargs.*
 
 events=20
-HITS_File="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1"
-RDO_BKG_File="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayTests/PresampledPileUp/22.0/Run2/v1/mc20a_presampling.RDO.pool.root"
+HITS_File="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.simul.HITS.e6337_s3681/HITS.25836812._004813.pool.root.1"
+RDO_BKG_File="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayTests/PresampledPileUp/22.0/Run2/large/mc20_13TeV.900149.PG_single_nu_Pt50.digit.RDO.e8307_s3482_s3136_d1713/RDO.26811885._035498.pool.root.1"
 
 Overlay_tf.py \
 --inputHITSFile ${HITS_File} \
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20a_ttbar_fullchain.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20a_ttbar_fullchain.sh
index f7e7421fd822..845c919e285c 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20a_ttbar_fullchain.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20a_ttbar_fullchain.sh
@@ -10,21 +10,21 @@
 # art-output: runargs.*
 
 events=3
-HITS_File="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1"
-RDO_BKG_File="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayTests/PresampledPileUp/22.0/Run2/v1/mc20a_presampling.RDO.pool.root"
+HITS_File="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.simul.HITS.e6337_s3681/HITS.25836812._004813.pool.root.1"
+RDO_BKG_File="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayTests/PresampledPileUp/22.0/Run2/large/mc20_13TeV.900149.PG_single_nu_Pt50.digit.RDO.e8307_s3482_s3136_d1713/RDO.26811885._035498.pool.root.1"
 
 Reco_tf.py \
 --autoConfiguration everything \
 --inputHITSFile ${HITS_File} \
 --inputRDO_BKGFile ${RDO_BKG_File} \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02a \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
 --maxEvents ${events} --skipEvents 10 --digiSeedOffset1 511 --digiSeedOffset2 727 \
 --preInclude "all:Campaigns/MC20a.py" \
 --postInclude "default:PyJobTransforms/UseFrontier.py" \
---runNumber 410000 \
+--runNumber 410470 \
 --steering "doOverlay" "doRDO_TRIG" \
---triggerConfig "RDOtoRDOTrigger=MCRECO:DBF:TRIGGERDBMC:2283,35,326" --asetup "RDOtoRDOTrigger:Athena,21.0-mc16a,latest" \
+--triggerConfig "RDOtoRDOTrigger=MCRECO:DBF:TRIGGERDBMC:2283,35,327" --asetup "RDOtoRDOTrigger:Athena,21.0.20.12" \
 --outputRDOFile MC_plus_MC.RDO.pool.root \
 --outputAODFile MC_plus_MC.AOD.pool.root \
 --imf False
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20d_ttbar.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20d_ttbar.sh
index a854d6d2d425..23ccd9e8bf4e 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20d_ttbar.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20d_ttbar.sh
@@ -11,8 +11,8 @@
 # art-output: runargs.*
 
 events=20
-HITS_File="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1"
-RDO_BKG_File="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayTests/PresampledPileUp/22.0/Run2/v1/mc20d_presampling.RDO.pool.root"
+HITS_File="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.simul.HITS.e6337_s3681/HITS.25836812._004813.pool.root.1"
+RDO_BKG_File="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayTests/PresampledPileUp/22.0/Run2/large/mc20_13TeV.900149.PG_single_nu_Pt50.digit.RDO.e8307_s3482_s3136_d1714/RDO.26811902._032542.pool.root.1"
 
 Overlay_tf.py \
 --inputHITSFile ${HITS_File} \
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20d_ttbar_fullchain.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20d_ttbar_fullchain.sh
index 9ed446b02944..bc564dd169c5 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20d_ttbar_fullchain.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20d_ttbar_fullchain.sh
@@ -10,21 +10,21 @@
 # art-output: runargs.*
 
 events=3
-HITS_File="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1"
-RDO_BKG_File="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayTests/PresampledPileUp/22.0/Run2/v1/mc20d_presampling.RDO.pool.root"
+HITS_File="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.simul.HITS.e6337_s3681/HITS.25836812._004813.pool.root.1"
+RDO_BKG_File="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayTests/PresampledPileUp/22.0/Run2/large/mc20_13TeV.900149.PG_single_nu_Pt50.digit.RDO.e8307_s3482_s3136_d1714/RDO.26811902._032542.pool.root.1"
 
 Reco_tf.py \
 --autoConfiguration everything \
 --inputHITSFile ${HITS_File} \
 --inputRDO_BKGFile ${RDO_BKG_File} \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02 \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
 --maxEvents ${events} --skipEvents 10 --digiSeedOffset1 511 --digiSeedOffset2 727 \
 --preInclude "all:Campaigns/MC20d.py" \
 --postInclude "default:PyJobTransforms/UseFrontier.py" \
---runNumber 410000 \
+--runNumber 410470 \
 --steering "doOverlay" "doRDO_TRIG" \
---triggerConfig "RDOtoRDOTrigger=MCRECO:DBF:TRIGGERDBMC:2282,107,325" --asetup "RDOtoRDOTrigger:Athena,21.0-mc16d,latest" \
+--triggerConfig "RDOtoRDOTrigger=MCRECO:DBF:TRIGGERDBMC:2282,107,325" --asetup "RDOtoRDOTrigger:Athena,21.0.54.8" \
 --outputRDOFile MC_plus_MC.RDO.pool.root \
 --outputAODFile MC_plus_MC.AOD.pool.root \
 --imf False
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20e_ttbar.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20e_ttbar.sh
index 6cdae25eada6..4ee971f565e2 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20e_ttbar.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20e_ttbar.sh
@@ -11,8 +11,8 @@
 # art-output: runargs.*
 
 events=20
-HITS_File="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1"
-RDO_BKG_File="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayTests/PresampledPileUp/22.0/Run2/v1/mc20e_presampling.RDO.pool.root"
+HITS_File="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.simul.HITS.e6337_s3681/HITS.25836812._004813.pool.root.1"
+RDO_BKG_File="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayTests/PresampledPileUp/22.0/Run2/large/mc20_13TeV.900149.PG_single_nu_Pt50.digit.RDO.e8307_s3482_s3136_d1715/RDO.26811908._031801.pool.root.1"
 
 Overlay_tf.py \
 --inputHITSFile ${HITS_File} \
diff --git a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20e_ttbar_fullchain.sh b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20e_ttbar_fullchain.sh
index a851378e90f4..297f224964e0 100755
--- a/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20e_ttbar_fullchain.sh
+++ b/Simulation/Tests/OverlayTests/test/test_MCOverlay_MC20e_ttbar_fullchain.sh
@@ -10,21 +10,21 @@
 # art-output: runargs.*
 
 events=3
-HITS_File="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1"
-RDO_BKG_File="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayTests/PresampledPileUp/22.0/Run2/v1/mc20e_presampling.RDO.pool.root"
+HITS_File="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.simul.HITS.e6337_s3681/HITS.25836812._004813.pool.root.1"
+RDO_BKG_File="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayTests/PresampledPileUp/22.0/Run2/large/mc20_13TeV.900149.PG_single_nu_Pt50.digit.RDO.e8307_s3482_s3136_d1715/RDO.26811908._031801.pool.root.1"
 
 Reco_tf.py \
 --autoConfiguration everything \
 --inputHITSFile ${HITS_File} \
 --inputRDO_BKGFile ${RDO_BKG_File} \
---conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 \
+--conditionsTag default:OFLCOND-MC16-SDR-RUN2-09 RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02 \
 --geometryVersion default:ATLAS-R2-2016-01-00-01 \
 --maxEvents ${events} --skipEvents 10 --digiSeedOffset1 511 --digiSeedOffset2 727 \
 --preInclude "all:Campaigns/MC20e.py" \
 --postInclude "default:PyJobTransforms/UseFrontier.py" \
---runNumber 410000 \
+--runNumber 410470 \
 --steering "doOverlay" "doRDO_TRIG" \
---triggerConfig "RDOtoRDOTrigger=MCRECO:DBF:TRIGGERDBMC:2233,87,314" --asetup "RDOtoRDOTrigger:Athena,21.0,latest" \
+--triggerConfig "RDOtoRDOTrigger=MCRECO:DBF:TRIGGERDBMC:2233,87,314" --asetup "RDOtoRDOTrigger:Athena,21.0.131" \
 --outputRDOFile MC_plus_MC.RDO.pool.root \
 --outputAODFile MC_plus_MC.AOD.pool.root \
 --imf False
-- 
GitLab