Merge branch 'cherry-pick-ff53cbe2' into '21.0' (54b76d9f) · Commits · Marco Aparo / athena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

athena
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

54b76d9f

Commit 54b76d9f authored 5 years ago by John Kenneth Anders

Downloads
- Plain Diff

Merge branch 'cherry-pick-ff53cbe2' into '21.0'

Merge branch 'data-overlay' into '21.3'

See merge request atlas/athena!23157

parents 973fb395 b2558625

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPreProcessing.py 9 additions, 1 deletion

...tTrigRecExample/python/InDetTrigConfigRecPreProcessing.py
InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/Pixel_TrgClusterization.h 1 addition, 1 deletion

...rmat/InDetTrigPrepRawDataFormat/Pixel_TrgClusterization.h
InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/Pixel_TrgClusterization.cxx 48 additions, 50 deletions

...nDetTrigPrepRawDataFormat/src/Pixel_TrgClusterization.cxx
Trigger/TrigAlgorithms/TrigL2SiTrackFinder/python/TrigL2SiTrackFinder_Config.py 2 additions, 1 deletion

.../TrigL2SiTrackFinder/python/TrigL2SiTrackFinder_Config.py
Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py 10 additions, 0 deletions

Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py

with 70 additions and 53 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