Merge branch 'TransportToolFix_ATLASSIM-2755_master' into 'master' (81b32383) · Commits · Lidija Zivkovic / athena

Commit 81b32383 authored 6 years ago by Vakhtang Tsulaia

Merge branch 'TransportToolFix_ATLASSIM-2755_master' into 'master'

SimKernel passes an McEventCollection in ISimulationSvc::simulateVector calls

See merge request atlas/athena!16565

parents 1f95538e 6082043e

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernel.cxx 5 additions, 3 deletions

Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernel.cxx
Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernelMT.cxx 2 additions, 2 deletions

Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernelMT.cxx
Simulation/ISF/ISF_Core/ISF_Algorithms/test/SimKernelMT_test.cxx 3 additions, 3 deletions

...ion/ISF/ISF_Core/ISF_Algorithms/test/SimKernelMT_test.cxx
Simulation/ISF/ISF_Core/ISF_Interfaces/CMakeLists.txt 2 additions, 1 deletion

Simulation/ISF/ISF_Core/ISF_Interfaces/CMakeLists.txt
Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/BaseSimulationSvc.h 5 additions, 4 deletions

...SF_Core/ISF_Interfaces/ISF_Interfaces/BaseSimulationSvc.h
Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/BaseSimulatorTool.h 3 additions, 3 deletions

...SF_Core/ISF_Interfaces/ISF_Interfaces/BaseSimulatorTool.h
Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/ISimulationSvc.h 4 additions, 2 deletions

...F/ISF_Core/ISF_Interfaces/ISF_Interfaces/ISimulationSvc.h
Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/ISimulatorTool.h 4 additions, 2 deletions

...F/ISF_Core/ISF_Interfaces/ISF_Interfaces/ISimulatorTool.h
Simulation/ISF/ISF_Core/ISF_Services/src/ParticleKillerSimSvc.cxx 2 additions, 2 deletions

...on/ISF/ISF_Core/ISF_Services/src/ParticleKillerSimSvc.cxx
Simulation/ISF/ISF_Core/ISF_Services/src/ParticleKillerSimSvc.h 1 addition, 1 deletion

...tion/ISF/ISF_Core/ISF_Services/src/ParticleKillerSimSvc.h
Simulation/ISF/ISF_Core/ISF_Tools/src/ParticleKillerSimTool.cxx 3 additions, 3 deletions

...tion/ISF/ISF_Core/ISF_Tools/src/ParticleKillerSimTool.cxx
Simulation/ISF/ISF_Core/ISF_Tools/src/ParticleKillerSimTool.h 2 additions, 2 deletions

...lation/ISF/ISF_Core/ISF_Tools/src/ParticleKillerSimTool.h
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/ISF_FastCaloSimParametrization/NativeFastCaloSimSvc.h 1 addition, 1 deletion

...ion/ISF_FastCaloSimParametrization/NativeFastCaloSimSvc.h
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/src/NativeFastCaloSimSvc.cxx 1 addition, 1 deletion

...F_FastCaloSimParametrization/src/NativeFastCaloSimSvc.cxx
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvc.cxx 2 additions, 2 deletions

...astCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvc.cxx
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvc.h 1 addition, 2 deletions

..._FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvc.h
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvcPU.cxx 1 addition, 1 deletion

...tCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvcPU.cxx
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvcPU.h 1 addition, 1 deletion

...astCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvcPU.h
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvcV2.cxx 1 addition, 1 deletion

...tCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvcV2.cxx
Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvcV2.h 1 addition, 1 deletion

...astCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvcV2.h

with 45 additions and 38 deletions

Please register or to comment