Replace TriggerFlags.EDMDecodingVersion with ConfigFlags.Trigger.EDMVersion and remove TriggerFlags.doMT
After !38381 (merged) we can now rely fully on the auto-configuration of EDMDecodingVersion
from ConfigFlags.Trigger
. Clean up the now-redundant old code. In addition, clean up all use-cases (some incorrect) of TriggerFlags.doMT
and use other flags in its place.
Detailed changes:
- Replace
TriggerFlags.EDMDecodingVersion
withConfigFlags.Trigger.EDMDecodingVersion
- Deprecate but keep
TriggerFlags.EDMDecodingVersion
and auto-configure it to the value ofConfigFlags.Trigger.EDMDecodingVersion
- Replace all use cases of the old flag with the new one
- Remove the old "auto" configuration function, which wasn't "auto" (it had to be called separately from the flag)
- Deprecate but keep
- Rename
EDMDecodingVersion
toEDMVersion
because it doesn't steer just decoding, but also encoding (i.e. defines what is added to the trigger output). - Remove
TriggerFlags.doMT
- Use
ConfigFlags.Trigger.EDMVersion
where the intention was to check for Trigger EDM version - Use
ConfigFlags.Concurrency.NumThreads
where the intention was to check for running AthenaMT vs serial athena
- Use
This touches many domains, so adding full-unit-tests
Closes ATR-22360
Merge request reports
Activity
added full-unit-tests label
This merge request affects 12 packages:
- Control/AthenaMonitoring
- HLT/Trigger/TrigTransforms/TrigTransform
- PhysicsAnalysis/PATJobTransforms
- Reconstruction/RecJobTransforms
- Tools/Tier0ChainTests
- Trigger/TrigMonitoring/TrigBphysMonitoring
- Trigger/TrigMonitoring/TrigHLTMonitoring
- Trigger/TrigMonitoring/TrigIDtrkMonitoring
- Trigger/TrigMonitoring/TrigMuonMonitoring
- Trigger/TrigValidation/TrigAnalysisTest
- Trigger/TrigValidation/TrigValAlgs
- Trigger/TriggerCommon/TriggerJobOpts
Affected files list will not be printed in this case
Adding @goetz ,@sutt ,@jpanduro ,@rbielski ,@nagano ,@ebergeas ,@wiedenma ,@mark ,@okumura ,@fwinkl ,@bernius ,@ssnyder as watchers
added Analysis Core DQ Reconstruction Tools Trigger master review-pending-level-1 labels
- Resolved by Rafal Bielski
Hi Rafal -
Just a reminder that due to !38398 (merged) you will also have to edit DQMonFlagsConfig_jobOptions.py to replace the
TriggerFlags.doMT()
with thejobproperties.ConcurrencyFlags.NumThreads
check.Thanks, Peter
CI Result FAILURE (hash 3824bb80)Athena AthSimulation AthGeneration AnalysisBase externals cmake make required tests optional tests Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 23782]added review-user-action-required label and removed review-pending-level-1 label
added 87 commits
-
3824bb80...ee451962 - 86 commits from branch
atlas:master
- def40d59 - Replace TriggerFlags.EDMDecodingVersion with ConfigFlags.Trigger.EDMDecodingVersion
-
3824bb80...ee451962 - 86 commits from branch
added 1 commit
- 13551981 - Replace TriggerFlags.EDMDecodingVersion with ConfigFlags.Trigger.EDMDecodingVersion
This merge request affects 13 packages:
- Control/AthenaMonitoring
- HLT/Trigger/TrigTransforms/TrigTransform
- PhysicsAnalysis/PATJobTransforms
- Reconstruction/RecJobTransforms
- Tools/Tier0ChainTests
- Trigger/TrigMonitoring/TrigBphysMonitoring
- Trigger/TrigMonitoring/TrigHLTMonitoring
- Trigger/TrigMonitoring/TrigIDtrkMonitoring
- Trigger/TrigMonitoring/TrigMuonMonitoring
- Trigger/TrigValidation/TrigAnalysisTest
- Trigger/TrigValidation/TrigValAlgs
- Trigger/TrigValidation/TriggerTest
- Trigger/TriggerCommon/TriggerJobOpts
Affected files list will not be printed in this case
Adding @goetz ,@sutt ,@jpanduro ,@rbielski ,@nagano ,@ebergeas ,@wiedenma ,@mark ,@okumura ,@fwinkl ,@bernius ,@ssnyder as watchers
added review-pending-level-1 label and removed review-user-action-required label
- Resolved by Rafal Bielski
CI Result FAILURE (hash 13551981)Athena AthSimulation AthGeneration AnalysisBase externals cmake make required tests optional tests Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 23837]
removed review-pending-level-1 label
added 1 commit
- f5a68cee - Replace TriggerFlags.EDMDecodingVersion with ConfigFlags.Trigger.EDMDecodingVersion
This merge request affects 13 packages:
- Control/AthenaMonitoring
- HLT/Trigger/TrigTransforms/TrigTransform
- PhysicsAnalysis/PATJobTransforms
- Reconstruction/RecJobTransforms
- Tools/Tier0ChainTests
- Trigger/TrigMonitoring/TrigBphysMonitoring
- Trigger/TrigMonitoring/TrigHLTMonitoring
- Trigger/TrigMonitoring/TrigIDtrkMonitoring
- Trigger/TrigMonitoring/TrigMuonMonitoring
- Trigger/TrigValidation/TrigAnalysisTest
- Trigger/TrigValidation/TrigValAlgs
- Trigger/TrigValidation/TriggerTest
- Trigger/TriggerCommon/TriggerJobOpts
Affected files list will not be printed in this case
Adding @goetz ,@sutt ,@jpanduro ,@rbielski ,@nagano ,@ebergeas ,@wiedenma ,@mark ,@okumura ,@fwinkl ,@bernius ,@ssnyder as watchers
added review-pending-level-1 label
removed review-pending-level-1 label