Merge branch 'fernando_22_Feb_TrigEgammaRec_to_master' into 'master' (a45f11be) · Commits · Sanmay Ganguly / athena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

a45f11be

Commit a45f11be authored 6 years ago by Walter Lampl

Downloads
- Plain Diff

Merge branch 'fernando_22_Feb_TrigEgammaRec_to_master' into 'master'

Pseudomerge of TrigEgammaRec from 21.1 to master

See merge request atlas/athena!21355

parents f4e7ee11 e68fd0ed

No related branches found

No related tags found

Loading

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Trigger/TrigAlgorithms/TrigEgammaRec/CMakeLists.txt 5 additions, 3 deletions

Trigger/TrigAlgorithms/TrigEgammaRec/CMakeLists.txt
Trigger/TrigAlgorithms/TrigEgammaRec/TrigEgammaRec/TrigEgammaRec.h 4 additions, 1 deletion

...rigAlgorithms/TrigEgammaRec/TrigEgammaRec/TrigEgammaRec.h
Trigger/TrigAlgorithms/TrigEgammaRec/python/TrigEgammaRecConfig.py 2 additions, 2 deletions

...rigAlgorithms/TrigEgammaRec/python/TrigEgammaRecConfig.py
Trigger/TrigAlgorithms/TrigEgammaRec/python/TrigEgammaToolFactories.py 12 additions, 3 deletions

...lgorithms/TrigEgammaRec/python/TrigEgammaToolFactories.py
Trigger/TrigAlgorithms/TrigEgammaRec/python/TrigEgammaTrackTools.py 112 additions, 0 deletions

...igAlgorithms/TrigEgammaRec/python/TrigEgammaTrackTools.py
Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx 225 additions, 154 deletions

Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx

with 360 additions and 163 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