Merge branch 'cherry-pick-aeaa8387' into '21.1' (a815e6fd) · Commits · atlas / athena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

athena
- Activity
- Members
- Labels
- Jira

Snippets Groups Projects

a815e6fd

Commit a815e6fd authored 7 years ago by Imma Riu

Downloads
- Plain Diff

Merge branch 'cherry-pick-aeaa8387' into '21.1'

Merge branch master-ftk-track-overlap-removal into 21.1

See merge request !4264

parents b0443f86 8d755685

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
Trigger/TrigFTK/FTK_DataProviderSvc/FTK_DataProviderSvc/FTK_DataProviderSvc.h 5 additions, 2 deletions

...DataProviderSvc/FTK_DataProviderSvc/FTK_DataProviderSvc.h
Trigger/TrigFTK/FTK_DataProviderSvc/src/FTK_DataProviderSvc.cxx 32 additions, 16 deletions

...r/TrigFTK/FTK_DataProviderSvc/src/FTK_DataProviderSvc.cxx
Trigger/TrigFTK/FTK_RecToolInterfaces/FTK_RecToolInterfaces/IFTK_DuplicateTrackRemovalTool.h 25 additions, 0 deletions

...es/FTK_RecToolInterfaces/IFTK_DuplicateTrackRemovalTool.h
Trigger/TrigFTK/FTK_RecTools/FTK_RecTools/FTK_DuplicateTrackRemovalTool.h 48 additions, 0 deletions

...FTK_RecTools/FTK_RecTools/FTK_DuplicateTrackRemovalTool.h
Trigger/TrigFTK/FTK_RecTools/src/FTK_DuplicateTrackRemovalTool.cxx 303 additions, 0 deletions

...rigFTK/FTK_RecTools/src/FTK_DuplicateTrackRemovalTool.cxx
Trigger/TrigFTK/FTK_RecTools/src/components/FTK_RecTools_entries.cxx 3 additions, 0 deletions

...gFTK/FTK_RecTools/src/components/FTK_RecTools_entries.cxx

with 417 additions and 18 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