Skip to content
Snippets Groups Projects
Commit 1a0d5ef0 authored by scott snyder's avatar scott snyder
Browse files

AthenaPython: Change beginRun/endRun hooks to start/stop.

beginRun and endRun are no longer supported by Gaudi.
Fixes test failures.
parent 96d68463
No related branches found
No related tags found
No related merge requests found
...@@ -42,16 +42,16 @@ class Alg : virtual public ::IPyComponent, ...@@ -42,16 +42,16 @@ class Alg : virtual public ::IPyComponent,
virtual ~Alg(); virtual ~Alg();
// Framework's Hooks // Framework's Hooks
virtual StatusCode initialize(); virtual StatusCode initialize() override;
virtual StatusCode reinitialize(); virtual StatusCode reinitialize() override;
virtual StatusCode beginRun(); virtual StatusCode start() override;
virtual StatusCode execute(); virtual StatusCode execute() override;
virtual StatusCode endRun(); virtual StatusCode stop() override;
virtual StatusCode finalize(); virtual StatusCode finalize() override;
virtual StatusCode sysInitialize(); virtual StatusCode sysInitialize() override;
virtual void resetExecuted(); virtual void resetExecuted() override;
/////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////
// Const methods: // Const methods:
...@@ -61,7 +61,7 @@ class Alg : virtual public ::IPyComponent, ...@@ -61,7 +61,7 @@ class Alg : virtual public ::IPyComponent,
* This is used by concrete implementations to connect a python * This is used by concrete implementations to connect a python
* component to its C++ counter-part * component to its C++ counter-part
*/ */
virtual const char* typeName() const; virtual const char* typeName() const override;
/////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////
// Non-const methods: // Non-const methods:
...@@ -69,7 +69,7 @@ class Alg : virtual public ::IPyComponent, ...@@ -69,7 +69,7 @@ class Alg : virtual public ::IPyComponent,
/** @brief return associated python object. BORROWED reference. /** @brief return associated python object. BORROWED reference.
*/ */
virtual PyObject* self() { return m_self; } virtual PyObject* self() override { return m_self; }
/////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////
// Protected methods: // Protected methods:
...@@ -78,7 +78,7 @@ class Alg : virtual public ::IPyComponent, ...@@ -78,7 +78,7 @@ class Alg : virtual public ::IPyComponent,
/** attach the C++ component to its python cousin /** attach the C++ component to its python cousin
*/ */
virtual bool setPyAttr( PyObject* pyobj ); virtual bool setPyAttr( PyObject* pyobj ) override;
/////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////
// Private data: // Private data:
......
...@@ -126,16 +126,16 @@ class Alg( CfgPyAlgorithm ): ...@@ -126,16 +126,16 @@ class Alg( CfgPyAlgorithm ):
def finalize(self): def finalize(self):
return StatusCode.Success return StatusCode.Success
def sysBeginRun(self): def sysStart(self):
return self.beginRun() return self.start()
def beginRun(self): def start(self):
return StatusCode.Success return StatusCode.Success
def sysEndRun(self): def sysStop(self):
return self.endRun() return self.stop()
def endRun(self): def stop(self):
return StatusCode.Success return StatusCode.Success
def filterPassed(self): def filterPassed(self):
......
...@@ -71,15 +71,15 @@ Alg::reinitialize() ...@@ -71,15 +71,15 @@ Alg::reinitialize()
} }
StatusCode StatusCode
Alg::beginRun() Alg::start()
{ {
return PyAthena::callPyMethod( m_self, "sysBeginRun" ); return PyAthena::callPyMethod( m_self, "sysStart" );
} }
StatusCode StatusCode
Alg::endRun() Alg::stop()
{ {
return PyAthena::callPyMethod( m_self, "sysEndRun" ); return PyAthena::callPyMethod( m_self, "sysStop" );
} }
StatusCode StatusCode
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment