Merge remote-tracking branch 'upstream/master' into magFieldCache-opt (9bab60b1) · Commits · atlas / athena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

athena
- Activity
- Members
- Labels
- Jira

Snippets Groups Projects

9bab60b1

Commit 9bab60b1 authored 4 years ago by R D Schaffer

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master' into magFieldCache-opt

parents 80ea7490 a7ffc841

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt 2 additions, 2 deletions

AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt
AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoRead.py 0 additions, 3 deletions

AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoRead.py
AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep3.py 1 addition, 1 deletion

.../DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep3.py
Event/EventInfoMgt/src/TagInfoMgr.cxx 97 additions, 135 deletions

Event/EventInfoMgt/src/TagInfoMgr.cxx
Event/EventInfoMgt/src/TagInfoMgr.h 3 additions, 1 deletion

Event/EventInfoMgt/src/TagInfoMgr.h
MagneticField/MagFieldServices/MagFieldServices/AtlasFieldCacheCondAlg.h 2 additions, 3 deletions

...agFieldServices/MagFieldServices/AtlasFieldCacheCondAlg.h
MagneticField/MagFieldServices/MagFieldServices/AtlasFieldMapCondAlg.h 1 addition, 2 deletions

.../MagFieldServices/MagFieldServices/AtlasFieldMapCondAlg.h
MagneticField/MagFieldServices/src/AtlasFieldCacheCondAlg.cxx 15 additions, 18 deletions

...eticField/MagFieldServices/src/AtlasFieldCacheCondAlg.cxx
MagneticField/MagFieldServices/src/AtlasFieldMapCondAlg.cxx 14 additions, 21 deletions

MagneticField/MagFieldServices/src/AtlasFieldMapCondAlg.cxx
Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCandidateTool.cxx 1 addition, 1 deletion

...ification/MuonCombinedBaseTools/src/MuonCandidateTool.cxx
Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/Chi2TrackCompatibilityEstimator.cxx 9 additions, 7 deletions

...VertexFitterUtils/src/Chi2TrackCompatibilityEstimator.cxx
Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.h 17 additions, 9 deletions

...igConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.h

with 162 additions and 203 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