diff --git a/Simulation/Tests/ISF_Validation/test/test_ATLFAST3F_G4MS_ttbar_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_ATLFAST3F_G4MS_ttbar_2evts.sh
new file mode 100755
index 0000000000000000000000000000000000000000..5ce1891239cc0e0a6845c8a751dfbfcaeb7f8675
--- /dev/null
+++ b/Simulation/Tests/ISF_Validation/test/test_ATLFAST3F_G4MS_ttbar_2evts.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# art-description: MC23a-style RUN3 simulation using ATLFAST3F_G4MS in serial Athena
+# art-type: build
+# art-include: 24.0/Athena
+# art-include: main/Athena
+
+# RUN3 setup
+# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC23-SDR-RUN3-01
+export TRF_ECHO=1
+Sim_tf.py \
+ --CA \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
+ --simulator 'ATLFAST3F_G4MS' \
+ --postInclude 'PyJobTransforms.UseFrontier' \
+ --preInclude 'EVNTtoHITS:Campaigns.MC23aSimulationMultipleIoV' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
+ --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
+ --outputHITSFile "Hits.pool.root" \
+ --maxEvents 2 \
+ --jobNumber 1
+
+echo "art-result: $? simulation"
diff --git a/Simulation/Tests/ISF_Validation/test/test_ATLFAST3MT_QS_ttbar_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_ATLFAST3MT_QS_ttbar_2evts.sh
new file mode 100755
index 0000000000000000000000000000000000000000..918f11cb60993ccda02837c43e1b200b9f9dfad3
--- /dev/null
+++ b/Simulation/Tests/ISF_Validation/test/test_ATLFAST3MT_QS_ttbar_2evts.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# art-description: MC23-style RUN3 simulation using ATLFAST3MT_QS in serial Athena
+# art-type: build
+# art-include: 23.0/Athena
+# art-include: 24.0/Athena
+# art-include: main/Athena
+
+# RUN3 setup
+# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC23-SDR-RUN3-01
+export TRF_ECHO=1
+Sim_tf.py \
+ --CA \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
+ --simulator 'ATLFAST3MT_QS' \
+ --postInclude 'PyJobTransforms.UseFrontier' \
+ --preInclude 'EVNTtoHITS:Campaigns.MC23aSimulationMultipleIoV' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
+ --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
+ --outputHITSFile "Hits.pool.root" \
+ --maxEvents 2 \
+ --jobNumber 1
+
+echo "art-result: $? simulation"
diff --git a/Simulation/Tests/ISF_Validation/test/test_ATLFASTIIF_ttbar_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_ATLFASTIIF_ttbar_2evts.sh
deleted file mode 100755
index 818022597d4bece69ab6229b3f07f28753546e91..0000000000000000000000000000000000000000
--- a/Simulation/Tests/ISF_Validation/test/test_ATLFASTIIF_ttbar_2evts.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# art-description: MC15-style simulation using ATLFASTIIF
-# art-type: build
-# art-include: 21.0/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-# art-include: main/Athena
-
-# MC15 setup
-# ATLAS-R2-2015-03-01-00 and OFLCOND-RUN12-SDR-19
-export TRF_ECHO=1
-Sim_tf.py \
---conditionsTag 'default:OFLCOND-RUN12-SDR-19' \
---physicsList 'FTFP_BERT' \
---truthStrategy 'MC12' \
---simulator 'ATLFASTIIF' \
---postInclude 'default:PyJobTransforms/UseFrontier.py' \
---preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \
---DataRunNumber '222525' \
---geometryVersion 'default:ATLAS-R2-2015-03-01-00_VALIDATION' \
---inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1" \
---outputHITSFile "Hits.pool.root" \
---maxEvents 2
-
-echo "art-result: $? simulation"
diff --git a/Simulation/Tests/ISF_Validation/test/test_ATLFASTII_ttbar_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_ATLFASTII_ttbar_2evts.sh
deleted file mode 100755
index 691473b6b81bf1a62ee88a6781b9f58e20bde912..0000000000000000000000000000000000000000
--- a/Simulation/Tests/ISF_Validation/test/test_ATLFASTII_ttbar_2evts.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# art-description: MC15-style simulation using ATLFASTII
-# art-type: build
-# art-include: 21.0/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-# art-include: main/Athena
-
-# MC15 setup
-# ATLAS-R2-2015-03-01-00 and OFLCOND-RUN12-SDR-19
-export TRF_ECHO=1
-Sim_tf.py \
---conditionsTag 'default:OFLCOND-RUN12-SDR-19' \
---physicsList 'FTFP_BERT' \
---truthStrategy 'MC12' \
---simulator 'ATLFASTII' \
---postInclude 'default:PyJobTransforms/UseFrontier.py' \
---preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \
---DataRunNumber '222525' \
---geometryVersion 'default:ATLAS-R2-2015-03-01-00_VALIDATION' \
---inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1" \
---outputHITSFile "Hits.pool.root" \
---maxEvents 2
-
-echo "art-result: $? simulation"
diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3F_G4MS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3F_G4MS_ttbar.sh
index 7d6cc0ac6210808dabdf2266330d6b359edf565b..b22344506400b218469161cb2db8abf4add3aa08 100755
--- a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3F_G4MS_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3F_G4MS_ttbar.sh
@@ -1,30 +1,30 @@
#!/bin/sh
#
-# art-description: MC16-style simulation using ATLFAST3F
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
+# art-description: MC23-style RUN2 simulation using 21.0-compatible geometry and ATLFAST3F
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test.HITS.pool.root
-# art-output: truth.root
# MC16 setup
-# ATLAS-R2-2016-01-00-01 and OFLCOND-MC16-SDR-14
+# ATLAS-R2-2016-01-00-01 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
---conditionsTag 'default:OFLCOND-MC16-SDR-14' \
---simulator 'ATLFAST3F_G4MS' \
---preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \
---geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
---inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1" \
---outputHITSFile "test.HITS.pool.root" \
---maxEvents 2000 \
---imf False
+ --CA \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
+ --simulator 'ATLFAST3F_G4MS' \
+ --DataRunNumber 284500 \
+ --preInclude 'EVNTtoHITS:Campaigns.MC23SimulationNoIoV' \
+ --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
+ --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1" \
+ --outputHITSFile "test.HITS.pool.root" \
+ --maxEvents 2000 \
+ --imf False
rc=$?
rc2=-9999
-echo "art-result: $rc simOLD"
+echo "art-result: $rc simCA"
if [ $rc -eq 0 ]
then
ArtPackage=$1
diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_QS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_QS_ttbar.sh
index 00767499a24ae80f685787e12d4297577508e2ef..819111cd828db0be098b056ca31e22d16fd9564a 100755
--- a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_QS_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_QS_ttbar.sh
@@ -1,9 +1,6 @@
#!/bin/sh
#
-# art-description: MC16-style simulation using ATLFAST3
-# art-include: 21.0/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
+# art-description: MC23-style RUN2 simulation using 21.0-compatible geometry and ATLFAST3_QS
# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
@@ -12,20 +9,21 @@
# art-output: truth.root
# MC16 setup
-# ATLAS-R2-2016-01-00-01 and OFLCOND-MC16-SDR-14
+# ATLAS-R2-2016-01-00-01 and OFLCOND-MC23-SDR-RUN3-01
unset ATHENA_CORE_NUMBER
Sim_tf.py \
---conditionsTag 'default:OFLCOND-MC16-SDR-14' \
---simulator 'ATLFAST3_QS' \
---postInclude 'default:PyJobTransforms/UseFrontier.py' \
---preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \
---geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
---inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1" \
---outputHITSFile "test.HITS.pool.root" \
---maxEvents 20 \
---imf False
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
+ --simulator 'ATLFAST3_QS' \
+ --postInclude 'default:PyJobTransforms/UseFrontier.py' \
+ --preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationSingleIoV.py' \
+ --DataRunNumber '284500' \
+ --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
+ --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1" \
+ --outputHITSFile "test.HITS.pool.root" \
+ --maxEvents 20 \
+ --imf False
rc=$?
rc2=-9999
diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_ttbar.sh
index 4d9066b2c0680a32c17952fcf68570522819d082..315f374a44264a9feb59043308460a549f250c20 100755
--- a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFAST3_ttbar.sh
@@ -1,9 +1,6 @@
#!/bin/sh
#
-# art-description: MC16-style simulation using ATLFAST3
-# art-include: 21.0/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
+# art-description: MC23-style RUN2 simulation using 21.0-compatible geometry and ATLFAST3
# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
@@ -12,21 +9,21 @@
# art-output: truth.root
# MC16 setup
-# ATLAS-R2-2016-01-00-01 and OFLCOND-MC16-SDR-14
+# ATLAS-R2-2016-01-00-01 and OFLCOND-MC23-SDR-RUN3-01
unset ATHENA_CORE_NUMBER
Sim_tf.py \
---conditionsTag 'default:OFLCOND-MC16-SDR-14' \
---simulator 'ATLFAST3' \
---postInclude 'default:PyJobTransforms/UseFrontier.py' \
---preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \
---DataRunNumber '284500' \
---geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
---inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1" \
---outputHITSFile "test.HITS.pool.root" \
---maxEvents 20 \
---imf False
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
+ --simulator 'ATLFAST3' \
+ --postInclude 'default:PyJobTransforms/UseFrontier.py' \
+ --preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoV.py' \
+ --DataRunNumber '284500' \
+ --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
+ --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1" \
+ --outputHITSFile "test.HITS.pool.root" \
+ --maxEvents 20 \
+ --imf False
rc=$?
rc2=-9999
diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_Acts_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_Acts_ttbar.sh
deleted file mode 100755
index 8425790d8d71897d3b0763f2e496e8e115ed6b6d..0000000000000000000000000000000000000000
--- a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_Acts_ttbar.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# art-description: MC16-style simulation using ATLFASTIIF
-# art-include: main/Athena
-# art-type: grid
-# art-architecture: '#x86_64-intel'
-# art-output: test.HITS.pool.root
-
-# MC16 setup
-# ATLAS-R2-2016-01-00-01 and OFLCOND-MC16-SDR-14
-
-Sim_tf.py \
- --conditionsTag 'default:OFLCOND-MC16-SDR-14' \
- --simulator 'ATLFASTIIF_ACTS' \
- --postInclude 'default:PyJobTransforms/UseFrontier.py' 'EVNTtoHITS:G4AtlasTests/postInclude.DCubeTest.py' \
- --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \
- --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
- --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1" \
- --outputHITSFile "test.HITS.pool.root" \
- --maxEvents 100 \
- --imf False
-
-rc=$?
-rc2=-9999
-echo "art-result: $rc simOLD"
-if [ $rc -eq 0 ]
-then
- ArtPackage=$1
- ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
- rc2=$?
-fi
-
-echo "art-result: $rc2 regression"
-
diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_G4MS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_G4MS_ttbar.sh
deleted file mode 100755
index b6899e16773cc02be5660ec500ebb08c7229c1bb..0000000000000000000000000000000000000000
--- a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_G4MS_ttbar.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# art-description: MC16-style simulation using ATLFASTIIF
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-# art-include: main/Athena
-# art-type: grid
-# art-architecture: '#x86_64-intel'
-# art-output: test.HITS.pool.root
-# art-output: truth.root
-
-# MC16 setup
-# ATLAS-R2-2016-01-00-01 and OFLCOND-MC16-SDR-14
-
-Sim_tf.py \
---conditionsTag 'default:OFLCOND-MC16-SDR-14' \
---simulator 'ATLFASTIIF_G4MS' \
---postInclude 'default:PyJobTransforms/UseFrontier.py' 'EVNTtoHITS:G4AtlasTests/postInclude.DCubeTest.py' \
---preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \
---geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
---inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1" \
---outputHITSFile "test.HITS.pool.root" \
---maxEvents 2000 \
---imf False
-
-rc=$?
-rc2=-9999
-echo "art-result: $rc simOLD"
-if [ $rc -eq 0 ]
-then
- ArtPackage=$1
- ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
- rc2=$?
-fi
-
-echo "art-result: $rc2 regression"
diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_ttbar.sh
deleted file mode 100755
index 86a431e53c6a22e2c05a37d6738ab74fceabc242..0000000000000000000000000000000000000000
--- a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTIIF_ttbar.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# art-description: MC16-style simulation using ATLFASTIIF
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-# art-include: main/Athena
-# art-type: grid
-# art-architecture: '#x86_64-intel'
-# art-output: test.HITS.pool.root
-# art-output: truth.root
-
-# MC16 setup
-# ATLAS-R2-2016-01-00-01 and OFLCOND-MC16-SDR-14
-
-Sim_tf.py \
---conditionsTag 'default:OFLCOND-MC16-SDR-14' \
---simulator 'ATLFASTIIF' \
---postInclude 'default:PyJobTransforms/UseFrontier.py' 'EVNTtoHITS:G4AtlasTests/postInclude.DCubeTest.py' \
---preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \
---geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
---inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1" \
---outputHITSFile "test.HITS.pool.root" \
---maxEvents 2000 \
---imf False
-
-rc=$?
-rc2=-9999
-echo "art-result: $rc simOLD"
-if [ $rc -eq 0 ]
-then
- ArtPackage=$1
- ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
- rc2=$?
-fi
-
-echo "art-result: $rc2 regression"
diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTII_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTII_ttbar.sh
deleted file mode 100755
index 9984bceabfc0dab8239000cdbfffadc384e82ba9..0000000000000000000000000000000000000000
--- a/Simulation/Tests/ISF_Validation/test/test_MC16_ATLFASTII_ttbar.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-#
-# art-description: MC16-style simulation using ATLFASTII
-# art-include: 21.0/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-# art-include: main/Athena
-# art-type: grid
-# art-architecture: '#x86_64-intel'
-# art-output: test.HITS.pool.root
-# art-output: truth.root
-
-# MC16 setup
-# ATLAS-R2-2016-01-00-01 and OFLCOND-MC16-SDR-14
-
-Sim_tf.py \
---conditionsTag 'default:OFLCOND-MC16-SDR-14' \
---simulator 'ATLFASTII' \
---postInclude 'default:PyJobTransforms/UseFrontier.py' 'EVNTtoHITS:G4AtlasTests/postInclude.DCubeTest.py' \
---preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \
---geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
---inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1" \
---outputHITSFile "test.HITS.pool.root" \
---maxEvents 250 \
---imf False
-
-rc=$?
-rc2=-9999
-echo "art-result: $rc simOLD"
-if [ $rc -eq 0 ]
-then
- ArtPackage=$1
- ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
- rc2=$?
-fi
-
-echo "art-result: $rc2 regression"
diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4MT_QS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4MT_QS_ttbar.sh
new file mode 100755
index 0000000000000000000000000000000000000000..eca9e407ab8c7d4790988f0915739ea6838f6ea7
--- /dev/null
+++ b/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4MT_QS_ttbar.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+# art-description: MC23-style RUN2 simulation using 21.0-compatible geometry and FullG4MT_QS
+# art-type: grid
+# art-include: 24.0/Athena
+# art-include: 24.0/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
+# art-architecture: '#x86_64-intel'
+# art-output: test.HITS.pool.root
+# art-output: truth.root
+
+# MC16 setup
+# ATLAS-R2-2016-01-00-01 and OFLCOND-MC23-SDR-RUN3-01
+Sim_tf.py \
+ --CA True \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
+ --simulator 'FullG4MT_QS' \
+ --postInclude 'PyJobTransforms.TransformUtils.UseFrontier' \
+ --preInclude 'EVNTtoHITS:Campaigns.MC23SimulationNoIoV' \
+ --DataRunNumber 284500 \
+ --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1" \
+ --outputHITSFile "test.HITS.pool.root" \
+ --maxEvents 4 \
+ --imf False
+
+rc=$?
+status=$rc
+rc2=-9999
+echo "art-result: $rc simCA"
+if [ $rc -eq 0 ]
+then
+ ArtPackage=$1
+ ArtJobName=$2
+ art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
+ rc2=$?
+ status=$rc2
+fi
+
+echo "art-result: $rc2 regression"
+exit $status
diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4MT_QS_ttbar_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4MT_QS_ttbar_2evts.sh
new file mode 100755
index 0000000000000000000000000000000000000000..f23fd4b318b34522759bb394604d16f202ec6d9f
--- /dev/null
+++ b/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4MT_QS_ttbar_2evts.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# art-description: MC23-style RUN2 simulation using 21.0-compatible geometry and FullG4MT_QS
+# art-type: build
+# art-include: 24.0/Athena
+# art-include: 24.0/AthSimulation
+# art-include: main/Athena
+# art-include: main/AthSimulation
+
+# MC16 setup
+# ATLAS-R2-2016-01-00-01 and OFLCOND-MC23-SDR-RUN3-01
+export TRF_ECHO=1
+Sim_tf.py \
+ --CA True \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
+ --simulator 'FullG4MT_QS' \
+ --postInclude 'PyJobTransforms.TransformUtils.UseFrontier' \
+ --preInclude 'EVNTtoHITS:Campaigns.MC23SimulationNoIoV' \
+ --DataRunNumber 284500 \
+ --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
+ --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1" \
+ --outputHITSFile "Hits.pool.root" \
+ --maxEvents 2
+
+echo "art-result: $? simulation"
diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar.sh
deleted file mode 100755
index 0f60609d34d2ea43afcee3d5109589d27bf931c1..0000000000000000000000000000000000000000
--- a/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# art-description: MC16-style simulation using FullG4
-# art-include: 21.0/Athena
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-# art-include: main/Athena
-# art-type: grid
-# art-architecture: '#x86_64-intel'
-# art-output: test.HITS.pool.root
-# art-output: truth.root
-
-# MC16 setup
-# ATLAS-R2-2016-01-00-01 and OFLCOND-MC16-SDR-14
-Sim_tf.py \
---conditionsTag 'default:OFLCOND-MC16-SDR-14' \
---simulator 'FullG4' \
---postInclude 'default:PyJobTransforms/UseFrontier.py' \
---preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \
---geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
---inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1" \
---outputHITSFile "test.HITS.pool.root" \
---maxEvents 4 \
---imf False
-
-rc=$?
-rc2=-9999
-echo "art-result: $rc simOLD"
-if [ $rc -eq 0 ]
-then
- ArtPackage=$1
- ArtJobName=$2
- art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
- rc2=$?
-fi
-
-echo "art-result: $rc2 regression"
diff --git a/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar_2evts.sh
deleted file mode 100755
index cf1238cbb2c71f2b0744f7725a2f775089fa14d9..0000000000000000000000000000000000000000
--- a/Simulation/Tests/ISF_Validation/test/test_MC16_FullG4_ttbar_2evts.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# art-description: MC16-style simulation using FullG4
-# art-type: build
-# art-include: 21.0/Athena
-# art-include: 21.0/AthSimulation
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
-# art-include: main/Athena
-# art-include: main/AthSimulation
-
-# MC16 setup
-# ATLAS-R2-2016-01-00-01 and OFLCOND-MC16-SDR-14
-export TRF_ECHO=1
-Sim_tf.py \
---conditionsTag 'default:OFLCOND-MC16-SDR-14' \
---physicsList 'FTFP_BERT_ATL' \
---truthStrategy 'MC15aPlus' \
---simulator 'FullG4' \
---postInclude 'default:PyJobTransforms/UseFrontier.py' \
---preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py' \
---geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
---inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1" \
---outputHITSFile "Hits.pool.root" \
---maxEvents 2
-
-echo "art-result: $? simulation"
diff --git a/Simulation/Tests/ISF_Validation/test/test_MC21_FullG4MT_QS_SQLiteGeoM_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC21_FullG4MT_QS_SQLiteGeoM_ttbar.sh
index 40e6a813f655359fd98af9bc74c60afd60031930..8ca411ae5208558d03112b39036bbdc56d0a81da 100755
--- a/Simulation/Tests/ISF_Validation/test/test_MC21_FullG4MT_QS_SQLiteGeoM_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_MC21_FullG4MT_QS_SQLiteGeoM_ttbar.sh
@@ -2,6 +2,7 @@
#
# art-description: Run simulation using ISF with the FullG4MT_QS simulator, reading ttbar events, building ATLAS-R3S-2021-03-00-00 geometry from SQLite database
# art-include: 23.0/Athena
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_Validation/test/test_MC21_FullG4MT_QS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_MC21_FullG4MT_QS_ttbar.sh
deleted file mode 100755
index bc90b29e42d333ea219c60c69a0709a58d24919e..0000000000000000000000000000000000000000
--- a/Simulation/Tests/ISF_Validation/test/test_MC21_FullG4MT_QS_ttbar.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-#
-# art-description: Run simulation using ISF with the FullG4MT_QS simulator, reading 13 TeV ttbar events, writing HITS, using 2021 geometry and MC21 conditions
-# art-include: 22.0/Athena
-# art-include: main/Athena
-# art-type: grid
-# art-architecture: '#x86_64-intel'
-# art-output: *.pool.root
-# art-output: log.*
-# art-output: Config*.pkl
-
-Sim_tf.py \
---CA True \
---conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-05' \
---simulator 'FullG4MT_QS' \
---postInclude 'PyJobTransforms.TransformUtils.UseFrontier' \
---preInclude 'EVNTtoHITS:Campaigns.MC21Simulation' \
---geometryVersion 'default:ATLAS-R3S-2021-03-00-00' \
---inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1' \
---outputHITSFile 'test.CA.HITS.pool.root' \
---maxEvents '4' \
---postExec 'with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
---imf False
-
-rc=$?
-mv log.EVNTtoHITS log.EVNTtoHITS_CA
-echo "art-result: $rc simCA"
-
-Sim_tf.py \
---conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-05' \
---simulator 'FullG4MT_QS' \
---postInclude 'default:PyJobTransforms/UseFrontier.py' \
---preInclude 'EVNTtoHITS:Campaigns/MC21Simulation.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py' \
---geometryVersion 'default:ATLAS-R3S-2021-03-00-00' \
---inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1' \
---outputHITSFile 'test.CA.HITS.pool.root' \
---maxEvents '4' \
---imf False \
---athenaopts '"--config-only=ConfigSimCG.pkl"'
-
-Sim_tf.py \
---conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-05' \
---simulator 'FullG4MT_QS' \
---postInclude 'default:PyJobTransforms/UseFrontier.py' \
---preInclude 'EVNTtoHITS:Campaigns/MC21Simulation.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py' \
---geometryVersion 'default:ATLAS-R3S-2021-03-00-00' \
---inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1' \
---outputHITSFile 'test.HITS.pool.root' \
---maxEvents '4' \
---imf False
-
-rc2=$?
-mv log.EVNTtoHITS log.EVNTtoHITS_OLD
-echo "art-result: $rc2 simOLD"
-
-rc3=-9999
-if [ $rc -eq 0 ] && [ $rc2 -eq 0 ]
-then
- acmd.py diff-root test.HITS.pool.root test.CA.HITS.pool.root --error-mode resilient --mode=semi-detailed --order-trees --ignore-leaves RecoTimingObj_p1_EVNTtoHITS_timings index_ref
- rc3=$?
-fi
-echo "art-result: $rc3 OLDvsCA"
-
-rc4=-9999
-if [ $rc2 -eq 0 ]
-then
- ArtPackage=$1
- ArtJobName=$2
- art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --file=test.HITS.pool.root
- rc4=$?
-fi
-echo "art-result: $rc4 regression"
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_QS_CalibrationHits_pions.sh b/Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_QS_CalibrationHits_pions.sh
index 045cc92a72b5057b95f3d9dd69fe46cb76e9b68d..14b5f98680427b454b8759913eea075717746212 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_QS_CalibrationHits_pions.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_QS_CalibrationHits_pions.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# art-description: Run simulation using ISF with the FullG4MT_QS simulator, reading single pion events, writing HITS including full CaloCalibrationHit information, using RUN2 geometry and conditions
-# art-include: 23.0/Athena
+# art-description: MC23-style RUN2 simulation using best knowledge geometry and FullG4MT_QS simulator, reading single pion events, writing HITS including full CaloCalibrationHit information
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
@@ -10,10 +10,10 @@
# art-output: Config*.pkl
# RUN2 setup
-# ATLAS-R2-2016-01-02-01 and OFLCOND-MC21-SDR-RUN3-07
+# ATLAS-R2-2016-01-02-01 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
--CA \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'PyJobTransforms.UseFrontier' \
--preInclude 'EVNTtoHITS:Campaigns.MC23SimulationNoIoV' \
@@ -31,7 +31,7 @@ echo "art-result: $rc simCA"
status=$rc
Sim_tf.py \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationNoIoV.py' \
@@ -44,7 +44,7 @@ Sim_tf.py \
--athenaopts '"--config-only=ConfigSimCG.pkl"'
Sim_tf.py \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationNoIoV.py' \
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_QS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_QS_ttbar.sh
index dee51717b881fc3c52c8bddc2d7643ceef6b2b9b..9af742eab719480733084072672f943c55ed676b 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_QS_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_QS_ttbar.sh
@@ -1,8 +1,8 @@
#!/bin/sh
#
-# art-description: MC23-style RUN2 simulation using FullG4MT_QS simulator in serial Athena
-# art-include: 23.0/Athena
-# art-include: 23.0/AthSimulation
+# art-description: MC23-style RUN2 simulation using best knowledge geometry and FullG4MT_QS simulator in serial Athena
+# art-include: 24.0/Athena
+# art-include: 24.0/AthSimulation
# art-include: main/Athena
# art-include: main/AthSimulation
# art-type: grid
@@ -13,7 +13,7 @@
Sim_tf.py \
--CA \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'PyJobTransforms.TransformUtils.UseFrontier' \
--preInclude 'EVNTtoHITS:Campaigns.MC23SimulationNoIoV' \
@@ -31,7 +31,7 @@ echo "art-result: $rc simCA"
status=$rc
Sim_tf.py \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationNoIoV.py' \
@@ -44,7 +44,7 @@ Sim_tf.py \
--athenaopts '"--config-only=ConfigSimCG.pkl"'
Sim_tf.py \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationNoIoV.py' \
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_ttbar.sh
index d19180f1bcfd9cf0c8ab903def65cf7d0d35cbe1..6c8ab0285fee33da6d15440d34681ba25b6c7a09 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN2_FullG4MT_ttbar.sh
@@ -1,8 +1,8 @@
#!/bin/sh
#
-# art-description: MC23-style RUN2 simulation using FullG4MT in serial Athena
-# art-include: 23.0/Athena
-# art-include: 23.0/AthSimulation
+# art-description: MC23-style RUN2 simulation using best knowledge geometry and FullG4MT in serial Athena
+# art-include: 24.0/Athena
+# art-include: 24.0/AthSimulation
# art-include: main/Athena
# art-include: main/AthSimulation
# art-type: grid
@@ -12,10 +12,10 @@
# art-output: Config*
# RUN3 setup
-# ATLAS-R2-2016-01-02-01 and OFLCOND-MC21-SDR-RUN3-07
+# ATLAS-R2-2016-01-02-01 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
--CA \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT' \
--postExec 'with open("ConfigCA.pkl", "wb") as f: cfg.store(f)' \
--postInclude 'default:PyJobTransforms.UseFrontier' \
@@ -33,7 +33,7 @@ echo "art-result: $rc simCA"
status=$rc
Sim_tf.py \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationNoIoV.py' \
@@ -46,7 +46,7 @@ Sim_tf.py \
--athenaopts '"--config-only=ConfigCG.pkl"'
Sim_tf.py \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationNoIoV.py' \
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_2023_FullG4MT_QS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_2023_FullG4MT_QS_ttbar.sh
index a92dba7f07ab1a40dcb41eac489bb7b4da910d94..ddef0654addae7dc1594c92b43fe82f121bd7fd2 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_2023_FullG4MT_QS_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN3_2023_FullG4MT_QS_ttbar.sh
@@ -2,6 +2,7 @@
#
# art-description: Run simulation using ISF with the FullG4MT_QS simulator, reading 13.6 TeV ttbar events, writing HITS, using the best knowledge RUN3 geometry and MC23 conditions
# art-include: 23.0/Athena
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_AF3InputParamFiles.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_AF3InputParamFiles.sh
index cadbb8b4c1c2bad949c8ec5a5fbd7c757250f7b5..c666de60e3784d2ee7909f7261797fef219a8950 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_AF3InputParamFiles.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN3_AF3InputParamFiles.sh
@@ -2,8 +2,8 @@
#
# art-description: MC21-style simulation using FullG4 for producing input samples needed for the Fast Calorimeter Simulation parametrisation
# art-type: build
-# art-include: 22.0/Athena
# art-include: 23.0/Athena
+# art-include: 24.0/Athena
# art-include: main/Athena
# Full chain with special flags
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFAST3F_G4MS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFAST3F_G4MS_ttbar.sh
index 526d3ea4b2426a78327668a07b2e8971e227cda8..eb79984fbef6989b676c0c84e8131f7b6941d791 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFAST3F_G4MS_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFAST3F_G4MS_ttbar.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
# art-description: MC23-style RUN3 simulation using ATLFAST3F_G4MS in serial Athena
-# art-include: 23.0/Athena
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
@@ -12,14 +12,14 @@
unset ATHENA_CORE_NUMBER
# RUN3 setup
-# ATLAS-R3S-2021-03-01-00 and OFLCOND-MC21-SDR-RUN3-07
+# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
--CA \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3F_G4MS' \
--postInclude 'PyJobTransforms.UseFrontier' \
--preInclude 'EVNTtoHITS:Campaigns.MC23aSimulationMultipleIoV' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CA.HITS.pool.root" \
--maxEvents 50 \
@@ -34,11 +34,11 @@ status=$rc
rc2=-9999
Sim_tf.py \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3F_G4MS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CA.HITS.pool.root" \
--maxEvents 50 \
@@ -47,11 +47,11 @@ Sim_tf.py \
--athenaopts '"--config-only=ConfigSimCG.pkl"'
Sim_tf.py \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3F_G4MS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CG.HITS.pool.root" \
--maxEvents 50 \
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFAST3MT_QS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFAST3MT_QS_ttbar.sh
index ef2352a17151806d6f8f7ea87d33dfc1c5ab2f8a..22f0ff372fc288bcdd3298e95f913b7fa39310ea 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFAST3MT_QS_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFAST3MT_QS_ttbar.sh
@@ -2,6 +2,7 @@
#
# art-description: MC23-style RUN3 simulation using ATLFAST3MT_QS in serial Athena
# art-include: 23.0/Athena
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
@@ -12,19 +13,20 @@
unset ATHENA_CORE_NUMBER
# RUN3 setup
-# ATLAS-R3S-2021-03-01-00 and OFLCOND-MC21-SDR-RUN3-07
+# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
- --CA \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
- --simulator 'ATLFAST3MT_QS' \
- --postInclude 'PyJobTransforms.UseFrontier' \
- --preInclude 'EVNTtoHITS:Campaigns.MC23aSimulationMultipleIoV' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
- --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
- --outputHITSFile "test.CA.HITS.pool.root" \
- --maxEvents 50 \
- --postExec 'with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
- --imf False
+ --CA \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
+ --simulator 'ATLFAST3MT_QS' \
+ --postInclude 'PyJobTransforms.UseFrontier' \
+ --preInclude 'EVNTtoHITS:Campaigns.MC23aSimulationMultipleIoV' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
+ --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
+ --outputHITSFile "test.CA.HITS.pool.root" \
+ --maxEvents 50 \
+ --jobNumber 1 \
+ --postExec 'with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
+ --imf False
rc=$?
mv log.EVNTtoHITS log.EVNTtoHITS.CA
@@ -33,11 +35,11 @@ status=$rc
rc2=-9999
Sim_tf.py \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CA.HITS.pool.root" \
--maxEvents 50 \
@@ -46,11 +48,11 @@ Sim_tf.py \
--athenaopts '"--config-only=ConfigSimCG.pkl"'
Sim_tf.py \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CG.HITS.pool.root" \
--maxEvents 50 \
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFAST3MT_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFAST3MT_ttbar.sh
index e9575f3f1057e01def92f2c1b21e70d943ec68ce..8b515d8347f94cb39d9c86d86da20d47ea1bb07d 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFAST3MT_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFAST3MT_ttbar.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
# art-description: MC23-style RUN3 simulation using ATLFAST3MT in serial Athena
-# art-include: 23.0/Athena
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
@@ -12,19 +12,20 @@
unset ATHENA_CORE_NUMBER
# RUN3 setup
-# ATLAS-R3S-2021-03-01-00 and OFLCOND-MC21-SDR-RUN3-07
+# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
- --CA \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
- --simulator 'ATLFAST3MT' \
- --postInclude 'PyJobTransforms.UseFrontier' \
- --preInclude 'EVNTtoHITS:Campaigns.MC23aSimulationMultipleIoV' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
- --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
- --outputHITSFile "test.CA.HITS.pool.root" \
- --maxEvents 50 \
- --postExec 'with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
- --imf False
+ --CA \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
+ --simulator 'ATLFAST3MT' \
+ --postInclude 'PyJobTransforms.UseFrontier' \
+ --preInclude 'EVNTtoHITS:Campaigns.MC23aSimulationMultipleIoV' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
+ --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
+ --outputHITSFile "test.CA.HITS.pool.root" \
+ --maxEvents 50 \
+ --jobNumber 1 \
+ --postExec 'with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
+ --imf False
rc=$?
mv log.EVNTtoHITS log.EVNTtoHITS.CA
@@ -33,11 +34,11 @@ status=$rc
rc2=-9999
Sim_tf.py \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3MT' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CA.HITS.pool.root" \
--maxEvents 50 \
@@ -46,11 +47,11 @@ Sim_tf.py \
--athenaopts '"--config-only=ConfigSimCG.pkl"'
Sim_tf.py \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3MT' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CG.HITS.pool.root" \
--maxEvents 50 \
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFASTIIF_G4MS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFASTIIF_G4MS_ttbar.sh
deleted file mode 100755
index ef77d6f9bab1ea31b5b604179a7f80c75d562d14..0000000000000000000000000000000000000000
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFASTIIF_G4MS_ttbar.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-#
-# art-description: MC23-style RUN3 simulation using ATLFASTIIF_G4MS in serial Athena
-# art-type: grid
-# art-include: 23.0/Athena
-# art-include: main/Athena
-# art-architecture: '#x86_64-intel'
-# art-output: test.*.HITS.pool.root
-# art-output: log.*
-# art-output: Config*.pkl
-
-unset ATHENA_CORE_NUMBER
-
-# RUN3 setup
-# ATLAS-R3S-2021-03-01-00 and OFLCOND-MC21-SDR-RUN3-07
-Sim_tf.py \
- --CA \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
- --simulator 'ATLFASTIIF_G4MS' \
- --postInclude 'PyJobTransforms.UseFrontier' \
- --preInclude 'EVNTtoHITS:Campaigns.MC23aSimulationMultipleIoV' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
- --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
- --outputHITSFile "test.CA.HITS.pool.root" \
- --maxEvents 50 \
- --jobNumber 1 \
- --postExec 'with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
- --imf False
-
-rc=$?
-mv log.EVNTtoHITS log.EVNTtoHITS.CA
-echo "art-result: $rc simCA"
-status=$rc
-
-rc2=-9999
-Sim_tf.py \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
- --simulator 'ATLFASTIIF_G4MS' \
- --postInclude 'default:PyJobTransforms/UseFrontier.py' \
- --preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
- --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
- --outputHITSFile "test.CA.HITS.pool.root" \
- --maxEvents 50 \
- --jobNumber 1 \
- --imf False \
- --athenaopts '"--config-only=ConfigSimCG.pkl"'
-
-Sim_tf.py \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
- --simulator 'ATLFASTIIF_G4MS' \
- --postInclude 'default:PyJobTransforms/UseFrontier.py' \
- --preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
- --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
- --outputHITSFile "test.CG.HITS.pool.root" \
- --maxEvents 50 \
- --jobNumber 1 \
- --imf False
-
-rc2=$?
-mv log.EVNTtoHITS log.EVNTtoHITS.CG
-echo "art-result: $rc2 simOLD"
-if [ $status -eq 0 ]
-then
- status=$rc2
-fi
-
-rc3=-9999
-if [ $status -eq 0 ]
-then
- # Compare the outputs
- acmd.py diff-root test.CG.HITS.pool.root test.CA.HITS.pool.root \
- --error-mode resilient \
- --mode semi-detailed
- rc3=$?
- status=$rc3
-fi
-
-echo "art-result: $rc3 OLDvsCA"
-rc4=-9999
-if [ $rc2 -eq 0 ]
-then
- ArtPackage=$1
- ArtJobName=$2
- art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --file=test.CG.HITS.pool.root
- rc4=$?
- status=$rc4
-fi
-echo "art-result: $rc4 regression"
-
-exit $status
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFASTIIMT_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFASTIIMT_ttbar.sh
deleted file mode 100755
index 71001e7b0358f0e3bb14239c23ea8c27bea7db2f..0000000000000000000000000000000000000000
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_ATLFASTIIMT_ttbar.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-#
-# art-description: MC23-style RUN3 simulation using ATLFASTIIMT in serial Athena
-# art-include: main/Athena
-# art-type: grid
-# art-architecture: '#x86_64-intel'
-# art-output: test.*.HITS.pool.root
-# art-output: log.*
-# art-output: Config*.pkl
-
-unset ATHENA_CORE_NUMBER
-
-# RUN3 setup
-# ATLAS-R3S-2021-03-01-00 and OFLCOND-MC21-SDR-RUN3-07
-Sim_tf.py \
- --CA \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
- --simulator 'ATLFASTIIMT' \
- --postInclude 'PyJobTransforms.UseFrontier' \
- --preInclude 'EVNTtoHITS:Campaigns.MC23aSimulationMultipleIoV' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
- --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
- --outputHITSFile "test.CA.HITS.pool.root" \
- --maxEvents 50 \
- --jobNumber 1 \
- --postExec 'with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
- --imf False
-
-rc=$?
-mv log.EVNTtoHITS log.EVNTtoHITS.CA
-echo "art-result: $rc simCA"
-status=$rc
-
-rc2=-9999
-Sim_tf.py \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
- --simulator 'ATLFASTIIMT' \
- --postInclude 'default:PyJobTransforms/UseFrontier.py' \
- --preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
- --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
- --outputHITSFile "test.CA.HITS.pool.root" \
- --maxEvents 50 \
- --jobNumber 1 \
- --imf False \
- --athenaopts '"--config-only=ConfigSimCG.pkl"'
-
-Sim_tf.py \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
- --simulator 'ATLFASTIIMT' \
- --postInclude 'default:PyJobTransforms/UseFrontier.py' \
- --preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
- --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
- --outputHITSFile "test.CG.HITS.pool.root" \
- --maxEvents 50 \
- --jobNumber 1 \
- --imf False
-
-rc2=$?
-mv log.EVNTtoHITS log.EVNTtoHITS.CG
-echo "art-result: $rc2 simOLD"
-if [ $status -eq 0 ]
-then
- status=$rc2
-fi
-
-rc3=-9999
-if [ $status -eq 0 ]
-then
- # Compare the outputs
- acmd.py diff-root test.CG.HITS.pool.root test.CA.HITS.pool.root \
- --error-mode resilient \
- --mode semi-detailed
- rc3=$?
- status=$rc3
-fi
-
-echo "art-result: $rc3 OLDvsCA"
-rc4=-9999
-if [ $rc2 -eq 0 ]
-then
- ArtPackage=$1
- ArtJobName=$2
- art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --file=test.CG.HITS.pool.root
- rc4=$?
- status=$rc4
-fi
-echo "art-result: $rc4 regression"
-
-exit $status
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4MT_QS_CalibrationHits_pions.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4MT_QS_CalibrationHits_pions.sh
index 7eb532bd1bcc12cdee9b6a20c2cb57ec084e042b..e8652e62a91e1a880914cb97592fbb8a80770701 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4MT_QS_CalibrationHits_pions.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4MT_QS_CalibrationHits_pions.sh
@@ -2,6 +2,7 @@
#
# art-description: Run simulation using ISF with the FullG4MT_QS simulator, reading single pion events, writing HITS including full CaloCalibrationHit information, using RUN3 geometry and conditions
# art-include: 23.0/Athena
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
@@ -10,7 +11,7 @@
# art-output: Config*.pkl
# RUN3 setup
-# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC21-SDR-RUN3-07
+# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
--CA \
--simulator 'FullG4MT_QS' \
@@ -19,7 +20,7 @@ Sim_tf.py \
--maxEvents '10' \
--skipEvents '0' \
--geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--preInclude 'EVNTtoHITS:Campaigns.MC23SimulationSingleIoVCalibrationHits' \
--postInclude 'PyJobTransforms.TransformUtils.UseFrontier' \
--postExec 'with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
@@ -37,7 +38,7 @@ Sim_tf.py \
--maxEvents '10' \
--skipEvents '0' \
--geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--preExec 'EVNTtoHITS:simFlags.ReleaseGeoModel=False;' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoVCalibrationHits.py' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
@@ -51,7 +52,7 @@ Sim_tf.py \
--maxEvents '10' \
--skipEvents '0' \
--geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--preExec 'EVNTtoHITS:simFlags.ReleaseGeoModel=False;' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoVCalibrationHits.py' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_QS_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4MT_QS_ttbar.sh
similarity index 67%
rename from Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_QS_ttbar.sh
rename to Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4MT_QS_ttbar.sh
index cce95a59136f3b6e934d0c3a725aca11935e79af..af6308dcbde07fa1999b5978c5bc72308d0ad472 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_QS_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4MT_QS_ttbar.sh
@@ -1,8 +1,8 @@
#!/bin/sh
#
-# art-description: MC21-style simulation using FullG4MT_QS (13 TeV ttbar input - needs updating)
-# art-include: 22.0/Athena
+# art-description: MC23-style simulation using FullG4MT_QS (13 TeV ttbar input - needs updating)
# art-include: 23.0/Athena
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
@@ -12,12 +12,11 @@
Sim_tf.py \
--CA True \
---conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-03' \
+--conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'PyJobTransforms.TransformUtils.UseFrontier' \
---preInclude 'EVNTtoHITS:Campaigns.MC21Simulation,SimuJobTransforms.SimulationHelpers.enableFrozenShowersFCalOnly' \
---DataRunNumber '330000' \
---geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+--preInclude 'EVNTtoHITS:Campaigns.MC23SimulationSingleIoV' \
+--geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1' \
--outputHITSFile 'test.CA.HITS.pool.root' \
--maxEvents '10' \
@@ -29,12 +28,11 @@ mv log.EVNTtoHITS log.EVNTtoHITS_CA
echo "art-result: $rc simCA"
Sim_tf.py \
---conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-03' \
+--conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
---preInclude 'EVNTtoHITS:Campaigns/MC21Simulation.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py' \
---DataRunNumber '330000' \
---geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoV.py' \
+--geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1' \
--outputHITSFile 'test.CA.HITS.pool.root' \
--maxEvents '10' \
@@ -42,12 +40,11 @@ Sim_tf.py \
--athenaopts '"--config-only=ConfigSimCG.pkl"'
Sim_tf.py \
---conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-03' \
+--conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
---preInclude 'EVNTtoHITS:Campaigns/MC21Simulation.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py' \
---DataRunNumber '330000' \
---geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoV.py' \
+--geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1' \
--outputHITSFile 'test.HITS.pool.root' \
--maxEvents '10' \
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_QS_ZPrime_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_QS_ZPrime_2evts.sh
index 5594a8490308833ae156c5f08ba9dff3e07342b3..10a1467028d3f89600a01a6a0bfcc11c13ed38b4 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_QS_ZPrime_2evts.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_QS_ZPrime_2evts.sh
@@ -2,17 +2,17 @@
#
# art-description: MC23-style simulation using FullG4_QS (13.6 TeV Zprime input)
# art-type: build
-# art-include: 22.0/Athena
-# art-include: 22.0/AthSimulation
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
+# art-include: 24.0/Athena
+# art-include: 24.0/AthSimulation
# art-include: main/Athena
# art-include: main/AthSimulation
# RUN3 setup - Frozen Showers currently off by default
-# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC21-SDR-RUN3-07
+# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
---conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+--conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoV.py' \
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_ReproducibilityTest.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_ReproducibilityTest.sh
index 80c6e1c73e246b047f9290820217d3b3b071a6f6..d2aad025953f49dafd4bfe49b11ec049279f0ced 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_ReproducibilityTest.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_ReproducibilityTest.sh
@@ -1,10 +1,10 @@
#!/bin/sh
#
# art-description: MC21-style simulation using FullG4, checking that the SkipEvents argument works (7 TeV ttbar input - needs updating)
-# art-include: 22.0/Athena
-# art-include: 22.0/AthSimulation
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
+# art-include: 24.0/Athena
+# art-include: 24.0/AthSimulation
# art-include: main/Athena
# art-include: main/AthSimulation
# art-type: grid
@@ -21,7 +21,7 @@ Sim_tf.py \
--simulator 'FullG4' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC21Simulation.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' \
---geometryVersion 'default:ATLAS-R3S-2021-03-01-00_VALIDATION' \
+--geometryVersion 'default:ATLAS-R3S-2021-03-02-00_VALIDATION' \
--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1' \
--outputHITSFile 'hitsFull.ttbar.pool.root' \
--maxEvents '10' \
@@ -35,7 +35,7 @@ Sim_tf.py \
--simulator 'FullG4' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC21Simulation.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' \
---geometryVersion 'default:ATLAS-R3S-2021-03-01-00_VALIDATION' \
+--geometryVersion 'default:ATLAS-R3S-2021-03-02-00_VALIDATION' \
--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1' \
--outputHITSFile 'hitsHalf1.ttbar.pool.root' \
--maxEvents '5' \
@@ -49,7 +49,7 @@ Sim_tf.py \
--simulator 'FullG4' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC21Simulation.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' \
---geometryVersion 'default:ATLAS-R3S-2021-03-01-00_VALIDATION' \
+--geometryVersion 'default:ATLAS-R3S-2021-03-02-00_VALIDATION' \
--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1' \
--outputHITSFile 'hitsHalf2.ttbar.pool.root' \
--maxEvents '5' \
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_minbias.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_minbias.sh
index b2ac632d0c3e185b581fe9fc6a01a40f89ddf2b9..1332196b1a20e57b0d1f9d77420fa038918c8bf8 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_minbias.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_minbias.sh
@@ -1,25 +1,23 @@
#!/bin/sh
#
# art-description: MC21-style simulation using FullG4 (7 TeV minbias input - needs updating)
-# art-include: 22.0/Athena
-# art-include: 23.0/Athena
# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
# art-output: test.HITS.pool.root
# RUN3 setup - Frozen Showers currently off by default
-# ATLAS-R3S-2021-03-01-00 and OFLCOND-MC21-SDR-RUN3-03
+# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
---conditionsTag 'default:OFLCOND-RUN12-SDR-19' \
---simulator 'FullG4' \
---postInclude 'default:PyJobTransforms/UseFrontier.py' \
---preInclude 'EVNTtoHITS:Campaigns/MC21Simulation.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' \
---geometryVersion 'default:ATLAS-R3S-2021-03-01-00_VALIDATION' \
---inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.119994.Pythia8_A2MSTW2008LO_minbias_inelastic.evgen.EVNT.e3099.01517253._000001.pool.root.1" \
---outputHITSFile "test.HITS.pool.root" \
---maxEvents 50 \
---imf False
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
+ --simulator 'FullG4MT' \
+ --postInclude 'default:PyJobTransforms/UseFrontier.py' \
+ --preInclude 'EVNTtoHITS:Campaigns/MC21Simulation.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00_VALIDATION' \
+ --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.119994.Pythia8_A2MSTW2008LO_minbias_inelastic.evgen.EVNT.e3099.01517253._000001.pool.root.1" \
+ --outputHITSFile "test.HITS.pool.root" \
+ --maxEvents 50 \
+ --imf False
rc=$?
rc2=-9999
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_ttbar_2evts.sh b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_ttbar_2evts.sh
index ee5aaab227fb0a1f35fc1cbf9c5a5775480e36f6..a3e8de3804a936f053a3a79f8e7402494de4a16c 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_ttbar_2evts.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN3_FullG4_ttbar_2evts.sh
@@ -1,24 +1,23 @@
#!/bin/sh
#
-# art-description: MC21-style simulation using FullG4 (13 TeV ttbar input - needs updating)
+# art-description: MC23a-style simulation using FullG4 (13 TeV ttbar input - needs updating)
# art-type: build
-# art-include: 22.0/Athena
-# art-include: 22.0/AthSimulation
-# art-include: 23.0/Athena
-# art-include: 23.0/AthSimulation
+# art-include: 24.0/Athena
+# art-include: 24.0/AthSimulation
# art-include: main/Athena
# art-include: main/AthSimulation
-# RUN3 setup - Frozen Showers currently off by default
-# ATLAS-R3S-2021-03-01-00 and OFLCOND-MC21-SDR-RUN3-03
+# RUN3 setup
+# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
---conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-03' \
---simulator 'FullG4' \
---postInclude 'default:PyJobTransforms/UseFrontier.py' \
---preInclude 'EVNTtoHITS:Campaigns/MC21Simulation.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' \
---geometryVersion 'default:ATLAS-R3S-2021-03-01-00_VALIDATION' \
---inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1" \
---outputHITSFile "test.HITS.pool.root" \
---maxEvents 2
+ --CA \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
+ --simulator 'FullG4MT_QS' \
+ --postInclude 'PyJobTransforms.UseFrontier' \
+ --preInclude 'EVNTtoHITS:Campaigns.MC23SimulationSingleIoV' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
+ --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
+ --outputHITSFile "test.HITS.pool.root" \
+ --maxEvents 2
echo "art-result: $? simulation"
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4MT_QS_CalibrationHits_pions.sh b/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4MT_QS_CalibrationHits_pions.sh
index 7e3fed64cb155a38809a068b6a8e922656e8d5d4..0cac997843d96bc761ff4419c459b96df2593fdd 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4MT_QS_CalibrationHits_pions.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4MT_QS_CalibrationHits_pions.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
# art-description: Run simulation using ISF with the FullG4MT_QS simulator, reading single pion events, writing HITS including full CaloCalibrationHit information, using RUN4 geometry and conditions
-# art-include: 23.0/Athena
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_minbias.sh b/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_minbias.sh
index 05294579e8a4a31b60465ae27ebc2f00d2499a6d..a00933b9fd639498d78af1b57faef10b6cf21a68 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_minbias.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_minbias.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
# art-description: MC21-style simulation using FullG4 and RUN4 geometry, minimum bias
-# art-include: 23.0/Athena
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_single_muon.sh b/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_single_muon.sh
index 62055effeeb1b88b5ef9f7144c1c374f40452d74..ed8812424924b295bb506bcb96bebe59e908c55b 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_single_muon.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_single_muon.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
# art-description: MC21-style simulation using FullG4 and RUN4 geometry, single muon
-# art-include: 23.0/Athena
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_single_neutrino.sh b/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_single_neutrino.sh
index a02f5cb1e2356992c6978bedfb5cd8a8ce73e753..36e05162f2d41b719e568e0be6a1aa1e5af56d9c 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_single_neutrino.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_single_neutrino.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
# art-description: MC21-style simulation using FullG4 and RUN4 geometry, single neutrino
-# art-include: 23.0/Athena
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_ttbar.sh b/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_ttbar.sh
index 37651609d60d116af50fdfed899f64be2d0fdbb2..02dde18a039babe60825631d8422857ff6b4d861 100755
--- a/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_ttbar.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_RUN4_FullG4_ttbar.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
# art-description: MC21-style simulation using FullG4 and RUN4 geometry, ttbar
-# art-include: 23.0/Athena
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_Validation/test/test_ReSimulation.sh b/Simulation/Tests/ISF_Validation/test/test_ReSimulation.sh
index 2179f38ac3a9c390fa35bc03a2175c13304d3e74..77e19cd33cdf5327799ab542f454ee31f9f1602d 100755
--- a/Simulation/Tests/ISF_Validation/test/test_ReSimulation.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_ReSimulation.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
# art-description: ReSimulation Workflow running with MC16 conditions/geometry
-# art-include: 23.0/Athena
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh b/Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh
index 10818573ad2851626a675e61d2de8699629de111..0012049c2bfa4f81ba071f24a5e8d997c45011ee 100755
--- a/Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh
@@ -1,8 +1,8 @@
#!/bin/sh
#
# art-description: Run cosmics simulation using ISF with the FullG4 simulator, generating events on-the-fly, using 2015 geometry and conditions
-# art-include: 21.0/Athena
# art-include: 23.0/Athena
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh b/Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh
index e85e5e101007775adc45b433818d32e46cb13ce1..28de05fc4995eaf7fc1dd63683d40a7b6d460854 100755
--- a/Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh
+++ b/Simulation/Tests/ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh
@@ -1,8 +1,8 @@
#!/bin/sh
#
# art-description: Run cosmics simulation using ISF with the FullG4 simulator, using TrackRecords as input, using 2015 geometry and conditions
-# art-include: 21.0/Athena
# art-include: 23.0/Athena
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-type: grid
# art-architecture: '#x86_64-intel'
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_ATLFAST3MT_QS_ttbar_MP.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_ATLFAST3MT_QS_ttbar_MP.sh
index 7624fc52043210e734b6309686a9413e980d92ad..7b73097e903508d6e3cbd5d073577aedae8ccc93 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_ATLFAST3MT_QS_ttbar_MP.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_ATLFAST3MT_QS_ttbar_MP.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# art-description: MC23-style RUN2 simulation using ATLFAST3MT_QS in AthenaMP
-# art-include: 23.0/Athena
+# art-description: MC23-style RUN2 simulation using best knowledge geometry and ATLFAST3MT_QS in AthenaMP
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-type: grid
# art-athena-mt: 8
@@ -13,11 +13,11 @@
export ATHENA_CORE_NUMBER=8
# RUN3 setup
-# ATLAS-R2-2016-01-02-01 and OFLCOND-MC21-SDR-RUN3-07
+# ATLAS-R2-2016-01-02-01 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
--CA \
--multiprocess \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3MT_QS' \
--postInclude 'PyJobTransforms.UseFrontier' \
--preInclude 'EVNTtoHITS:Campaigns.MC23SimulationNoIoV' \
@@ -37,7 +37,7 @@ status=$rc
Sim_tf.py \
--multiprocess \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationNoIoV.py' \
@@ -51,7 +51,7 @@ Sim_tf.py \
Sim_tf.py \
--multiprocess \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationNoIoV.py' \
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_ATLFAST3MT_QS_ttbar_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_ATLFAST3MT_QS_ttbar_MT.sh
index 50cced94ddfeaf5dd8961d8a384dda55b6ec1d55..9a65a1477289807e26ecf47c5e607f754a95c9bf 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_ATLFAST3MT_QS_ttbar_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_ATLFAST3MT_QS_ttbar_MT.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# art-description: MC23-style RUN2 simulation using ATLFAST3MT_QS in AthenaMT
-# art-include: 23.0/Athena
+# art-description: MC23-style RUN2 simulation using best knowledge geometry and ATLFAST3MT_QS in AthenaMT
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-type: grid
# art-athena-mt: 8
@@ -13,11 +13,11 @@
export ATHENA_CORE_NUMBER=8
# RUN3 setup
-# ATLAS-R2-2016-01-02-01 and OFLCOND-MC21-SDR-RUN3-07
+# ATLAS-R2-2016-01-02-01 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
--CA \
--multithreaded \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3MT_QS' \
--postInclude 'PyJobTransforms.UseFrontier' \
--preInclude 'EVNTtoHITS:Campaigns.MC23SimulationNoIoV' \
@@ -36,7 +36,7 @@ status=$rc
Sim_tf.py \
--multithreaded \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationNoIoV.py' \
@@ -50,7 +50,7 @@ Sim_tf.py \
Sim_tf.py \
--multithreaded \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationNoIoV.py' \
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_FullG4MT_QS_ttbar_MP.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_FullG4MT_QS_ttbar_MP.sh
index eeba418f44c35c38a2f22b93d114a953f5856c2c..ea057495f80bc0a6f3996823e35cb11c21e7c273 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_FullG4MT_QS_ttbar_MP.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_FullG4MT_QS_ttbar_MP.sh
@@ -1,8 +1,8 @@
#!/bin/sh
#
-# art-description: MC23-style RUN2 simulation using FullG4MT_QS in AthenaMP
-# art-include: 23.0/Athena
-# art-include: 23.0/AthSimulation
+# art-description: MC23-style RUN2 simulation using best knowledge geometry and FullG4MT_QS in AthenaMP
+# art-include: 24.0/Athena
+# art-include: 24.0/AthSimulation
# art-include: main/Athena
# art-include: main/AthSimulation
# art-type: grid
@@ -15,11 +15,11 @@
export ATHENA_CORE_NUMBER=8
# RUN3 setup
-# ATLAS-R2-2016-01-02-01 and OFLCOND-MC21-SDR-RUN3-07
+# ATLAS-R2-2016-01-02-01 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
--CA \
--multiprocess \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'PyJobTransforms.UseFrontier' \
--preInclude 'EVNTtoHITS:Campaigns.MC23SimulationNoIoV' \
@@ -40,7 +40,7 @@ status=$rc
rc2=-9999
Sim_tf.py \
--multiprocess \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationNoIoV.py' \
@@ -54,7 +54,7 @@ Sim_tf.py \
Sim_tf.py \
--multiprocess \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationNoIoV.py' \
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_FullG4MT_QS_ttbar_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_FullG4MT_QS_ttbar_MT.sh
index 79083b0f28c3f6d7c8ada648f449a1f2de8995ba..2ea66e76fe0073ba2e9bd0d3dc920a1a25c66237 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_FullG4MT_QS_ttbar_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN2_FullG4MT_QS_ttbar_MT.sh
@@ -1,8 +1,8 @@
#!/bin/sh
#
-# art-description: MC23-style RUN2 simulation using FullG4MT_QS in AthenaMT
-# art-include: 23.0/Athena
-# art-include: 23.0/AthSimulation
+# art-description: MC23-style RUN2 simulation using best knowledge geometry and FullG4MT_QS in AthenaMT
+# art-include: 24.0/Athena
+# art-include: 24.0/AthSimulation
# art-include: main/Athena
# art-include: main/AthSimulation
# art-type: grid
@@ -15,11 +15,11 @@
export ATHENA_CORE_NUMBER=8
# RUN3 setup
-# ATLAS-R2-2016-01-02-01 and OFLCOND-MC21-SDR-RUN3-07
+# ATLAS-R2-2016-01-02-01 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
--CA \
--multithreaded \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'PyJobTransforms.UseFrontier' \
--preInclude 'EVNTtoHITS:Campaigns.MC23SimulationNoIoV' \
@@ -39,7 +39,7 @@ status=$rc
rc2=-9999
Sim_tf.py \
--multithreaded \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationNoIoV.py' \
@@ -53,7 +53,7 @@ Sim_tf.py \
Sim_tf.py \
--multithreaded \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationNoIoV.py' \
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_2023_FullG4MT_QS_ttbar_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_2023_FullG4MT_QS_ttbar_MT.sh
index 872df3c39770c3455488771be681306c813341e9..9acb76c9733d3caa7f76d1e4d8f2f9204e542872 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_2023_FullG4MT_QS_ttbar_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_2023_FullG4MT_QS_ttbar_MT.sh
@@ -3,6 +3,8 @@
# art-description: Run simulation using ISF with the FullG4MT_QS simulator, reading 13.6 TeV ttbar events, writing HITS, using the best knowledge RUN3 geometry and MC23 conditions
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
+# art-include: 24.0/Athena
+# art-include: 24.0/AthSimulation
# art-include: main/Athena
# art-include: main/AthSimulation
# art-type: grid
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3F_G4MS_ttbar_MP.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3F_G4MS_ttbar_MP.sh
index b937b9c2f66d6154dc510b0ebcf8df5493d9b926..3d0feade9d114387252e366a7cc50fd0929b9c3f 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3F_G4MS_ttbar_MP.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3F_G4MS_ttbar_MP.sh
@@ -2,7 +2,7 @@
#
# art-description: MC23-style Run3 simulation using ATLFAST3F_G4MS in AthenaMP
# art-type: grid
-# art-include: 23.0/Athena
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-athena-mt: 8
# art-architecture: '#x86_64-intel'
@@ -13,15 +13,15 @@
export ATHENA_CORE_NUMBER=8
# RUN3 setup
-# ATLAS-R3S-2021-03-01-00 and OFLCOND-MC21-SDR-RUN3-07
+# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
--CA \
--multiprocess \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3F_G4MS' \
--postInclude 'PyJobTransforms.UseFrontier' \
--preInclude 'EVNTtoHITS:Campaigns.MC23SimulationSingleIoV' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CA.HITS.pool.root" \
--maxEvents 50 \
@@ -37,11 +37,11 @@ status=$rc
rc2=-9999
Sim_tf.py \
--multiprocess \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3F_G4MS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CA.HITS.pool.root" \
--maxEvents 50 \
@@ -50,11 +50,11 @@ Sim_tf.py \
Sim_tf.py \
--multiprocess \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3F_G4MS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CG.HITS.pool.root" \
--maxEvents 50 \
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_QS_ttbar_MP.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_QS_ttbar_MP.sh
index 5e8b8945599ebd5b991e5226248bdfbd8e8be032..6ebec3429ce0ff9518dd2004e6a1188b6cf901fa 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_QS_ttbar_MP.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_QS_ttbar_MP.sh
@@ -2,6 +2,7 @@
#
# art-description: MC23-style RUN3 simulation using ATLFAST3MT_QS in AthenaMP
# art-include: 23.0/Athena
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-type: grid
# art-athena-mt: 8
@@ -13,15 +14,15 @@
export ATHENA_CORE_NUMBER=8
# RUN3 setup
-# ATLAS-R3S-2021-03-01-00 and OFLCOND-MC21-SDR-RUN3-07
+# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
--CA \
--multiprocess \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3MT_QS' \
--postInclude 'PyJobTransforms.UseFrontier' \
--preInclude 'EVNTtoHITS:Campaigns.MC23SimulationSingleIoV' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CA.HITS.pool.root" \
--maxEvents 50 \
@@ -37,11 +38,11 @@ status=$rc
rc2=-9999
Sim_tf.py \
--multiprocess \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CA.HITS.pool.root" \
--maxEvents 50 \
@@ -50,11 +51,11 @@ Sim_tf.py \
Sim_tf.py \
--multiprocess \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CG.HITS.pool.root" \
--maxEvents 50 \
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_QS_ttbar_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_QS_ttbar_MT.sh
index bb4e0003c1792268d0085a07e961088352634f4d..402617d25924091892b16ede601225eef02810f7 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_QS_ttbar_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_QS_ttbar_MT.sh
@@ -2,6 +2,7 @@
#
# art-description: MC23-style RUN3 simulation using ATLFAST3MT_QS in AthenaMT
# art-include: 23.0/Athena
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-type: grid
# art-athena-mt: 8
@@ -13,15 +14,15 @@
export ATHENA_CORE_NUMBER=8
# RUN3 setup
-# ATLAS-R3S-2021-03-01-00 and OFLCOND-MC21-SDR-RUN3-07
+# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
--CA \
--multithreaded \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3MT_QS' \
--postInclude 'PyJobTransforms.UseFrontier' \
--preInclude 'EVNTtoHITS:Campaigns.MC23aSimulationMultipleIoV' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CA.HITS.pool.root" \
--maxEvents 50 \
@@ -37,11 +38,11 @@ status=$rc
rc2=-9999
Sim_tf.py \
--multithreaded \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CA.HITS.pool.root" \
--maxEvents 50 \
@@ -51,11 +52,11 @@ Sim_tf.py \
Sim_tf.py \
--multithreaded \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CG.HITS.pool.root" \
--maxEvents 50 \
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_ttbar_MP.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_ttbar_MP.sh
index cd5df6a7194f0fb9d54166cd91af320b7817f54a..3baa53671d1d7fd1802716c0040a903fe5b03e78 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_ttbar_MP.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_ttbar_MP.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
# art-description: MC23-style RUN3 simulation using ATLFAST3MT in AthenaMP
-# art-include: 23.0/Athena
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-type: grid
# art-athena-mt: 8
@@ -13,15 +13,15 @@
export ATHENA_CORE_NUMBER=8
# RUN3 setup
-# ATLAS-R3S-2021-03-01-00 and OFLCOND-MC21-SDR-RUN3-07
+# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
--CA \
--multiprocess \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3MT' \
--postInclude 'PyJobTransforms.UseFrontier' \
--preInclude 'EVNTtoHITS:Campaigns.MC23SimulationSingleIoV' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CA.HITS.pool.root" \
--maxEvents 50 \
@@ -37,11 +37,11 @@ status=$rc
rc2=-9999
Sim_tf.py \
--multiprocess \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3MT' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CA.HITS.pool.root" \
--maxEvents 50 \
@@ -50,11 +50,11 @@ Sim_tf.py \
Sim_tf.py \
--multiprocess \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3MT' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CG.HITS.pool.root" \
--maxEvents 50 \
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_ttbar_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_ttbar_MT.sh
index 19755f9dff80ce9ffa8f3d3db7c1456f97b39056..5dc7a03e58635136a4b0f09b2e4f6c4cdea66ae7 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_ttbar_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFAST3MT_ttbar_MT.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
# art-description: MC23-style RUN3 simulation using ATLFAST3MT in AthenaMT
-# art-include: 23.0/Athena
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-type: grid
# art-athena-mt: 8
@@ -13,15 +13,15 @@
export ATHENA_CORE_NUMBER=8
# RUN3 setup
-# ATLAS-R3S-2021-03-01-00 and OFLCOND-MC21-SDR-RUN3-07
+# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
--CA \
--multithreaded \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3MT' \
--postInclude 'PyJobTransforms.UseFrontier' \
--preInclude 'EVNTtoHITS:Campaigns.MC23aSimulationMultipleIoV' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CA.HITS.pool.root" \
--maxEvents 50 \
@@ -37,11 +37,11 @@ status=$rc
rc2=-9999
Sim_tf.py \
--multithreaded \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3MT' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CA.HITS.pool.root" \
--maxEvents 50 \
@@ -51,11 +51,11 @@ Sim_tf.py \
Sim_tf.py \
--multithreaded \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'ATLFAST3MT' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CG.HITS.pool.root" \
--maxEvents 50 \
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFASTIIF_G4MS_ttbar_MP.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFASTIIF_G4MS_ttbar_MP.sh
deleted file mode 100755
index fff6c37077dac243ec39bb7b4d9113ee13009cd4..0000000000000000000000000000000000000000
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_ATLFASTIIF_G4MS_ttbar_MP.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-#
-# art-description: MC23-style Run3 simulation using ATLFASTIIF_G4MS in AthenaMP
-# art-type: grid
-# art-include: 23.0/Athena
-# art-include: main/Athena
-# art-athena-mt: 8
-# art-architecture: '#x86_64-intel'
-# art-output: test.*.HITS.pool.root
-# art-output: log.*
-# art-output: Config*.pkl
-
-export ATHENA_CORE_NUMBER=8
-
-# RUN3 setup
-# ATLAS-R3S-2021-03-01-00 and OFLCOND-MC21-SDR-RUN3-07
-Sim_tf.py \
- --CA \
- --multiprocess \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
- --simulator 'ATLFASTIIF_G4MS' \
- --postInclude 'PyJobTransforms.UseFrontier' \
- --preInclude 'EVNTtoHITS:Campaigns.MC23SimulationSingleIoV' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
- --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
- --outputHITSFile "test.CA.HITS.pool.root" \
- --maxEvents 50 \
- --postExec 'EVNTtoHITS:with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
- --imf False
-
-rc=$?
-mv log.EVNTtoHITS log.EVNTtoHITS.CA
-mv log.HITSMergeAthenaMP0 log.HITSMergeAthenaMP0.CA
-echo "art-result: $rc simCA"
-status=$rc
-
-rc2=-9999
-Sim_tf.py \
- --multiprocess \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
- --simulator 'ATLFASTIIF_G4MS' \
- --postInclude 'default:PyJobTransforms/UseFrontier.py' \
- --preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
- --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
- --outputHITSFile "test.CA.HITS.pool.root" \
- --maxEvents 50 \
- --imf False \
- --athenaopts 'EVNTtoHITS:"--config-only=ConfigSimCG.pkl"'
-
-Sim_tf.py \
- --multiprocess \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
- --simulator 'ATLFASTIIF_G4MS' \
- --postInclude 'default:PyJobTransforms/UseFrontier.py' \
- --preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
- --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
- --outputHITSFile "test.CG.HITS.pool.root" \
- --maxEvents 50 \
- --imf False
-
-rc2=$?
-mv log.EVNTtoHITS log.EVNTtoHITS.CG
-mv log.HITSMergeAthenaMP0 log.HITSMergeAthenaMP0.CG
-echo "art-result: $rc2 simOLD"
-if [ $status -eq 0 ]
-then
- status=$rc2
-fi
-
-rc3=-9999
-if [ $status -eq 0 ]
-then
- # Compare the outputs
- acmd.py diff-root test.CG.HITS.pool.root test.CA.HITS.pool.root \
- --error-mode resilient \
- --mode semi-detailed \
- --order-trees
- rc3=$?
- status=$rc3
-fi
-
-echo "art-result: $rc3 OLDvsCA"
-rc4=-9999
-if [ $rc2 -eq 0 ]
-then
- ArtPackage=$1
- ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --order-trees --mode=semi-detailed --diff-root --file=test.CG.HITS.pool.root
- rc4=$?
- status=$rc4
-fi
-echo "art-result: $rc4 regression"
-
-exit $status
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_CalibrationHits_pions_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_CalibrationHits_pions_MT.sh
index e6fa2c984cd499727dfada59b5de709888579593..aa94700e3427fd8a7b2f1c48bdcbd5b3e8067630 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_CalibrationHits_pions_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_CalibrationHits_pions_MT.sh
@@ -3,6 +3,8 @@
# art-description: MC23-style RUN3 simulation using FullG4MT_QS in AthenaMT, reading single pion events, writing HITS including full CaloCalibrationHit information
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
+# art-include: 24.0/Athena
+# art-include: 24.0/AthSimulation
# art-include: main/Athena
# art-include: main/AthSimulation
# art-type: grid
@@ -15,7 +17,7 @@
export ATHENA_CORE_NUMBER=8
# RUN3 setup
-# ATLAS-R3S-2021-03-01-00 and OFLCOND-MC16-SDR-RUN3-05
+# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
--CA \
--multithreaded \
@@ -24,8 +26,8 @@ Sim_tf.py \
--outputHITSFile 'test.CA.HITS.pool.root' \
--maxEvents '10' \
--skipEvents '0' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--preInclude 'EVNTtoHITS:Campaigns.MC23SimulationSingleIoVCalibrationHits' \
--postInclude 'PyJobTransforms.TransformUtils.UseFrontier' \
--postExec 'EVNTtoHITS:with open("ConfigSimCA.pkl", "wb") as f: cfg.store(f)' \
@@ -43,8 +45,8 @@ Sim_tf.py \
--outputHITSFile 'test.CA.HITS.pool.root' \
--maxEvents '10' \
--skipEvents '0' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--preExec 'EVNTtoHITS:simFlags.ReleaseGeoModel=False;' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoVCalibrationHits.py' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
@@ -58,8 +60,8 @@ Sim_tf.py \
--outputHITSFile 'test.HITS.pool.root' \
--maxEvents '10' \
--skipEvents '0' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--preExec 'EVNTtoHITS:simFlags.ReleaseGeoModel=False;' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoVCalibrationHits.py' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_Monopoles_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_Monopoles_MT.sh
index 08c39acbdc0a06859fb3d392b51a2e248b2478bb..9443d0563f93e0410cdadbedad2c3cd60c74b8a3 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_Monopoles_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_Monopoles_MT.sh
@@ -3,6 +3,8 @@
# art-description: MC23-style RUN3 simulation of monopole samples using FullG4MT_QS
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
+# art-include: 24.0/Athena
+# art-include: 24.0/AthSimulation
# art-include: main/Athena
# art-include: main/AthSimulation
# art-type: grid
@@ -24,7 +26,7 @@ Sim_tf.py \
--preInclude "EVNTtoHITS:Campaigns.MC23aSimulationMultipleIoV,G4DebuggingTools.DebugMonopole" \
--skipEvents="0" \
--randomSeed="41" \
- --conditionsTag "default:OFLCOND-MC21-SDR-RUN3-07" \
+ --conditionsTag "default:OFLCOND-MC23-SDR-RUN3-01" \
--geometryVersion="default:ATLAS-R3S-2021-03-02-00" \
--runNumber="950542" \
--AMITag="s3890" \
@@ -50,7 +52,7 @@ Sim_tf.py \
--preInclude "EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py,SimulationJobOptions/preInclude.DebugMonopoles.py" \
--skipEvents="0" \
--randomSeed="41" \
- --conditionsTag "default:OFLCOND-MC21-SDR-RUN3-07" \
+ --conditionsTag "default:OFLCOND-MC23-SDR-RUN3-01" \
--geometryVersion="default:ATLAS-R3S-2021-03-02-00" \
--runNumber="950542" \
--AMITag="s3890" \
@@ -69,7 +71,7 @@ Sim_tf.py \
--preInclude "EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py,SimulationJobOptions/preInclude.DebugMonopoles.py" \
--skipEvents="0" \
--randomSeed="41" \
- --conditionsTag "default:OFLCOND-MC21-SDR-RUN3-07" \
+ --conditionsTag "default:OFLCOND-MC23-SDR-RUN3-01" \
--geometryVersion="default:ATLAS-R3S-2021-03-02-00" \
--runNumber="950542" \
--AMITag="s3890" \
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_Smuons_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_Smuons_MT.sh
index 1c838415b9b5108233f3f906e2b56cc0a344c674..07603a59e83a0052768d045e11193c7e7b1c2174 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_Smuons_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_Smuons_MT.sh
@@ -3,6 +3,8 @@
# art-description: MC23-style RUN3 simulation of smuon samples using FullG4MT_QS in AthenaMT - input needs to be updated to an official sample when available.
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
+# art-include: 24.0/Athena
+# art-include: 24.0/AthSimulation
# art-include: main/Athena
# art-include: main/AthSimulation
# art-type: grid
@@ -15,7 +17,7 @@
export ATHENA_PROC_NUMBER=8
export ATHENA_CORE_NUMBER=8
# RUN3 setup
-# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC21-SDR-RUN3-07
+# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
--CA \
--inputEVNTFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc21_13p6TeV.temp.DisplacedSmuonPairProduction.10events.pool.root" \
@@ -24,7 +26,7 @@ Sim_tf.py \
--preInclude "EVNTtoHITS:Campaigns.MC23aSimulationMultipleIoV,G4DebuggingTools.DebugSleptonsLLP" \
--skipEvents="0" \
--randomSeed="41" \
- --conditionsTag "default:OFLCOND-MC21-SDR-RUN3-07" \
+ --conditionsTag "default:OFLCOND-MC23-SDR-RUN3-01" \
--geometryVersion="default:ATLAS-R3S-2021-03-02-00" \
--runNumber="950542" \
--AMITag="s3890" \
@@ -48,7 +50,7 @@ Sim_tf.py \
--preInclude "EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py,SimulationJobOptions/preInclude.DebugSleptonsLLP.py" \
--skipEvents="0" \
--randomSeed="41" \
- --conditionsTag "default:OFLCOND-MC21-SDR-RUN3-07" \
+ --conditionsTag "default:OFLCOND-MC23-SDR-RUN3-01" \
--geometryVersion="default:ATLAS-R3S-2021-03-02-00" \
--runNumber="950542" \
--AMITag="s3890" \
@@ -67,7 +69,7 @@ Sim_tf.py \
--preInclude "EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py,SimulationJobOptions/preInclude.DebugSleptonsLLP.py" \
--skipEvents="0" \
--randomSeed="41" \
- --conditionsTag "default:OFLCOND-MC21-SDR-RUN3-07" \
+ --conditionsTag "default:OFLCOND-MC23-SDR-RUN3-01" \
--geometryVersion="default:ATLAS-R3S-2021-03-02-00" \
--runNumber="950542" \
--AMITag="s3890" \
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ZPrime_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ZPrime_MT.sh
index fb660819c2e26055d74fd5e6500f4cb244d26990..1217c1d2fbe4362268539b63b3e3ae2f3bf0c0e0 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ZPrime_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ZPrime_MT.sh
@@ -3,6 +3,8 @@
# art-description: MC23-style Run3 simulation using FullG4MT_QS (13.6 TeV Zprime input) in AthenaMT
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
+# art-include: 24.0/Athena
+# art-include: 24.0/AthSimulation
# art-include: main/Athena
# art-include: main/AthSimulation
# art-type: grid
@@ -16,11 +18,11 @@
export ATHENA_CORE_NUMBER=8
# RUN3 setup
-# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC21-SDR-RUN3-07
+# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
--CA \
--multithreaded \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'PyJobTransforms.UseFrontier' \
--preInclude 'EVNTtoHITS:Campaigns.MC23aSimulationMultipleIoV' \
@@ -40,7 +42,7 @@ status=$rc
Sim_tf.py \
--multithreaded \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py' \
@@ -55,7 +57,7 @@ Sim_tf.py \
Sim_tf.py \
--multithreaded \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py' \
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_minbias_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_minbias_MT.sh
index deb06a164fcecc77dbe21031bd307d8da37914cd..756cd0a33f48d60d74d833f8056bc2609f17c5f7 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_minbias_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_minbias_MT.sh
@@ -2,6 +2,7 @@
#
# art-description: MC23-style RUN3 simulation using FullG4MT_QS in AthenaMT
# art-include: 23.0/Athena
+# art-include: 24.0/Athena
# art-include: main/Athena
# art-type: grid
# art-athena-mt: 8
@@ -13,16 +14,16 @@
export ATHENA_CORE_NUMBER=8
# RUN3 setup
-# ATLAS-R3S-2021-03-01-00 and OFLCOND-MC21-SDR-RUN3-07
+# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
--CA \
--multithreaded \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postExec 'all:from IOVDbSvcConfig import addOverride;cfg.merge(addOverride(flags, "/Indet/Beampos", "IndetBeampos-RunDep-MC21-BestKnowledge-002"))' \
--postInclude 'PyJobTransforms.UseFrontier' \
--preInclude 'EVNTtoHITS:Campaigns.MC23SimulationSingleIoV' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc22_pre/valid2.900311.Epos_minbias_inelastic_lowjetphoton.evgen.EVNT.e8480/EVNT.30415957._001017.pool.root.1" \
--outputHITSFile "test.CA.HITS.pool.root" \
--maxEvents 200 \
@@ -37,12 +38,12 @@ status=$rc
rc2=-9999
Sim_tf.py \
--multithreaded \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postExec 'all:conddb.addOverride("/Indet/Beampos", "IndetBeampos-RunDep-MC21-BestKnowledge-002");' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc22_pre/valid2.900311.Epos_minbias_inelastic_lowjetphoton.evgen.EVNT.e8480/EVNT.30415957._001017.pool.root.1" \
--outputHITSFile "test.CA.HITS.pool.root" \
--maxEvents 200 \
@@ -51,12 +52,12 @@ Sim_tf.py \
Sim_tf.py \
--multithreaded \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postExec 'all:conddb.addOverride("/Indet/Beampos", "IndetBeampos-RunDep-MC21-BestKnowledge-002");' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc22_pre/valid2.900311.Epos_minbias_inelastic_lowjetphoton.evgen.EVNT.e8480/EVNT.30415957._001017.pool.root.1" \
--outputHITSFile "test.CG.HITS.pool.root" \
--maxEvents 200 \
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MP.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MP.sh
index 4dd942642c57ab5f9b948361284891ff7515c409..6e86db023558abdb652c8ff7b3300e1905348fc9 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MP.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MP.sh
@@ -3,6 +3,8 @@
# art-description: MC23-style RUN3 simulation using FullG4MT_QS in AthenaMP
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
+# art-include: 24.0/Athena
+# art-include: 24.0/AthSimulation
# art-include: main/Athena
# art-include: main/AthSimulation
# art-type: grid
@@ -15,15 +17,15 @@
export ATHENA_CORE_NUMBER=8
# RUN3 setup
-# ATLAS-R3S-2021-03-01-00 and OFLCOND-MC21-SDR-RUN3-07
+# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
--CA \
--multiprocess \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'PyJobTransforms.UseFrontier' \
--preInclude 'EVNTtoHITS:Campaigns.MC23SimulationSingleIoV' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CA.HITS.pool.root" \
--maxEvents 50 \
@@ -39,11 +41,11 @@ status=$rc
rc2=-9999
Sim_tf.py \
--multiprocess \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CA.HITS.pool.root" \
--maxEvents 50 \
@@ -52,11 +54,11 @@ Sim_tf.py \
Sim_tf.py \
--multiprocess \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CG.HITS.pool.root" \
--maxEvents 50 \
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MPvsST.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MPvsST.sh
index fb428071abe13364514d5a24f3b0f060ed6d86f5..dda0b437ef3d8b3235a518e5fc3a3c624b495536 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MPvsST.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MPvsST.sh
@@ -3,6 +3,8 @@
# art-description: Run MP and ST simulation, reading ttbar events, writing HITS, using MC23a geometry and conditions
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
+# art-include: 24.0/Athena
+# art-include: 24.0/AthSimulation
# art-include: main/Athena
# art-include: main/AthSimulation
# art-type: grid
@@ -21,7 +23,7 @@ Sim_tf.py \
--outputHITSFile "test.MP.HITS.pool.root" \
--maxEvents 50 \
--geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoV.py' \
@@ -34,7 +36,7 @@ Sim_tf.py \
--outputHITSFile "test.MP.HITS.pool.root" \
--maxEvents 50 \
--geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoV.py' \
@@ -52,7 +54,7 @@ Sim_tf.py \
--outputHITSFile "test.MP.HITS.pool.root" \
--maxEvents 50 \
--geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoV.py' \
@@ -64,7 +66,7 @@ Sim_tf.py \
--outputHITSFile "temp.ST.HITS.pool.root" \
--maxEvents 50 \
--geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoV.py' \
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MT.sh
index e652f0f5a31add3d06e591fb52c4e651af3524f7..dfc290b19ba417ee9779eefa2ba9f3675a54f476 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MT.sh
@@ -3,6 +3,8 @@
# art-description: MC23-style RUN3 simulation using FullG4MT_QS in AthenaMT
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
+# art-include: 24.0/Athena
+# art-include: 24.0/AthSimulation
# art-include: main/Athena
# art-include: main/AthSimulation
# art-type: grid
@@ -15,15 +17,15 @@
export ATHENA_CORE_NUMBER=8
# RUN3 setup
-# ATLAS-R3S-2021-03-01-00 and OFLCOND-MC21-SDR-RUN3-07
+# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
--CA \
--multithreaded \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'PyJobTransforms.UseFrontier' \
--preInclude 'EVNTtoHITS:Campaigns.MC23aSimulationMultipleIoV' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CA.HITS.pool.root" \
--maxEvents 50 \
@@ -38,11 +40,11 @@ status=$rc
Sim_tf.py \
--multithreaded \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CA.HITS.pool.root" \
--maxEvents 50 \
@@ -52,11 +54,11 @@ Sim_tf.py \
Sim_tf.py \
--multithreaded \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CG.HITS.pool.root" \
--maxEvents 50 \
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MTvsST.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MTvsST.sh
index f623a13420728d2a45ac6c30b5ecdd57d0a487f3..c5e46666de68cae792aaf7f4335b436fbbc50cfc 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MTvsST.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_QS_ttbar_MTvsST.sh
@@ -3,6 +3,8 @@
# art-description: Run MT and ST simulation, reading ttbar events, writing HITS, using MC23a geometry and conditions
# art-include: 23.0/Athena
# art-include: 23.0/AthSimulation
+# art-include: 24.0/Athena
+# art-include: 24.0/AthSimulation
# art-include: main/Athena
# art-include: main/AthSimulation
# art-type: grid
@@ -21,7 +23,7 @@ Sim_tf.py \
--outputHITSFile "test.MT.HITS.pool.root" \
--maxEvents 50 \
--geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py' \
@@ -35,7 +37,7 @@ Sim_tf.py \
--outputHITSFile "test.MT.HITS.pool.root" \
--maxEvents 50 \
--geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py' \
@@ -54,7 +56,7 @@ Sim_tf.py \
--outputHITSFile "test.ST.HITS.pool.root" \
--maxEvents 50 \
--geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py' \
@@ -67,7 +69,7 @@ Sim_tf.py \
--outputHITSFile "test.ST.HITS.pool.root" \
--maxEvents 50 \
--geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT_QS' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py' \
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_ttbar_MP.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_ttbar_MP.sh
index 25c3a150842c7611cd7343281e43e048d68ac9d3..994715bc78c3eacc880aaa9dc6175c4f09ff8c6a 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_ttbar_MP.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_ttbar_MP.sh
@@ -1,8 +1,8 @@
#!/bin/sh
#
# art-description: MC23-style RUN3 simulation using FullG4MT in AthenaMP
-# art-include: 23.0/Athena
-# art-include: 23.0/AthSimulation
+# art-include: 24.0/Athena
+# art-include: 24.0/AthSimulation
# art-include: main/Athena
# art-include: main/AthSimulation
# art-type: grid
@@ -15,15 +15,15 @@
export ATHENA_CORE_NUMBER=8
# RUN3 setup
-# ATLAS-R3S-2021-03-01-00 and OFLCOND-MC21-SDR-RUN3-07
+# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
--CA \
--multiprocess \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT' \
--postInclude 'PyJobTransforms.UseFrontier' \
--preInclude 'EVNTtoHITS:Campaigns.MC23SimulationSingleIoV' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CA.HITS.pool.root" \
--maxEvents 50 \
@@ -39,11 +39,11 @@ status=$rc
rc2=-9999
Sim_tf.py \
--multiprocess \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CA.HITS.pool.root" \
--maxEvents 50 \
@@ -52,11 +52,11 @@ Sim_tf.py \
Sim_tf.py \
--multiprocess \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23SimulationSingleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CG.HITS.pool.root" \
--maxEvents 50 \
diff --git a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_ttbar_MT.sh b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_ttbar_MT.sh
index 97b7d0e73b661ae319e6c8e463fa568086d39a3d..cef034e1084ba39219bc9ea20ed383cb2126784c 100755
--- a/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_ttbar_MT.sh
+++ b/Simulation/Tests/ISF_ValidationMT/test/test_RUN3_FullG4MT_ttbar_MT.sh
@@ -1,8 +1,8 @@
#!/bin/sh
#
# art-description: MC23-style RUN3 simulation using FullG4MT in AthenaMT
-# art-include: 23.0/Athena
-# art-include: 23.0/AthSimulation
+# art-include: 24.0/Athena
+# art-include: 24.0/AthSimulation
# art-include: main/Athena
# art-include: main/AthSimulation
# art-type: grid
@@ -15,15 +15,15 @@
export ATHENA_CORE_NUMBER=8
# RUN3 setup
-# ATLAS-R3S-2021-03-01-00 and OFLCOND-MC21-SDR-RUN3-07
+# ATLAS-R3S-2021-03-02-00 and OFLCOND-MC23-SDR-RUN3-01
Sim_tf.py \
--CA \
--multithreaded \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT' \
--postInclude 'PyJobTransforms.UseFrontier' \
--preInclude 'EVNTtoHITS:Campaigns.MC23aSimulationMultipleIoV' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CA.HITS.pool.root" \
--maxEvents 50 \
@@ -39,11 +39,11 @@ status=$rc
rc2=-9999
Sim_tf.py \
--multithreaded \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CA.HITS.pool.root" \
--maxEvents 50 \
@@ -53,11 +53,11 @@ Sim_tf.py \
Sim_tf.py \
--multithreaded \
- --conditionsTag 'default:OFLCOND-MC21-SDR-RUN3-07' \
+ --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
--simulator 'FullG4MT' \
--postInclude 'default:PyJobTransforms/UseFrontier.py' \
--preInclude 'EVNTtoHITS:Campaigns/MC23aSimulationMultipleIoV.py' \
- --geometryVersion 'default:ATLAS-R3S-2021-03-01-00' \
+ --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/mc21/EVNT/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.evgen.EVNT.e8453/EVNT.29328277._003902.pool.root.1" \
--outputHITSFile "test.CG.HITS.pool.root" \
--maxEvents 50 \