Merge branch 'ParticleKillerFix_master' into 'master'

ISF Syntax Tidying

See merge request atlas/athena!23594

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() );
         }
       }

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 ) {

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;
 

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 )

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;