Merge branch 'trigart_ca_main' into 'main'

TrigGpuTest+FPGATrackSim: remove redundant --CA from Reco_tf commands

See merge request !71467

Trigger/EFTracking/FPGATrackSim/FPGATrackSimConfTools/README.md

@@ -25,7 +25,7 @@ The simulation needs the map files to be steered to the correct/desired detector
 # How to run the simulation directly from the RDO,
 ```
 rdo_23p0=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/PhaseIIUpgrade/RDO/ATLAS-P2-RUN4-03-00-00/mc21_14TeV.900498.PG_single_muonpm_Pt100_etaFlatnp0_43.recon.RDO.e8481_s4149_r14697/RDO.33675668._000016.pool.root.1
-Reco_tf.py --CA \
+Reco_tf.py \
     --steering doRAWtoALL \
     --preExec "flags.Trigger.FPGATrackSim.wrapperFileName=None; flags.Trigger.FPGATrackSim.mapsDir='directory_with_map_files'" \
     --preInclude "InDetConfig.ConfigurationHelpers.OnlyTrackingPreInclude,ActsConfig.ActsCIFlags.actsValidateTracksFlags" \

Trigger/EFTracking/FPGATrackSim/FPGATrackSimConfTools/test/FPGATrackWorkflow/FPGATrackWrapperFileGeneration.sh

@@ -6,7 +6,7 @@ RDO="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/PhaseIIUpgrade/EFTracking
 RDO_EVT=200
 
 echo "... RDO to AOD with sim"
-Reco_tf.py --CA \
+Reco_tf.py \
     --steering doRAWtoALL \
     --preExec "flags.Trigger.FPGATrackSim.wrapperFileName='wrapper.root'" \
     --preInclude "InDetConfig.ConfigurationHelpers.OnlyTrackingPreInclude,ActsConfig.ActsCIFlags.actsValidateTracksFlags" \
@@ -15,4 +15,4 @@ Reco_tf.py --CA \
     --outputAODFile AOD.pool.root \
     --maxEvents ${RDO_EVT}
 ls -l
-echo "... RDO to AOD with sim, this part is done ..."
\ No newline at end of file
+echo "... RDO to AOD with sim, this part is done ..."

Trigger/EFTracking/FPGATrackSim/FPGATrackSimConfTools/test/FPGATrackingSimACTSIntTest.sh

 
 rdo_23p0=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/PhaseIIUpgrade/RDO/ATLAS-P2-RUN4-03-00-00/mc21_14TeV.900498.PG_single_muonpm_Pt100_etaFlatnp0_43.recon.RDO.e8481_s4149_r14697/RDO.33675668._000016.pool.root.1
-Reco_tf.py --CA \
+Reco_tf.py \
     --steering doRAWtoALL \
     --preExec "flags.Trigger.FPGATrackSim.wrapperFileName=None" \
     --preInclude "InDetConfig.ConfigurationHelpers.OnlyTrackingPreInclude,ActsConfig.ActsCIFlags.actsValidateTracksFlags" \

Trigger/EFTracking/FPGATrackSim/FPGATrackSimSGInput/README.md

@@ -4,5 +4,5 @@ They work only in the RDO to ESD transform. That is they need both RDO input obj
 
 Example command:
 ```sh
-Reco_tf.py --CA --preInclude "InDetConfig.ConfigurationHelpers.OnlyTrackingPreInclude" --inputRDOFile  RUN4_muons.RDO.pool.root --outputESDFile ESD.test.root --steering doRAWtoALL  --postInclude "FPGATrackSimSGInput.FPGATrackSimSGInputConfig.FPGATrackSimSGInputCfg" --preExec='flags.Trigger.FPGATrackSim.wrapperFileName="NewWrapper.root";flags.Trigger.FPGATrackSim.wrapperMetaData="This Is My Meta Data, Put It All here!!!!"'
+Reco_tf.py --preInclude "InDetConfig.ConfigurationHelpers.OnlyTrackingPreInclude" --inputRDOFile  RUN4_muons.RDO.pool.root --outputESDFile ESD.test.root --steering doRAWtoALL  --postInclude "FPGATrackSimSGInput.FPGATrackSimSGInputConfig.FPGATrackSimSGInputCfg" --preExec='flags.Trigger.FPGATrackSim.wrapperFileName="NewWrapper.root";flags.Trigger.FPGATrackSim.wrapperMetaData="This Is My Meta Data, Put It All here!!!!"'
 ```

Trigger/TrigAccel/TrigGpuTest/test/test_trigGPU_ID_calo_data_v1Dev_grid.py

@@ -25,7 +25,6 @@ from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
 
 ex = ExecStep.ExecStep()
 ex.type = 'athena'
-ex.args = '--CA'
 ex.input = 'data'
 ex.threads = 1
 ex.job_options = 'TriggerJobOpts/runHLT.py'

Trigger/TrigAccel/TrigGpuTest/test/test_trigGPU_RDOtoRDOTrig_v1Dev_grid.py

@@ -37,7 +37,6 @@ ex.concurrent_events = 4
 ex.args = '--outputRDO_TRIGFile=RDO_TRIG.pool.root'
 ex.args += ' --preExec="all:{:s};"'.format(preExec)
 ex.args += ' --preInclude "all:Campaigns.MC23c"'
-ex.args += ' --CA "all:True"'
 
 test = Test.Test()
 test.art_type = 'grid'

Trigger/TrigAccel/TrigGpuTest/test/test_trigGPU_calo_data_v1Dev_grid.py

@@ -32,7 +32,6 @@ ex.flags = ['CaloRecGPU.GlobalFlags.UseCaloRecGPU=True',
             'Trigger.triggerMenuSetup="Dev_pp_run3_v1_TriggerValidation_prescale"',
             'Trigger.doLVL1=True',
             'Trigger.doRuntimeNaviVal=True']
-ex.args = '--CA'
 
 test = Test.Test()
 test.art_type = 'grid'

Trigger/TrigAccel/TrigGpuTest/test/test_trigGPU_calo_mc_v1Dev_grid.py

@@ -29,7 +29,6 @@ ex.threads = 4
 ex.concurrent_events = 4
 ex.flags = ['CaloRecGPU.GlobalFlags.UseCaloRecGPU=True',
      'Trigger.triggerMenuSetup="Dev_pp_run3_v1_TriggerValidation_prescale"']
-ex.args = '--CA'
 
 test = Test.Test()
 test.art_type = 'grid'