Merge branch 'revert_revert_of_MR_6_of_12' into '21.0' (d3fff922) · Commits · Lawrence Davou Christopher / athena

Commit d3fff922 authored 7 years ago by James Beacham

Merge branch 'revert_revert_of_MR_6_of_12' into '21.0'

Revert "Revert "Merge branch 'FCS_StepInfoSDs_ATLASSIM-3443_21.0' into '21.0'""

See merge request !5443

Former-commit-id: e776bafbc8ce4cb288631af1d5e3ed0ec92beb5b

parents f79cd549 bdb5b348

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Simulation/G4Atlas/G4AtlasApps/python/SimFlags.py 8 additions, 0 deletions

Simulation/G4Atlas/G4AtlasApps/python/SimFlags.py
Simulation/G4Atlas/G4AtlasTools/python/G4AtlasToolsConfig.py 3 additions, 0 deletions

Simulation/G4Atlas/G4AtlasTools/python/G4AtlasToolsConfig.py
Simulation/ISF/ISF_Example/python/ISF_Output.py 1 addition, 1 deletion

Simulation/ISF/ISF_Example/python/ISF_Output.py
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_FastCaloSimParametrization_SimPostInclude.py 20 additions, 0 deletions

...on/share/ISF_FastCaloSimParametrization_SimPostInclude.py
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_FastCaloSimParametrization_SimPostInclude_1mm.py 8 additions, 0 deletions

...hare/ISF_FastCaloSimParametrization_SimPostInclude_1mm.py
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_FastCaloSimParametrization_SimPreInclude.py 1 addition, 19 deletions

...ion/share/ISF_FastCaloSimParametrization_SimPreInclude.py
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/share/ISF_FastCaloSimParametrization_SimPreInclude_1mm.py 0 additions, 6 deletions

...share/ISF_FastCaloSimParametrization_SimPreInclude_1mm.py
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/CMakeLists.txt 41 additions, 0 deletions

...tion/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/CMakeLists.txt
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/python/ISF_FastCaloSimSDConfig.py 31 additions, 0 deletions

...loSim/ISF_FastCaloSimSD/python/ISF_FastCaloSimSDConfig.py
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/python/ISF_FastCaloSimSDConfigDb.py 5 additions, 0 deletions

...Sim/ISF_FastCaloSimSD/python/ISF_FastCaloSimSDConfigDb.py
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/FCS_StepInfoSD.cxx 227 additions, 0 deletions

.../ISF_FastCaloSim/ISF_FastCaloSimSD/src/FCS_StepInfoSD.cxx
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/FCS_StepInfoSD.h 143 additions, 0 deletions

...SF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/FCS_StepInfoSD.h
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/FCS_StepInfoSDTool.cxx 290 additions, 0 deletions

..._FastCaloSim/ISF_FastCaloSimSD/src/FCS_StepInfoSDTool.cxx
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/FCS_StepInfoSDTool.h 123 additions, 0 deletions

...SF_FastCaloSim/ISF_FastCaloSimSD/src/FCS_StepInfoSDTool.h
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/LArFCS_StepInfoSD.cxx 274 additions, 0 deletions

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

...ISF_FastCaloSim/ISF_FastCaloSimSD/src/LArFCS_StepInfoSD.h
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/SDWrapper.cxx 101 additions, 0 deletions

...n/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/SDWrapper.cxx
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/SDWrapper.h 94 additions, 0 deletions

...ion/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/SDWrapper.h
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/TileFCS_StepInfoSD.cxx 100 additions, 0 deletions

..._FastCaloSim/ISF_FastCaloSimSD/src/TileFCS_StepInfoSD.cxx
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimSD/src/TileFCS_StepInfoSD.h 48 additions, 0 deletions

...SF_FastCaloSim/ISF_FastCaloSimSD/src/TileFCS_StepInfoSD.h

with 1569 additions and 26 deletions

Please register or to comment