Merge branch 'FixSimExoticsTests_22.0' into '22.0'

Fix syntax for SimExoticsTests and enable the ART jobs for 22.0

See merge request !57108

Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos.sh

@@ -3,6 +3,8 @@
 # art-description: MC16-style simulation of decaying Charginos using FullG4 (tests Charginos and Gauginos packages)
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
+# art-include: 22.0/Athena
+# art-include: 22.0/AthSimulation
 # art-include: master/Athena
 # art-include: master/AthSimulation
 # art-output: *.root
@@ -38,7 +40,7 @@ Sim_tf.py \
     --truthStrategy 'MC15aPlusLLP' \
     --simulator 'FullG4MT' \
     --postInclude 'default:PyJobTransforms/UseFrontier.py' \
-    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions.DebugAMSB.py' \
+    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.DebugAMSB.py' \
     --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
     --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mc15_13TeV.448307.MGPy8EG_A14N23LO_mAMSB_C1C1_5000_208000_LL4p0_MET60.evgen.EVNT.e6962.EVNT.15631425._000001.pool.root.1" \
     --outputHITSFile "CA.HITS.pool.root" \
@@ -51,7 +53,7 @@ Sim_tf.py \
     --truthStrategy 'MC15aPlusLLP' \
     --simulator 'FullG4MT' \
     --postInclude 'default:PyJobTransforms/UseFrontier.py' \
-    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions.DebugAMSB.py' \
+    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.DebugAMSB.py' \
     --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
     --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mc15_13TeV.448307.MGPy8EG_A14N23LO_mAMSB_C1C1_5000_208000_LL4p0_MET60.evgen.EVNT.e6962.EVNT.15631425._000001.pool.root.1" \
     --outputHITSFile "CG.HITS.pool.root" \

Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos_busy.sh

@@ -3,6 +3,8 @@
 # art-description: MC16-style simulation of decaying Charginos (busy events) using FullG4 (tests Charginos and Gauginos packages)
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
+# art-include: 22.0/Athena
+# art-include: 22.0/AthSimulation
 # art-include: master/Athena
 # art-include: master/AthSimulation
 # art-output: *.root
@@ -38,7 +40,7 @@ Sim_tf.py \
     --truthStrategy 'MC15aPlusLLP' \
     --simulator 'FullG4MT' \
     --postInclude 'default:PyJobTransforms/UseFrontier.py' \
-    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions.DebugAMSB.py' \
+    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.DebugAMSB.py' \
     --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
     --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mc15_13TeV.448300.MGPy8EG_A14N23LO_GG_mixedC1LLP_0p2_1400_1200.evgen.EVNT.e7183.EVNT.16706750._000001.pool.root.1" \
     --outputHITSFile "CA.HITS.pool.root" \
@@ -52,7 +54,7 @@ Sim_tf.py \
     --truthStrategy 'MC15aPlusLLP' \
     --simulator 'FullG4MT' \
     --postInclude 'default:PyJobTransforms/UseFrontier.py' \
-    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions.DebugAMSB.py' \
+    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.DebugAMSB.py' \
     --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
     --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mc15_13TeV.448300.MGPy8EG_A14N23LO_GG_mixedC1LLP_0p2_1400_1200.evgen.EVNT.e7183.EVNT.16706750._000001.pool.root.1" \
     --outputHITSFile "CG.HITS.pool.root" \

Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingLightSleptons.sh

@@ -3,6 +3,8 @@
 # art-description: MC16-style simulation of decaying light sleptons using FullG4 (tests Sleptons + Gauginos)
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
+# art-include: 22.0/Athena
+# art-include: 22.0/AthSimulation
 # art-include: master/Athena
 # art-include: master/AthSimulation
 # art-output: *.root
@@ -40,7 +42,7 @@ Sim_tf.py \
     --truthStrategy 'MC15aPlusLLP' \
     --simulator 'FullG4MT' \
     --postInclude 'default:PyJobTransforms/UseFrontier.py' \
-    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions.DebugSleptonsLLP.py' \
+    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.DebugSleptonsLLP.py' \
     --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
     --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mc15_13TeV.399030.MGPy8EG_A14NNPDF23LO_SlepSlep_directLLP_100_0_0p01ns.evgen.EVNT.e7067.EVNT.16242732._000001.pool.root.1" \
     --outputHITSFile "CA.HITS.pool.root" \
@@ -53,7 +55,7 @@ Sim_tf.py \
     --truthStrategy 'MC15aPlusLLP' \
     --simulator 'FullG4MT' \
     --postInclude 'default:PyJobTransforms/UseFrontier.py' \
-    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions.DebugSleptonsLLP.py' \
+    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.DebugSleptonsLLP.py' \
     --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
     --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mc15_13TeV.399030.MGPy8EG_A14NNPDF23LO_SlepSlep_directLLP_100_0_0p01ns.evgen.EVNT.e7067.EVNT.16242732._000001.pool.root.1" \
     --outputHITSFile "CG.HITS.pool.root" \

Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingNeutralinos.sh

