From 6aa34794fe55e8ad9d05dbb4ea2a25b40f1f4873 Mon Sep 17 00:00:00 2001 From: John Chapman Date: Thu, 16 Jul 2020 14:44:16 +0200 Subject: [PATCH] Update how G4AtlasAlg is seeded to allow output to match FullG4 in ISF --- Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasAlg.cxx | 4 ++-- Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasAlg.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasAlg.cxx b/Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasAlg.cxx index 6fc596429b0..a67569805da 100644 --- a/Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasAlg.cxx +++ b/Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasAlg.cxx @@ -311,8 +311,8 @@ StatusCode G4AtlasAlg::execute() // Set the RNG to use for this event. We need to reset it for MT jobs // because of the mismatch between Gaudi slot-local and G4 thread-local RNG. - ATHRNG::RNGWrapper* rngWrapper = m_rndmGenSvc->getEngine(this); - rngWrapper->setSeed( name(), Gaudi::Hive::currentContext() ); + ATHRNG::RNGWrapper* rngWrapper = m_rndmGenSvc->getEngine(this, m_randomStreamName); + rngWrapper->setSeed( m_randomStreamName, Gaudi::Hive::currentContext() ); G4Random::setTheEngine(*rngWrapper); ATH_MSG_DEBUG("Calling SimulateG4Event"); diff --git a/Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasAlg.h b/Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasAlg.h index d69a20e2b39..d457b07c8b9 100644 --- a/Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasAlg.h +++ b/Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasAlg.h @@ -122,6 +122,8 @@ private: Gaudi::Property m_activateParallelGeometries{this, "ActivateParallelWorlds", false, "Toggle on/off the G4 parallel geometry system"}; /// Random number service ServiceHandle m_rndmGenSvc{this, "AtRndmGenSvc", "AthRNGSvc", ""}; // TODO rename property + /// Random Stream Name + Gaudi::Property m_randomStreamName{this, "RandomStreamName", "Geant4", ""}; /// ServiceHandle m_userLimitsSvc{this, "UserLimitsSvc", "UserLimitsSvc", ""}; /// User Action Service -- GitLab