Merge branch 'cherry-pick-ef928f8e16-master' into 'master' (cb55afce) · Commits · Peter Sherwood / athena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

cb55afce

Commit cb55afce authored 6 years ago by Adam Edward Barton

Downloads
- Plain Diff

Merge branch 'cherry-pick-ef928f8e16-master' into 'master'

Sweeping !14721 from 21.1 to master.
Fix for UCC triggers in HI_v5 menu

See merge request atlas/athena!14754

parents 217bc039 d6d9a9c3

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

Trigger/TrigHypothesis/TrigHIHypo/python/UltraCentralHypos.py 6 additions, 2 deletions

...ger/TrigHypothesis/TrigHIHypo/python/UltraCentralHypos.py
Trigger/TrigHypothesis/TrigHIHypo/src/UltraCentralHypo.cxx 13 additions, 6 deletions

Trigger/TrigHypothesis/TrigHIHypo/src/UltraCentralHypo.cxx
Trigger/TrigHypothesis/TrigHIHypo/src/UltraCentralHypo.h 1 addition, 0 deletions

Trigger/TrigHypothesis/TrigHIHypo/src/UltraCentralHypo.h

with 20 additions and 8 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