Merge branch 'cherry-pick-5356823528-master' into 'master' (e111a315) · Commits · atlas / athena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

athena
- Activity
- Members
- Labels
- Jira

Snippets Groups Projects

e111a315

Commit e111a315 authored 7 years ago by Vakhtang Tsulaia

Downloads
- Plain Diff

Merge branch 'cherry-pick-53568235-master' into 'master'

Sweeping !7388 from 21.0 to master.
Simplify merging scheme for LArFCS_StepInfoSD

See merge request atlas/athena!7469

parents 1d9fce2f 39e17f9c

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_FastCaloSimParametrization_SimPostInclude_1mm.py 6 additions, 2 deletions

...hare/ISF_FastCaloSimParametrization_SimPostInclude_1mm.py
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/FCS_StepInfoSD.h 1 addition, 0 deletions

...SF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/FCS_StepInfoSD.h
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/FCS_StepInfoSDTool.cxx 1 addition, 0 deletions

..._FastCaloSim/ISF_FastCaloSimSD/src/FCS_StepInfoSDTool.cxx
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/LArFCS_StepInfoSD.cxx 44 additions, 0 deletions

...F_FastCaloSim/ISF_FastCaloSimSD/src/LArFCS_StepInfoSD.cxx
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/LArFCS_StepInfoSD.h 5 additions, 0 deletions

...ISF_FastCaloSim/ISF_FastCaloSimSD/src/LArFCS_StepInfoSD.h

with 57 additions and 2 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