@@ -3,6 +3,8 @@
 # art-description: MC16-style simulation of decaying Neutralinos using FullG4 (tests sim response to many displaced “primary” particles)
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
+# art-include: 22.0/Athena
+# art-include: 22.0/AthSimulation
 # art-include: master/Athena
 # art-include: master/AthSimulation
 # art-output: *.root

Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingStaus.sh

@@ -3,6 +3,8 @@
 # art-description: MC16-style simulation of decaying staus using FullG4 (tests the Sleptons + Gauginos packages)
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
+# art-include: 22.0/Athena
+# art-include: 22.0/AthSimulation
 # art-include: master/Athena
 # art-include: master/AthSimulation
 # art-output: *.root
@@ -38,7 +40,7 @@ Sim_tf.py \
     --truthStrategy 'MC15aPlusLLP' \
     --simulator 'FullG4MT' \
     --postInclude 'default:PyJobTransforms/UseFrontier.py' \
-    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions.DebugSleptonsLLP.py' \
+    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.DebugSleptonsLLP.py' \
     --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
     --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mc15_13TeV.399007.MGPy8EG_A14NNPDF23LO_StauStau_directLLP_100_0_1ns.evgen.EVNT.e7067.EVNT.16137672._000001.pool.root.1" \
     --outputHITSFile "CA.HITS.pool.root" \
@@ -51,7 +53,7 @@ Sim_tf.py \
     --truthStrategy 'MC15aPlusLLP' \
     --simulator 'FullG4MT' \
     --postInclude 'default:PyJobTransforms/UseFrontier.py' \
-    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions.DebugSleptonsLLP.py' \
+    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.DebugSleptonsLLP.py' \
     --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
     --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mc15_13TeV.399007.MGPy8EG_A14NNPDF23LO_StauStau_directLLP_100_0_1ns.evgen.EVNT.e7067.EVNT.16137672._000001.pool.root.1" \
     --outputHITSFile "CG.HITS.pool.root" \

Simulation/Tests/SimExoticsTests/test/test_FullG4_StableCharginos.sh

@@ -3,6 +3,8 @@
 # art-description: MC16-style simulation of stable Charginos using FullG4 (tests the Charginos package alone)
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
+# art-include: 22.0/Athena
+# art-include: 22.0/AthSimulation
 # art-include: master/Athena
 # art-include: master/AthSimulation
 # art-output: *.root
@@ -38,7 +40,7 @@ Sim_tf.py \
     --truthStrategy 'MC15aPlusLLP' \
     --simulator 'FullG4MT' \
     --postInclude 'default:PyJobTransforms/UseFrontier.py' \
-    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions.DebugAMSB.py' \
+    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.DebugAMSB.py' \
     --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
     --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mc15_13TeV.404460.MGPy8EG_A14N23LO_mAMSB_C1C1_5000_68000_Stable.evgen.EVNT.e5654.EVNT.13360885._000001.pool.root.1" \
     --outputHITSFile "CA.HITS.pool.root" \
@@ -51,7 +53,7 @@ Sim_tf.py \
     --truthStrategy 'MC15aPlusLLP' \
     --simulator 'FullG4MT' \
     --postInclude 'default:PyJobTransforms/UseFrontier.py' \
-    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions.DebugAMSB.py' \
+    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.DebugAMSB.py' \
     --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
     --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mc15_13TeV.404460.MGPy8EG_A14N23LO_mAMSB_C1C1_5000_68000_Stable.evgen.EVNT.e5654.EVNT.13360885._000001.pool.root.1" \
     --outputHITSFile "CG.HITS.pool.root" \

Simulation/Tests/SimExoticsTests/test/test_FullG4_StableSleptons.sh

@@ -3,6 +3,8 @@
 # art-description: MC16-style simulation of stable Sleptons using FullG4 (tests Sleptons package alone)
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
+# art-include: 22.0/Athena
+# art-include: 22.0/AthSimulation
 # art-include: master/Athena
 # art-include: master/AthSimulation
 # art-output: *.root