Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

3d17d15a

Commit 3d17d15a authored 5 years ago by Adam Edward Barton

Downloads
- Plain Diff

Merge branch 'mixed.LumiBlockComps-20191011' into 'master'

LumiBlockComps+LumiBlockData: Fixes for handling mixed LuminosityCondData.

See merge request atlas/athena!27134

parents 7eb0b853 334a635e

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

LumiBlock/LumiBlockComps/share/LuminosityCondAlg_test.ref 12 additions, 7 deletions

LumiBlock/LumiBlockComps/share/LuminosityCondAlg_test.ref
LumiBlock/LumiBlockComps/share/LuminosityCondAlg_test.txt 4 additions, 0 deletions

LumiBlock/LumiBlockComps/share/LuminosityCondAlg_test.txt
LumiBlock/LumiBlockComps/src/LuminosityCondAlg.cxx 11 additions, 4 deletions

LumiBlock/LumiBlockComps/src/LuminosityCondAlg.cxx
LumiBlock/LumiBlockComps/test/LuminosityCondAlg_test.cxx 92 additions, 11 deletions

LumiBlock/LumiBlockComps/test/LuminosityCondAlg_test.cxx
LumiBlock/LumiBlockComps/test/TrigLiveFractionCondAlg_test.cxx 12 additions, 2 deletions

...lock/LumiBlockComps/test/TrigLiveFractionCondAlg_test.cxx
LumiBlock/LumiBlockData/LumiBlockData/LuminosityCondData.h 1 addition, 1 deletion

LumiBlock/LumiBlockData/LumiBlockData/LuminosityCondData.h

with 132 additions and 25 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