Merge branch 'tstreble-24.0-patch-a8a7' into '24.0'

Drop CA RDOtoRDOTrigger:False

See merge request atlas/athena!69505

InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_zprime_tide.sh

@@ -39,7 +39,7 @@ Reco_tf.py \
     --geometryVersion="default:ATLAS-R3S-2021-03-02-00" \
     --digiSeedOffset1="8" \
     --digiSeedOffset2="8" \
-    --CA "default:True" "RDOtoRDOTrigger:False" \
+    --CA "default:True" \
     --steering "doRDO_TRIG" "doTRIGtoALL" \
     --outputDAOD_IDTIDEFile="DAOD_TIDE.pool.root"  \
     --outputRDOFile output.RDO.root \

MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q442_RAWtoALL_MT.sh

@@ -51,7 +51,7 @@ cd 1thread
 
 #####################################################################
 # now run reconstruction with AthenaMT with 1 thread
-Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
+Reco_tf.py --CA 'all:True' \
            --AMI q442 \
            --preExec "all:flags.DQ.Steering.doHLTMon=False" \
            --imf False \
@@ -73,7 +73,7 @@ cd 5thread
 
 #####################################################################
 # now run reconstruction with AthenaMT with 5 threads
-Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
+Reco_tf.py --CA 'all:True' \
            --AMI q442 \
            --preExec "all:flags.DQ.Steering.doHLTMon=False" \
            --imf False \
@@ -95,7 +95,7 @@ cd 8thread
 
 #####################################################################
 # now run reconstruction with AthenaMT with 8 threads
-Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
+Reco_tf.py --CA 'all:True' \
            --AMI q442 \
            --preExec "all:flags.DQ.Steering.doHLTMon=False" \
            --imf False \

MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q443_RAWtoALL_MT.sh

@@ -34,7 +34,7 @@ mkdir Serial
 cd Serial
 
 #####################################################################
-Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
+Reco_tf.py --CA 'all:True' \
            --AMI q443 \
            --conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-11' 'RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02' \
            --postInclude "RAWtoALL:MuonPRDTest.NSWPRDValAlgReco.NSWPRDValAlgRecoCfg" \
@@ -60,7 +60,7 @@ cd 1thread
 
 #####################################################################
 # now run reconstruction with AthenaMT with 1 thread
-Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
+Reco_tf.py --CA 'all:True' \
            --AMI q443 \
            --conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-11' 'RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02' \
            --multithreaded \
@@ -85,7 +85,7 @@ cd 5thread
 
 #####################################################################
 # now run reconstruction with AthenaMT with 5 threads
-Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
+Reco_tf.py --CA 'all:True' \
            --AMI q443 \
            --conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-11' 'RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02' \
            --imf False \
@@ -110,7 +110,7 @@ cd 8thread
 
 #####################################################################
 # now run reconstruction with AthenaMT with 8 threads
-Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
+Reco_tf.py --CA 'all:True' \
            --AMI q443 \
            --conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-11' 'RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02' \
            --imf False \

PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_FTAG_AOD_withtrackless_MC_grid.sh

@@ -14,7 +14,7 @@ ATHENA_CORE_NUMBER=4 Reco_tf.py \
 --multithreaded \
 --AMIConfig q445 \
 --imf False \
---CA all:True RDOtoRDOTrigger:False \
+--CA all:True \
 --preExec="all:flags.BTagging.Trackless=True" \
 --maxEvents 25
 

PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_FTAG_AOD_withtrackless_data_grid.sh

@@ -14,7 +14,7 @@ ATHENA_CORE_NUMBER=4 Reco_tf.py \
 --multithreaded \
 --AMIConfig q449 \
 --imf False \
---CA all:True RDOtoRDOTrigger:False \
+--CA all:True \
 --preExec="all:flags.BTagging.Trackless=True" \
 --maxEvents 25
 

PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_trigAna_FTAG_PhysicsVariablePlots_AOD_grid.py

