Updates to L1Menu for CTP commissioning: ATR-25568, ATR-21796

Fixes, mostly requests from @amarzin:

• Duplicate BMA0 instead of BMA1 input
• Various updates to CTP monitored items
• Addition of ZeroBias trigger driven by eFEX trigger
• Reorders LegacyL1Topo0/1 board and LegacyL1TopoMerger board additions in order to provide desired threshold-to-board mapping for CTP
• Fixes to L1Topo group labels, correctly checking all legacy items coming via merger board (FYI @amoreira)
• Improves detail on L1Topo group label messaging, avoids checking multi-seeded L1 items for topo groups Additional feature:
• Adds NSW monitoring trigger item: ATR-21796

WARNING: big files (>100K) are found in the changeset

272K in file Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py

148K in file Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py

This merge request affects 1 package:

• Trigger/TriggerCommon/TriggerMenuMT

This merge request affects 11 files:

• Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/Validation/CheckL1HLTConsistency.py
• Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/PhysicsP1_pp_run3_v1.py
• Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py
• Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Connectors.py
• Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
• Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/MonitorDef.py
• Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDef.py
• Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py
• Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1_inputs_legacy.py
• Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1.py
• Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1_inputs.py

Adding @sutt ,@ademaria ,@ggonella ,@carquin ,@iriu ,@bernius ,@malconad ,@shanisch ,@gipezzul as watchers

added Trigger TriggerMenu master review-pending-level-1 labels

The system determined that CI tests (with names matching "^CITest_SimulationRun(2|3)FullSim.*$") are not needed for this code change. They are not run. This is not an indicator to restart the job.

CI Result FAILURE (hash 199f7463)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis	DetCommon
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view. Check the JIRA CI status board for known problems
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
AthAnalysis: number of compilation errors 0, warnings 0
DetCommon: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 52629]

Jenkins please retry a build

WARNING: big files (>100K) are found in the changeset

272K in file Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py

148K in file Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py

This merge request affects 1 package:

• Trigger/TriggerCommon/TriggerMenuMT

This merge request affects 11 files:

• Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/Validation/CheckL1HLTConsistency.py
• Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/PhysicsP1_pp_run3_v1.py
• Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py
• Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Connectors.py
• Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
• Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/MonitorDef.py
• Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDef.py
• Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py
• Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1_inputs_legacy.py
• Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1.py
• Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1_inputs.py

Adding @sutt ,@ademaria ,@ggonella ,@carquin ,@iriu ,@bernius ,@malconad ,@shanisch ,@gipezzul as watchers

The system determined that CI tests (with names matching "^CITest_SimulationRun(2|3)FullSim.*$") are not needed for this code change. They are not run. This is not an indicator to restart the job.

CI Result FAILURE (hash 199f7463)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis	DetCommon
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view. Check the JIRA CI status board for known problems
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
AthAnalysis: number of compilation errors 0, warnings 0
DetCommon: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 52650]

Many tests are failing with the no topo group error. Could you please investigate?

Thanks, Kira (L1)

added review-user-action-required label and removed review-pending-level-1 label

added 1 commit

• 884eebbb - Filling all other needed L1Topo groups in Dev and MC menus

Compare with previous version

WARNING: big files (>100K) are found in the changeset

272K in file Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py

148K in file Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py

This merge request affects 1 package:

• Trigger/TriggerCommon/TriggerMenuMT

This merge request affects 13 files:

• Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/Validation/CheckL1HLTConsistency.py
• Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run3_v1.py
• Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MC_pp_run3_v1.py
• Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/PhysicsP1_pp_run3_v1.py
• Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py
• Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Connectors.py
• Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
• Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/MonitorDef.py
• Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDef.py
• Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py
• Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1_inputs_legacy.py
• Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1.py
• Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1_inputs.py

Adding @sutt ,@ademaria ,@ggonella ,@carquin ,@iriu ,@bernius ,@malconad ,@shanisch ,@gipezzul as watchers

added review-pending-level-1 label and removed review-user-action-required label

