Skip to content
Snippets Groups Projects
Commit b1a10ff9 authored by Walter Lampl's avatar Walter Lampl
Browse files

Merge branch 'master_removeUnusedIncident' into 'master'

Removed unused incident handler in TruthTrackBuilder.

See merge request atlas/athena!25294
parents 7416ce46 180681ea
No related branches found
No related tags found
No related merge requests found
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
/** Constructor **/ /** Constructor **/
Trk::TruthTrackBuilder::TruthTrackBuilder(const std::string& t, const std::string& n, const IInterface* p) : Trk::TruthTrackBuilder::TruthTrackBuilder(const std::string& t, const std::string& n, const IInterface* p) :
AthAlgTool(t,n,p), AthAlgTool(t,n,p),
m_incidentSvc("IncidentSvc", n),
m_trackFitter(""), m_trackFitter(""),
m_extrapolator(""), m_extrapolator(""),
m_rotcreator(""), m_rotcreator(""),
...@@ -92,11 +91,6 @@ StatusCode Trk::TruthTrackBuilder::initialize() ...@@ -92,11 +91,6 @@ StatusCode Trk::TruthTrackBuilder::initialize()
return StatusCode::FAILURE; return StatusCode::FAILURE;
} }
// Athena/Gaudi framework
if (m_incidentSvc.retrieve().isFailure()){
ATH_MSG_ERROR("Could not retrieve " << m_incidentSvc << ". Aborting ...");
return StatusCode::FAILURE;
}
// particle property service // particle property service
if (m_particlePropSvc.retrieve().isFailure()) if (m_particlePropSvc.retrieve().isFailure())
{ {
...@@ -117,19 +111,9 @@ StatusCode Trk::TruthTrackBuilder::initialize() ...@@ -117,19 +111,9 @@ StatusCode Trk::TruthTrackBuilder::initialize()
ATH_MSG_ERROR ("Could not get AtlasDetectorID helper" ); ATH_MSG_ERROR ("Could not get AtlasDetectorID helper" );
return StatusCode::FAILURE; return StatusCode::FAILURE;
} }
// register to the incident service: EndEvent for eventual cache cleaning d
m_incidentSvc->addListener( this, IncidentType::EndEvent);
return StatusCode::SUCCESS; return StatusCode::SUCCESS;
} }
void Trk::TruthTrackBuilder::handle(const Incident& inc) {
// clear cache if needed
if (inc.type() == IncidentType::EndEvent ){
//
}
}
StatusCode Trk::TruthTrackBuilder::finalize() StatusCode Trk::TruthTrackBuilder::finalize()
{ {
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
// Gaudi // Gaudi
#include "AthenaBaseComps/AthAlgTool.h" #include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ToolHandle.h" #include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/IIncidentListener.h"
#include "GaudiKernel/IPartPropSvc.h" #include "GaudiKernel/IPartPropSvc.h"
// Trk includes // Trk includes
#include "TrkTruthTrackInterfaces/ITruthTrackBuilder.h" #include "TrkTruthTrackInterfaces/ITruthTrackBuilder.h"
...@@ -38,7 +37,7 @@ namespace Trk { ...@@ -38,7 +37,7 @@ namespace Trk {
@author Andreas.Salzburger -at- cern.ch, Thijs.Cornelissen -at- cern.ch @author Andreas.Salzburger -at- cern.ch, Thijs.Cornelissen -at- cern.ch
*/ */
class TruthTrackBuilder : public AthAlgTool, public IIncidentListener, virtual public ITruthTrackBuilder { class TruthTrackBuilder : public AthAlgTool, virtual public ITruthTrackBuilder {
public: public:
//** Constructor with parameters */ //** Constructor with parameters */
...@@ -51,12 +50,7 @@ namespace Trk { ...@@ -51,12 +50,7 @@ namespace Trk {
/** return a map of GenParticles to PRDs for further processing **/ /** return a map of GenParticles to PRDs for further processing **/
Track* createTrack(const PRD_TruthTrajectory& prdTraj, SegmentCollection* segs = 0 ) const; Track* createTrack(const PRD_TruthTrajectory& prdTraj, SegmentCollection* segs = 0 ) const;
/** the incident listener for cache refresh */
void handle(const Incident& inc) ;
private: private:
ServiceHandle<IIncidentSvc> m_incidentSvc; //!< Incident Service for cache cleaning
ToolHandle<ITrackFitter> m_trackFitter; //!< fits the PRDs ToolHandle<ITrackFitter> m_trackFitter; //!< fits the PRDs
ToolHandle<IExtrapolator> m_extrapolator; //!< extrapolator ToolHandle<IExtrapolator> m_extrapolator; //!< extrapolator
ToolHandle< IRIO_OnTrackCreator > m_rotcreator; ToolHandle< IRIO_OnTrackCreator > m_rotcreator;
......
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