From a2f6ba8afe123f343d10c0e5fa84e04dc73426f6 Mon Sep 17 00:00:00 2001 From: Bertrand Martin Dit Latour <bertrand.martindl@cern.ch> Date: Thu, 20 Mar 2025 14:39:07 +0000 Subject: [PATCH] TrigValidation: update bulk global conditions tag in ART tests TrigValidation: update bulk global tags in ART tests Hello, Following !78113, we need to update the bulk global conditions tag used in trigger ART tests. Move to the `TestDefaults` ones, to avoid further manual updates. Fixes ATR-30978. Cheers, Bertrand --- .../TrigInDetValidation/python/TrigInDetArtSteps.py | 5 +++-- .../TrigInDetValidation/utils/TrigInDetArtSteps.py.pre | 5 +++-- .../TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_build.py | 5 +++-- .../TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_grid.py | 5 +++-- .../TrigP1Test/test/test_trigP1_v1Dev_HI_run3_build.py | 8 ++++---- .../test/test_trigP1_v1PhysP1_DAODTLAFTAGPEB_grid.py | 5 +++-- .../TrigP1Test/test/test_trigP1_v1PhysP1_DAODTLA_grid.py | 5 +++-- .../test/test_trigP1_v1PhysP1_HI_T0Mon_build.py | 8 ++++---- .../test/test_trigP1_v1PhysP1_T0MonTrf_build.py | 5 +++-- .../TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py | 5 +++-- .../TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py | 5 +++-- .../test/test_trigP1_v1PhysP1_lowMu_T0Mon_build.py | 5 +++-- 12 files changed, 38 insertions(+), 28 deletions(-) diff --git a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py index c816b7fcb2e..8d1f9d584f3 100644 --- a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py +++ b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration # ''' @@ -16,6 +16,7 @@ from TrigValTools.TrigValSteering.Step import Step from TrigValTools.TrigValSteering.CheckSteps import RefComparisonStep from TrigValTools.TrigValSteering.Common import find_file from AthenaCommon.Utils.unixtools import FindFile +from AthenaConfiguration.TestDefaults import defaultConditionsTags ################################################## # Exec (athena) steps for Reco_tf @@ -204,7 +205,7 @@ class TrigTZReco(ExecStep): self.max_events = -1 self.args = '--inputBSFile=' + find_file('*.physics_Main*._athenaHLT*.data') # output of the previous step self.args += ' --outputAODFile=AOD.pool.root' - self.args += ' --conditionsTag=\'CONDBR2-BLKPA-2023-05\' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\'' + self.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA23}" --geometryVersion=\'ATLAS-R3S-2021-03-02-00\'' self.args += ' --preExec="{:s}"'.format(tzrecoPreExec) self.args += ' --CA' diff --git a/Trigger/TrigValidation/TrigInDetValidation/utils/TrigInDetArtSteps.py.pre b/Trigger/TrigValidation/TrigInDetValidation/utils/TrigInDetArtSteps.py.pre index 8a744614637..e8ac4305a13 100644 --- a/Trigger/TrigValidation/TrigInDetValidation/utils/TrigInDetArtSteps.py.pre +++ b/Trigger/TrigValidation/TrigInDetValidation/utils/TrigInDetArtSteps.py.pre @@ -1,5 +1,5 @@ # -# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration # ''' @@ -16,6 +16,7 @@ from TrigValTools.TrigValSteering.Step import Step from TrigValTools.TrigValSteering.CheckSteps import RefComparisonStep from TrigValTools.TrigValSteering.Common import find_file from AthenaCommon.Utils.unixtools import FindFile +from AthenaConfiguration.TestDefaults import defaultConditionsTags ################################################## # Exec (athena) steps for Reco_tf @@ -262,7 +263,7 @@ class TrigTZReco(ExecStep): self.max_events = -1 self.args = '--inputBSFile=' + find_file('*.physics_Main*._athenaHLT*.data') # output of the previous step self.args += ' --outputAODFile=AOD.pool.root' - self.args += ' --conditionsTag=\'CONDBR2-BLKPA-2023-05\' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\'' + self.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA23}" --geometryVersion=\'ATLAS-R3S-2021-03-02-00\'' self.args += ' --preExec="{:s}"'.format(tzrecoPreExec) self.args += ' --CA' diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_build.py index 09777fc06c0..fb2c9d36d40 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_build.py +++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_build.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration # art-description: Test of cosmic P1+Tier0 workflow, runs athenaHLT with Cosmic_run3_v1 menu followed by offline reco and monitoring # art-type: build @@ -8,6 +8,7 @@ from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps from TrigValTools.TrigValSteering.Common import find_file +from AthenaConfiguration.TestDefaults import defaultConditionsTags # Specify trigger menu once here: triggermenu = 'Cosmic_run3_v1' @@ -69,7 +70,7 @@ tzreco.args = '--inputBSFile=' + find_file('*.physics_Main*._athenaHLT*.data') tzreco.args += ' --outputAODFile=AOD.pool.root' tzreco.args += ' --outputHISTFile=ExampleMonitorOutput.root' tzreco.args += ' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\'' -tzreco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2023-05\'' +tzreco.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA23}"' tzreco.args += ' --preExec="{:s}"'.format(tzrecoPreExec) # The full test diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_grid.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_grid.py index 3d9b612da60..63ad2debfe7 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_grid.py +++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Cosmic_T0Mon_grid.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration # art-description: Test of cosmic P1+Tier0 workflow, runs athenaHLT with Cosmic_run3_v1 menu followed by offline reco and monitoring # art-type: grid @@ -19,6 +19,7 @@ from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps from TrigValTools.TrigValSteering.Common import find_file +from AthenaConfiguration.TestDefaults import defaultConditionsTags # Specify trigger menu once here: triggermenu = 'Cosmic_run3_v1' @@ -82,7 +83,7 @@ tzreco.args = '--inputBSFile=' + find_file('*.physics_Main*._athenaHLT*.data') tzreco.args += ' --outputAODFile=AOD.pool.root' tzreco.args += ' --outputHISTFile=ExampleMonitorOutput.root' tzreco.args += ' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\'' -tzreco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2023-05\'' +tzreco.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA23}"' tzreco.args += ' --preExec="{:s}"'.format(tzrecoPreExec) # The full test diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_HI_run3_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_HI_run3_build.py index e651ea13135..f51501a6e2a 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_HI_run3_build.py +++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_HI_run3_build.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration # art-description: Test of HI data 2023 workflow, runs athenaHLT with HI menu followed by filtering of HP stream and offline reco # art-type: build @@ -8,7 +8,7 @@ from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps from TrigValTools.TrigValSteering.Common import find_file - +from AthenaConfiguration.TestDefaults import defaultConditionsTags # Specify trigger menu once here: triggermenu = 'Dev_HI_run3_v1_TriggerValidation_prescale' @@ -70,7 +70,7 @@ reco_hp.args += ' --outputAODFile=HP_AOD.pool.root' reco_hp.args += ' --outputHISTFile=hist.root' reco_hp.args += f' --preExec="all:{recoHPPreExec}"' reco_hp.args += ' --geometryVersion="ATLAS-R3S-2021-03-02-00"' -reco_hp.args += ' --conditionsTag="CONDBR2-BLKPA-2023-05"' +reco_hp.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA23}"' reco_hp.args += ' --autoConfiguration="everything"' #==================================================================================================== @@ -94,7 +94,7 @@ reco_upc.args += ' --outputAODFile=AOD_UPC.pool.root' reco_upc.args += ' --outputHISTFile=hist_UPC.root' reco_upc.args += f' --preExec="all:{recoUPCPreExec}"' reco_upc.args += ' --geometryVersion="ATLAS-R3S-2021-03-02-00"' -reco_upc.args += ' --conditionsTag="CONDBR2-BLKPA-2023-05"' +reco_upc.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA23}"' reco_upc.args += ' --autoConfiguration="everything"' # The full test diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_DAODTLAFTAGPEB_grid.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_DAODTLAFTAGPEB_grid.py index b9d28d51e7d..be34b10dd38 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_DAODTLAFTAGPEB_grid.py +++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_DAODTLAFTAGPEB_grid.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration # art-description: Test of P1+Tier0 workflow, runs athenaHLT with PhysicsP1_pp_run3_v1 menu followed by offline reco and monitoring (incl. EDM) # art-type: grid @@ -22,6 +22,7 @@ from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps from TrigValTools.TrigValSteering.Common import find_file from TrigAnalysisTest.TrigAnalysisSteps import add_analysis_steps +from AthenaConfiguration.TestDefaults import defaultConditionsTags # Specify trigger menu once here: triggermenu = 'Dev_pp_run3_v1_HLTReprocessing_prescale' @@ -56,7 +57,7 @@ tlareco.input = '' tlareco.explicit_input = True tlareco.args = '--inputBSFile=' + find_file('*.physics_FTagPEBTLA*._athenaHLT*.data') # output of the previous step tlareco.args += ' --outputDAOD_TLAFTAGPEBFile=DAOD_TLAFTAGPEB.pool.root' -tlareco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2024-03\' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\'' +tlareco.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA}" --geometryVersion=\'ATLAS-R3S-2021-03-02-00\'' tlareco.args += ' --preExec="{:s}"'.format(tlarecoPreExec) # The full test diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_DAODTLA_grid.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_DAODTLA_grid.py index 5d7522c1f19..365a76bbb0f 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_DAODTLA_grid.py +++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_DAODTLA_grid.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration # art-description: Test of P1+Tier0 workflow, runs athenaHLT with PhysicsP1_pp_run3_v1 menu followed by offline reco and monitoring (incl. EDM) # art-type: grid @@ -22,6 +22,7 @@ from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps from TrigValTools.TrigValSteering.Common import find_file from TrigAnalysisTest.TrigAnalysisSteps import add_analysis_steps +from AthenaConfiguration.TestDefaults import defaultConditionsTags # Specify trigger menu once here: triggermenu = 'PhysicsP1_pp_run3_v1_HLTReprocessing_prescale' @@ -56,7 +57,7 @@ tlareco.input = '' tlareco.explicit_input = True tlareco.args = '--inputBSFile=' + find_file('*.physics_TLA*._athenaHLT*.data') # output of the previous step tlareco.args += ' --outputDAOD_TLAFile=DAOD_TLA.pool.root' -tlareco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2024-03\' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\'' +tlareco.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA}" --geometryVersion=\'ATLAS-R3S-2021-03-02-00\'' tlareco.args += ' --preExec="{:s}"'.format(tlarecoPreExec) # The full test diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_HI_T0Mon_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_HI_T0Mon_build.py index 63006fe7fed..c0489364b32 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_HI_T0Mon_build.py +++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_HI_T0Mon_build.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration # art-description: Test of HI data 2023 workflow, runs athenaHLT with HI menu followed by filtering of HP stream, and offline reco with monitoring # art-type: build @@ -8,7 +8,7 @@ from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps from TrigValTools.TrigValSteering.Common import find_file - +from AthenaConfiguration.TestDefaults import defaultConditionsTags # Specify trigger menu once here: triggermenu = 'PhysicsP1_HI_run3_v1' @@ -92,7 +92,7 @@ reco_hp.args += ' --outputAODFile=HP_AOD.pool.root' reco_hp.args += ' --outputHISTFile=hist.root' reco_hp.args += f' --preExec="all:{recoHPPreExec}; {monPreExec}"' reco_hp.args += ' --geometryVersion="ATLAS-R3S-2021-03-02-00"' -reco_hp.args += ' --conditionsTag="CONDBR2-BLKPA-2023-05"' +reco_hp.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA23}"' reco_hp.args += ' --autoConfiguration="everything"' #==================================================================================================== @@ -115,7 +115,7 @@ reco_upc.args += ' --outputAODFile=AOD_UPC.pool.root' reco_upc.args += ' --outputHISTFile=hist_UPC.root' reco_upc.args += f' --preExec="all:{recoUPCPreExec}; {monPreExec}"' reco_upc.args += ' --geometryVersion="ATLAS-R3S-2021-03-02-00"' -reco_upc.args += ' --conditionsTag="CONDBR2-BLKPA-2023-05"' +reco_upc.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA23}"' reco_upc.args += ' --autoConfiguration="everything"' # The full test diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py index b019ab62fe9..c50689e3595 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py +++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration # art-description: transform test of BSRDOtoRAW + T0Reco + T0Mon, using v1PhysP1 menu # art-type: build @@ -7,6 +7,7 @@ # art-include: 24.0/Athena from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps +from AthenaConfiguration.TestDefaults import defaultConditionsTags # Specify trigger menu once here: triggermenu = 'PhysicsP1_pp_run3_v1_HLTReprocessing_prescale' @@ -62,7 +63,7 @@ tzreco.args = '--inputBSFile=RAW.pool.root' # output of the previous step tzreco.args += ' --outputAODFile=AOD.pool.root' tzreco.args += ' --outputNTUP_TRIGRATEFile=rate.ntup.root' tzreco.args += ' --outputHISTFile=ExampleMonitorOutput.root' -tzreco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2024-03\' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\'' +tzreco.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA}" --geometryVersion=\'ATLAS-R3S-2021-03-02-00\'' tzreco.args += ' --preExec="{:s}"'.format(tzrecoPreExec) tzreco.args += ' --CA' diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py index 457546f2505..c95af6f9d6d 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py +++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration # art-description: Test of P1+Tier0 workflow, runs athenaHLT with PhysicsP1_pp_run3_v1 menu followed by offline reco and monitoring (incl. EDM) # art-type: build @@ -9,6 +9,7 @@ from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps from TrigValTools.TrigValSteering.Common import find_file from TrigAnalysisTest.TrigAnalysisSteps import add_analysis_steps +from AthenaConfiguration.TestDefaults import defaultConditionsTags # Specify trigger menu once here: triggermenu = 'PhysicsP1_pp_run3_v1_HLTReprocessing_prescale' @@ -67,7 +68,7 @@ tzreco.max_events = 50 tzreco.args = '--inputBSFile=' + find_file('*.physics_Main*._athenaHLT*.data') # output of the previous step tzreco.args += ' --outputAODFile=AOD.pool.root' tzreco.args += ' --outputHISTFile=ExampleMonitorOutput.root' -tzreco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2024-03\' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\'' +tzreco.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA}" --geometryVersion=\'ATLAS-R3S-2021-03-02-00\'' tzreco.args += ' --preExec="{:s}"'.format(tzrecoPreExec) # The full test diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py index d31f94409dd..d6c3c9adec2 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py +++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration # art-description: Test of P1+Tier0 workflow, runs athenaHLT with PhysicsP1_pp_run3_v1 menu followed by offline reco, DAOD production, monitoring and analysis step for EDM monitoring # art-type: grid @@ -20,6 +20,7 @@ from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps from TrigValTools.TrigValSteering.Common import find_file from TrigAnalysisTest.TrigAnalysisSteps import add_analysis_steps +from AthenaConfiguration.TestDefaults import defaultConditionsTags # Specify trigger menu once here: triggermenu = 'PhysicsP1_pp_run3_v1_HLTReprocessing_prescale' @@ -77,7 +78,7 @@ tzreco.explicit_input = True tzreco.args = '--inputBSFile=' + find_file('*.physics_Main*._athenaHLT*.data') # output of the previous step tzreco.args += ' --outputAODFile=AOD.pool.root' tzreco.args += ' --outputHISTFile=ExampleMonitorOutput.root' -tzreco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2024-03\' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\'' +tzreco.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA}" --geometryVersion=\'ATLAS-R3S-2021-03-02-00\'' tzreco.args += ' --preExec="{:s}"'.format(tzrecoPreExec) aod2daod = ExecStep.ExecStep('AODtoDAOD') diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_lowMu_T0Mon_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_lowMu_T0Mon_build.py index 32917fef703..7fea603f7e3 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_lowMu_T0Mon_build.py +++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_lowMu_T0Mon_build.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration # art-description: Test of P1+Tier0 workflow, runs athenaHLT with PhysicsP1_pp_lowMu_run3_v1 menu followed by offline reco and monitoring # art-type: build @@ -9,6 +9,7 @@ from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps from TrigValTools.TrigValSteering.Common import find_file from TrigAnalysisTest.TrigAnalysisSteps import add_analysis_steps +from AthenaConfiguration.TestDefaults import defaultConditionsTags # Specify trigger menu once here: triggermenu = 'PhysicsP1_pp_lowMu_run3_v1' @@ -66,7 +67,7 @@ tzreco.max_events = 50 tzreco.args = '--inputBSFile=' + find_file('*.physics_Main*._athenaHLT*.data') # output of the previous step tzreco.args += ' --outputAODFile=AOD.pool.root' tzreco.args += ' --outputHISTFile=ExampleMonitorOutput.root' -tzreco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2024-03\' --geometryVersion=\'ATLAS-R3S-2021-03-02-00\'' +tzreco.args += f' --conditionsTag="{defaultConditionsTags.RUN3_DATA}" --geometryVersion=\'ATLAS-R3S-2021-03-02-00\'' tzreco.args += ' --preExec="{:s}"'.format(tzrecoPreExec) # The full test -- GitLab