The system determined that CI tests (with names matching "^CITest_SimulationRun(2|3)FullSim.*$") are not needed for this code change. They are not run. This is not an indicator to restart the job.

CI Result SUCCESS (hash 884eebbb)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis	DetCommon
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view. Check the JIRA CI status board for known problems
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
AthAnalysis: number of compilation errors 0, warnings 0
DetCommon: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 52701]

marked this merge request as draft

removed review-pending-level-1 label

Back to draft while iterating with CTP

added 1 commit

• 5997b05b - Simplify setup for Phase-I ZeroBias

Compare with previous version

added 211 commits

• 5997b05b...1b3a47cc - 200 commits from branch atlas:master
• 70a7936a - Fix double BMA0 addition
• 39cf74fa - CTPMON counters for BMA
• 2c59985e - Fixed CTP IDs for HF monitored items
• eb4c44c4 - Remove some CTPMON items
• f750573d - Implement Phase-I driven ZeroBias trigger
• 4a232753 - Remove thresholds from legacy L1Topo connectors to avoid duplication when reading for CTP config
• ffe82766 - Revert removal of triggerlines from LegacyL1Topo connectors
• b4da4408 - Insert Legacy L1Topo merger before component L1Topo boards to improve C++...
• 39f5d9fe - Fix legacy L1Topo labels getting assignment from merger board
• 70667eff - Filling all other needed L1Topo groups in Dev and MC menus
• f4f849c1 - Simplify setup for Phase-I ZeroBias

Compare with previous version

changed title from Draft: Corrections to L1Menu for CTP compatibility to Draft: Corrections to L1Menu for CTP compatibility: ATR-25568

added 1 commit

• 749b0be1 - Add threshold and item for NSW monitoring

Compare with previous version

changed target branch from master to 22.0

removed master label

added 22.0 label

Note for @amarzin, I made a couple of corrections to the monitored items:

• L1_EM20VH and L1_EM22VHI instead of L1_EM20VHI and L1_EM22VH to match the egamma triggers that are actually seeding HLT
• Added L1_MBTS_A that was missing, to match L1_MBTS_C Also fixed the calculation of the LUTs (was not being converted to int, so extra fraction lead to overestimating number of LUTs needed)

Due to other changes in the menu in 22.0, this will anyway not perfectly reproduce the archived menu used for building the firmware last week, but we can revert the fixes above in a branch to produce a matching SMK.

Think it is ready to run CI.

marked this merge request as ready

Hi TJ,

We can change the per-bunch monitoring counters without any impact on the firmware. However I don't understand your second bullet with the LUTs. Could you please commit to Git such that we can see the diff between the 2 menus

Cheers, Antoine

added 186 commits

• 749b0be1...8375005e - 173 commits from branch atlas:22.0
• 1a047204 - Fix double BMA0 addition
• 9bde92a3 - CTPMON counters for BMA
• b2fa1c59 - Fixed CTP IDs for HF monitored items
• aadf9825 - Remove some CTPMON items
• 7e5202b6 - Implement Phase-I driven ZeroBias trigger
• 5c64c2c9 - Remove thresholds from legacy L1Topo connectors to avoid duplication when reading for CTP config
• 47fea115 - Revert removal of triggerlines from LegacyL1Topo connectors
• 3db89d49 - Insert Legacy L1Topo merger before component L1Topo boards to improve C++...
• 8aae85bd - Fix legacy L1Topo labels getting assignment from merger board
• eef8100d - Filling all other needed L1Topo groups in Dev and MC menus
• 245ec5b1 - Simplify setup for Phase-I ZeroBias
• 9f3cf0a2 - Add threshold and item for NSW monitoring
• a7ee1bd1 - Fixing up monitored items and NSW mon trigger

Compare with previous version

Hi @amarzin,

