Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

2a3373a3

Commit 2a3373a3 authored 4 years ago by Frank Winklmeier

Downloads
- Plain Diff

Merge branch 'sync-new-jo-tracking' into 'master'

Synchronise settings of FTF in new JO vs mainline

See merge request atlas/athena!37693

parents ec928c74 4eaf3f2d

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

Trigger/TrigAlgorithms/TrigmuComb/python/TrigmuCombConfig_newJO.py 1 addition, 1 deletion

...rigAlgorithms/TrigmuComb/python/TrigmuCombConfig_newJO.py
Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py 33 additions, 69 deletions

Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingCutFlags.py 4 additions, 1 deletion

.../TrigTools/TrigInDetConfig/python/TrigTrackingCutFlags.py

with 38 additions and 71 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