Merge branch 'master-ATR-22948' into 'master' (5930e9bf) · Commits · Julian Blumenthal / athena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

athena
- Activity
- Members
- Labels
- Terraform modules
- Incidents

Snippets Groups Projects

Admin message

GitLab service scheduled maintenance on Friday, March 21st 2025 as of 08h00 Geneva time for an estimated period of 1 hour. Further information under OTG0154918.

5930e9bf

Commit 5930e9bf authored 3 years ago by Johannes Elmsheuser

Downloads
- Plain Diff

Merge branch 'master-ATR-22948' into 'master'

L1Menu Run 1 to Run 3 conversion

See merge request atlas/athena!42264

parents 1b3aa81a 834f0f45

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1Menu.h 3 additions, 1 deletion

Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1Menu.h
Trigger/TrigConfiguration/TrigConfData/src/L1Menu.cxx 38 additions, 34 deletions

Trigger/TrigConfiguration/TrigConfData/src/L1Menu.cxx
Trigger/TrigConfiguration/TrigConfData/src/L1ThrExtraInfo.cxx 2 additions, 3 deletions

...ger/TrigConfiguration/TrigConfData/src/L1ThrExtraInfo.cxx
Trigger/TrigConfiguration/TrigConfData/src/L1ThresholdBase.cxx 10 additions, 13 deletions

...er/TrigConfiguration/TrigConfData/src/L1ThresholdBase.cxx
Trigger/TrigConfiguration/TrigConfIO/src/JsonFileWriterL1.cxx 23 additions, 18 deletions

...ger/TrigConfiguration/TrigConfIO/src/JsonFileWriterL1.cxx
Trigger/TrigConfiguration/TrigConfL1Data/TrigConfL1Data/CaloInfo.h 2 additions, 2 deletions

...rigConfiguration/TrigConfL1Data/TrigConfL1Data/CaloInfo.h
Trigger/TrigConfiguration/TrigConfStorage/src/test/Run2toRun3ConvertersL1.cxx 52 additions, 36 deletions

...ation/TrigConfStorage/src/test/Run2toRun3ConvertersL1.cxx
Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigGetter.py 5 additions, 2 deletions

...riggerCommon/TriggerJobOpts/python/TriggerConfigGetter.py
Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/L1Menu2JSON.py 2 additions, 0 deletions

...TriggerCommon/TriggerMenuMT/python/L1/Base/L1Menu2JSON.py

with 137 additions and 109 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment