diff --git a/Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernel.cxx b/Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernel.cxx index fe67e031f7fd199e47b3a0d4bc1def96f78be37a..d3a7ff3acbdb5f735cb4a94173abe8dd32acd1b0 100644 --- a/Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernel.cxx +++ b/Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernel.cxx @@ -431,10 +431,10 @@ StatusCode ISF::SimKernel::execute() // -> releaseEvent() if ( curSimSvc){ if( curSimSvc->releaseEvent().isFailure() ) { - ATH_MSG_WARNING( "Event setup failed for " + ATH_MSG_WARNING( "Event release failed for " << curSimSvc->simSvcDescriptor() ); } else { - ATH_MSG_DEBUG ( "Event setup done for " + ATH_MSG_DEBUG ( "Event release done for " << curSimSvc->simSvcDescriptor() ); } } diff --git a/Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/BaseSimulatorTool.h b/Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/BaseSimulatorTool.h index 84a42200f338137dc5395b0dd63ccbbb965733b5..5490dc3b2225fb9a554645a31e7071cb812eb995 100644 --- a/Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/BaseSimulatorTool.h +++ b/Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/BaseSimulatorTool.h @@ -67,7 +67,7 @@ namespace ISF { /** Setup Event chain - in case of a begin-of event action is needed (called by ISimulationSvc) */ virtual StatusCode setupEventST() override - { return StatusCode::FAILURE; } + { return setupEvent(); } /** */ virtual StatusCode simulate( const ISFParticle& , ISFParticleContainer&, McEventCollection*) override @@ -94,7 +94,7 @@ namespace ISF { /** Release Event chain - in case of an end-of event action is needed (called by ISimulationSvc) */ virtual StatusCode releaseEventST() override - { return StatusCode::FAILURE; } + { return releaseEvent(); } /** wrapper call to start chrono with given tag */ const ChronoEntity* chronoStart(const IChronoSvc::ChronoTag& tag ) { diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/src/FatrasSimTool.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/src/FatrasSimTool.h index ea6977911f780f9945d2aa4f76afba927f109f5a..831b36cae2d7697bf34bbd689d56488444f4035e 100644 --- a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/src/FatrasSimTool.h +++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/src/FatrasSimTool.h @@ -30,13 +30,9 @@ namespace ISF { virtual StatusCode setupEvent() override { return StatusCode::SUCCESS; }; - virtual StatusCode setupEventST() override { return setupEvent(); }; - virtual StatusCode releaseEvent() override { return StatusCode::SUCCESS; }; - virtual StatusCode releaseEventST() override { return releaseEvent(); }; - - virtual ISF:: SimulationFlavor simFlavor() const override { return ISF::Fatras; }; + virtual ISF::SimulationFlavor simFlavor() const override { return ISF::Fatras; }; virtual void push( ISF::ISFParticle *particle, const ISF::ISFParticle *parent ) override; diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.cxx index dc5868acb5cc24b0f828a0f78e6a8649b088ed49..db8fa8171d8a7525508a91e916e515c4ddbf7a41 100644 --- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.cxx +++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.cxx @@ -305,12 +305,6 @@ StatusCode iGeant4::G4TransportTool::setupEvent() return StatusCode::SUCCESS; } -//________________________________________________________________________ -StatusCode iGeant4::G4TransportTool::setupEventST() -{ - return setupEvent(); -} - //________________________________________________________________________ StatusCode iGeant4::G4TransportTool::releaseEvent() { @@ -357,12 +351,6 @@ StatusCode iGeant4::G4TransportTool::releaseEvent() return StatusCode::SUCCESS; } -//________________________________________________________________________ -StatusCode iGeant4::G4TransportTool::releaseEventST() -{ - return releaseEvent(); -} - //________________________________________________________________________ // Act as particle broker for G4 secondaries void iGeant4::G4TransportTool::push( ISF::ISFParticle *particle, const ISF::ISFParticle *parent ) diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.h b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.h index 8a6289300ff7840c2be96fa786ebe980387f32c0..b76f40cc408b7429e2addbb45bc25db488300dec 100644 --- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.h +++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.h @@ -83,12 +83,8 @@ namespace iGeant4 virtual StatusCode setupEvent() override; - virtual StatusCode setupEventST() override; - virtual StatusCode releaseEvent() override; - virtual StatusCode releaseEventST() override; - virtual ISF::SimulationFlavor simFlavor() const override { return ISF::Geant4; }; virtual void push( ISF::ISFParticle *particle, const ISF::ISFParticle *parent ) override;