@@ -25,7 +25,7 @@ rdo2aod.max_events = 800
 rdo2aod.threads = 4
 rdo2aod.concurrent_events = 4
 rdo2aod.args = '--outputAODFile=AOD.pool.root --steering="doRDO_TRIG"'
-rdo2aod.args += ' --CA "default:True" "RDOtoRDOTrigger:False"'
+rdo2aod.args += ' --CA "default:True"'
 rdo2aod.args += ' --preExec="all:{:s};"'.format(preExec)
 
 

Reconstruction/Jet/JetValidation/test/test_jet.sh

@@ -11,7 +11,7 @@
 export ATHENA_CORE_NUMBER=8
 Reco_tf.py \
   --AMI q443 \
-  --CA "all:True" "RDOtoRDOTrigger:False" \
+  --CA "all:True" \
   --sharedWriter True \
   --steering 'doRDO_TRIG' 'doTRIGtoALL' \
   --outputAODFile myAOD.pool.root \

Reconstruction/Jet/JetValidation/test/test_jet_noPtCut.sh

@@ -11,7 +11,7 @@
 export ATHENA_CORE_NUMBER=8
 Reco_tf.py \
   --AMI q443 \
-  --CA "all:True" "RDOtoRDOTrigger:False" \
+  --CA "all:True" \
   --sharedWriter True \
   --steering 'doRDO_TRIG' 'doTRIGtoALL' \
   --outputAODFile myAOD.pool.root \

Reconstruction/Jet/JetValidation/test/test_met.sh

@@ -11,7 +11,7 @@
 export ATHENA_CORE_NUMBER=8
 Reco_tf.py \
   --AMI q443 \
-  --CA "all:True" "RDOtoRDOTrigger:False" \
+  --CA "all:True" \
   --sharedWriter True \
   --steering 'doRDO_TRIG' 'doTRIGtoALL' \
   --outputAODFile myAOD.pool.root \

Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV_hi_withtrigger.sh

@@ -9,7 +9,7 @@
 export ATHENA_CORE_NUMBER=8
 
 Reco_tf.py \
---CA "all:True" "RDOtoRDOTrigger:False" \
+--CA "all:True" \
 --multithreaded \
 --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc21_13p6TeV/HITSFiles/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.simul.HITS.e8453_s3873/HITS.29625927._000632.pool.root.1 \
 --steering 'doRDO_TRIG' \

Tools/Tier0ChainTests/test/test_q443.sh

@@ -11,7 +11,7 @@
 
 Reco_tf.py \
 --AMI=q443 \
---CA "all:True" "RDOtoRDOTrigger:False" \
+--CA "all:True" \
 --conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-11' 'RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02' \
 --multithreaded \
 --maxEvents=500 \

Tools/Tier0ChainTests/test/test_q443_serial.sh

@@ -9,7 +9,7 @@
 # art-include: 24.0/Athena
 
 Reco_tf.py \
---CA "all:True" "RDOtoRDOTrigger:False" \
+--CA "all:True" \
 --AMI=q443 \
 --conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-11' 'RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02' \
 --maxEvents=100 \

Tools/TrfTestsARTPlots/test/test_trf_q443_phys_physlite_ca.sh

@@ -9,7 +9,7 @@
 # art-html: dcube_physlite
 
 export ATHENA_CORE_NUMBER=8
-Reco_tf.py --CA "all:True" "RDOtoRDOTrigger:False" \
+Reco_tf.py --CA "all:True" \
   --AMI q443 \
   --steering doRDO_TRIG doTRIGtoALL \
   --outputAODFile myAOD.pool.root \

Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py

@@ -64,7 +64,7 @@ class TrigInDetReco(ExecStep):
         self.args = '--outputAODFile=AOD.pool.root --steering "doRDO_TRIG"'
         self.args += ' --CA'
         if not self._isCA:
-            self.args += ' "default:True" "RDOtoRDOTrigger:False"'
+            self.args += ' "default:True"'
 
        
         if ( self.postinclude_trig != '' ) :