Merge branch 'reentrantMaker.CaloRec-20190211' into 'master' (b96f5ff4) · Commits · atlas / athena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

athena
- Activity
- Members
- Labels
- Jira

Snippets Groups Projects

b96f5ff4

Commit b96f5ff4 authored 6 years ago by Adam Edward Barton

:speech_balloon:

Downloads
- Plain Diff

Merge branch 'reentrantMaker.CaloRec-20190211' into 'master'

CaloRec: Make CaloCellMaker/CaloConstCellMaker reentrant.

See merge request !21041

parents 9ca6d31c 243a9989

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

Calorimeter/CaloRec/src/CaloCellMaker.cxx 9 additions, 15 deletions

Calorimeter/CaloRec/src/CaloCellMaker.cxx
Calorimeter/CaloRec/src/CaloCellMaker.h 6 additions, 6 deletions

Calorimeter/CaloRec/src/CaloCellMaker.h
Calorimeter/CaloRec/src/CaloConstCellMaker.cxx 7 additions, 10 deletions

Calorimeter/CaloRec/src/CaloConstCellMaker.cxx
Calorimeter/CaloRec/src/CaloConstCellMaker.h 4 additions, 7 deletions

Calorimeter/CaloRec/src/CaloConstCellMaker.h
Calorimeter/CaloRec/test/CaloCellContainerFromClusterTool_test.cxx 6 additions, 6 deletions

...er/CaloRec/test/CaloCellContainerFromClusterTool_test.cxx

with 32 additions and 44 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