Merge branch 'PhysicsListToolBase_patch_21.0' into '21.0'

PhysicsListToolBase patch for ATLASSIM-3383

See merge request !3537

Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasAlg.cxx

@@ -138,7 +138,6 @@ void G4AtlasAlg::initializeOnce()
     // Worker Thread initialization used to create worker run manager on demand.
     // @TODO use this class to pass any configuration to worker run manager.
     runMgr->SetUserInitialization( new G4AtlasUserWorkerThreadInitialization );
-    runMgr->SetUserInitialization( m_physListTool->GetPhysicsList() );
 #else
     throw std::runtime_error("Trying to use multi-threading in non-MT build!");
 #endif
@@ -151,7 +150,6 @@ void G4AtlasAlg::initializeOnce()
     runMgr->SetRecordFlux( m_recordFlux );
     runMgr->SetLogLevel( int(msg().level()) ); // Synch log levels
     runMgr->SetUserActionSvc( m_userActionSvc.typeAndName() );
-    runMgr->SetUserInitialization(m_physListTool->GetPhysicsList());
   }
 
   // G4 user interface commands

Simulation/G4Atlas/G4AtlasTools/src/PhysicsListToolBase.cxx

@@ -57,7 +57,7 @@ StatusCode PhysicsListToolBase::initialize( )
 
 void PhysicsListToolBase::CreatePhysicsList()
 {
-
+  ATH_MSG_DEBUG("PhysicsListToolBase::CreatePhysicsList()");
   if (m_physicsListName != ""){
     G4PhysListFactory factory;
     AtlasPhysListFactory Atlasfactory;
@@ -92,20 +92,22 @@ void PhysicsListToolBase::CreatePhysicsList()
     }
 
   //ConstructProcess();
+  ATH_MSG_DEBUG("end of PhysicsListToolBase::CreatePhysicsList()");
 }
 
 G4VUserPhysicsList* PhysicsListToolBase::GetPhysicsList()
 {
-  if (!m_physicsList)
-    {
-      CreatePhysicsList();
-    }
+  if (!m_physicsList) {
+    this->CreatePhysicsList();
+  }
   return m_physicsList;
 }
 
 void PhysicsListToolBase::SetPhysicsList()
 {
-  CreatePhysicsList();
+  if(!m_physicsList) {
+    this->CreatePhysicsList();
+  }
   G4RunManager::GetRunManager()->SetUserInitialization(m_physicsList);
 }
 

Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.cxx

@@ -125,7 +125,6 @@ StatusCode iGeant4::G4TransportTool::initialize()
   m_pRunMgr->SetSDMasterTool(m_senDetTool.typeAndName() );
   m_pRunMgr->SetFastSimMasterTool(m_fastSimTool.typeAndName() );
   m_pRunMgr->SetPhysListTool(m_physListTool.typeAndName() );
-  m_pRunMgr->SetUserInitialization(m_physListTool->GetPhysicsList());
 
   ATH_CHECK( m_userActionSvc.retrieve() );
 
@@ -190,7 +189,6 @@ StatusCode iGeant4::G4TransportTool::initialize()
     ui->ApplyCommand( g4command );
   }
 
-  ATH_MSG_DEBUG("initalize");
   /*
     if (m_particleBroker.retrieve().isSuccess())
     ATH_MSG_DEBUG("retrieved "<<m_particleBroker);