Thanks, useful to know that about the counters. So this is then transparent. Re: the LUTs, the change is only in the menu python where we check that the number of LUTs = LF+HF counters was not exceeded -- this will just cause an error if too many items are provided. The changes are at L202-309 in MonitorDef.py, changing the limit from 8 to 32.

But I put a menu in Git anyway: https://gitlab.cern.ch/atlas-trigger-menu/triggermenuarchive/-/blob/master/L1Menu/L1Menu_PhysicsP1_pp_run3_v1_22.0.69-749b0be1_MR53498.json

Cheers, TJ

OK, thanks!

added 209 commits

• a7ee1bd1...2ecbcbec - 194 commits from branch atlas:22.0
• 9e1054b9 - Fix double BMA0 addition
• 9c744b50 - CTPMON counters for BMA
• 32aa6548 - Fixed CTP IDs for HF monitored items
• aba8009d - Remove some CTPMON items
• 0accb781 - Implement Phase-I driven ZeroBias trigger
• 46ec2e4d - Remove thresholds from legacy L1Topo connectors to avoid duplication when reading for CTP config
• 19b7e576 - Revert removal of triggerlines from LegacyL1Topo connectors
• 9d1f73d3 - Insert Legacy L1Topo merger before component L1Topo boards to improve C++...
• 423a61f2 - Fix legacy L1Topo labels getting assignment from merger board
• 57260434 - Filling all other needed L1Topo groups in Dev and MC menus
• 42cdfa12 - Simplify setup for Phase-I ZeroBias
• 2e99db6e - Add threshold and item for NSW monitoring
• da61aff4 - Fixing up monitored items and NSW mon trigger
• 48d5573e - Monitoring of L1 triggers disabled in MC
• 8f0a0f9d - Fixing up inconsistencies

Compare with previous version

WARNING: big files (>100K) are found in the changeset

264K in file Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py

148K in file Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py

This merge request affects 2 packages:

• Trigger/TrigConfiguration/TrigConfData
• Trigger/TriggerCommon/TriggerMenuMT

Affected files list will not be printed in this case

Adding @jmharris ,@shanisch ,@ggonella ,@carquin ,@ademaria ,@cmorenom ,@bernius ,@asonay ,@gipezzul ,@sutt ,@iriu ,@orlando ,@mark ,@tamartin ,@paulama ,@malconad ,@rbielski as watchers

added review-pending-level-1 label

added 1 commit

• a71e99de - Restore spuriously removed chain

Compare with previous version

WARNING: big files (>100K) are found in the changeset

264K in file Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py

148K in file Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py

This merge request affects 2 packages:

• Trigger/TrigConfiguration/TrigConfData
• Trigger/TriggerCommon/TriggerMenuMT

Affected files list will not be printed in this case

Adding @jmharris ,@shanisch ,@ggonella ,@carquin ,@ademaria ,@cmorenom ,@bernius ,@asonay ,@gipezzul ,@sutt ,@iriu ,@orlando ,@mark ,@tamartin ,@paulama ,@malconad ,@rbielski as watchers

changed title from Corrections to L1Menu for CTP compatibility: ATR-25568 to Updates to L1Menu for CTP commissioning: ATR-25568, ATR-21796

changed the description

The system determined that CI tests (with names matching "^CITest_SimulationRun(2|3)FullSim.*$") are not needed for this code change. They are not run. This is not an indicator to restart the job.

CI Result FAILURE (hash 8f0a0f9d)

	Athena	DetCommon
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view. Check the JIRA CI status board for known problems
Athena: number of compilation errors 0, warnings 0
DetCommon: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 53535]

The system determined that CI tests (with names matching "^CITest_SimulationRun(2|3)FullSim.*$") are not needed for this code change. They are not run. This is not an indicator to restart the job.

added Run3-MCReco-output-changed label

CI Result FAILURE (hash a71e99de)

	Athena	DetCommon
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view. Check the JIRA CI status board for known problems
Athena: number of compilation errors 0, warnings 0
DetCommon: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 53538]