Merge branch 'taginfoFixes1' into 'master' (a7ffc841) · 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

a7ffc841

Commit a7ffc841 authored 4 years ago by Vakhtang Tsulaia

Downloads
- Plain Diff

Merge branch 'taginfoFixes1' into 'master'

update tests for changes to TagInfoMgr output

See merge request atlas/athena!35464

parents 9638f1a7 d81fcea5

No related branches found

No related tags found

No related merge requests found

Changes 9

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

with 135 additions and 186 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