Merge branch 'asg/phys-fix' into 'master' (1ad8a3d3) · 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

1ad8a3d3

Commit 1ad8a3d3 authored 4 years ago by Walter Lampl

Downloads
- Plain Diff

Merge branch 'asg/phys-fix' into 'master'

Better memory handling in PseudoJetContainer

See merge request atlas/athena!39374

parents cb234068 fbf266bc

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

Reconstruction/Jet/JetRec/JetRec/PseudoJetContainer.h 7 additions, 13 deletions

Reconstruction/Jet/JetRec/JetRec/PseudoJetContainer.h
Reconstruction/Jet/JetRec/Root/JetByVertexFinder.cxx 1 addition, 3 deletions

Reconstruction/Jet/JetRec/Root/JetByVertexFinder.cxx
Reconstruction/Jet/JetRec/Root/PseudoJetContainer.cxx 11 additions, 20 deletions

Reconstruction/Jet/JetRec/Root/PseudoJetContainer.cxx
Reconstruction/Jet/JetRec/src/MuonSegmentPseudoJetAlgorithm.cxx 1 addition, 1 deletion

...truction/Jet/JetRec/src/MuonSegmentPseudoJetAlgorithm.cxx
Reconstruction/Jet/JetRec/src/PseudoJetAlgorithm.cxx 1 addition, 1 deletion

Reconstruction/Jet/JetRec/src/PseudoJetAlgorithm.cxx
Reconstruction/Jet/JetRec/test/PseudoJetContainerOfflineTest.cxx 6 additions, 6 deletions

...ruction/Jet/JetRec/test/PseudoJetContainerOfflineTest.cxx
Reconstruction/Jet/JetRec/test/PseudoJetContainerTriggerTest.cxx 6 additions, 6 deletions

...ruction/Jet/JetRec/test/PseudoJetContainerTriggerTest.cxx
Reconstruction/Jet/JetRec/test/testHelpers.h 6 additions, 6 deletions

Reconstruction/Jet/JetRec/test/testHelpers.h
Trigger/TrigAlgorithms/TrigHLTJetRec/src/TriggerJetBuildTool.cxx 10 additions, 10 deletions

.../TrigAlgorithms/TrigHLTJetRec/src/TriggerJetBuildTool.cxx
Trigger/TrigAlgorithms/TrigHLTJetRec/src/TriggerPseudoJetGetter2.cxx 4 additions, 4 deletions

...gAlgorithms/TrigHLTJetRec/src/TriggerPseudoJetGetter2.cxx

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