Skip to content
Snippets Groups Projects
Commit 699c85db authored by Andy Haas's avatar Andy Haas
Browse files

cleaned up a bit

parent 6da603cd
No related branches found
No related tags found
No related merge requests found
...@@ -4,20 +4,9 @@ ...@@ -4,20 +4,9 @@
#ifndef __IFTK_DUPLICATETRACKREMOVAL_TOOL_H__ #ifndef __IFTK_DUPLICATETRACKREMOVAL_TOOL_H__
#define __IFTK_DUPLICATETRACKREMOVAL_TOOL_H__ #define __IFTK_DUPLICATETRACKREMOVAL_TOOL_H__
#include "GaudiKernel/IAlgTool.h" #include "GaudiKernel/IAlgTool.h"
//#include "AthenaKernel/IOVSvcDefs.h"
class VxContainer;
#include "TrigFTK_RawData/FTK_RawTrack.h"
#include "TrigFTK_RawData/FTK_RawTrackContainer.h" #include "TrigFTK_RawData/FTK_RawTrackContainer.h"
#include "xAODTracking/VertexFwd.h"
//#include "xAODTracking/TrackParticleFwd.h"
#include "xAODTracking/VertexContainerFwd.h"
#include "xAODTracking/VertexAuxContainer.h"
#include "TrkTrack/TrackCollection.h"
//#include "xAODTracking/TrackParticleContainerFwd.h"
//namespace Trk {
//// class Track;
//}
static const InterfaceID IID_IFTK_DuplicateTrackRemovalTool("IFTK_DuplicateTrackRemovalTool",1,0); static const InterfaceID IID_IFTK_DuplicateTrackRemovalTool("IFTK_DuplicateTrackRemovalTool",1,0);
class IFTK_DuplicateTrackRemovalTool : virtual public IAlgTool { class IFTK_DuplicateTrackRemovalTool : virtual public IAlgTool {
...@@ -30,6 +19,7 @@ class IFTK_DuplicateTrackRemovalTool : virtual public IAlgTool { ...@@ -30,6 +19,7 @@ class IFTK_DuplicateTrackRemovalTool : virtual public IAlgTool {
virtual FTK_RawTrackContainer* removeDuplicates(const FTK_RawTrackContainer* trks) = 0; virtual FTK_RawTrackContainer* removeDuplicates(const FTK_RawTrackContainer* trks) = 0;
private: private:
}; };
#endif #endif
...@@ -30,7 +30,6 @@ class FTK_DuplicateTrackRemovalTool : public AthAlgTool, virtual public IFTK_Dup ...@@ -30,7 +30,6 @@ class FTK_DuplicateTrackRemovalTool : public AthAlgTool, virtual public IFTK_Dup
FTK_RawTrackContainer* removeDuplicates(const FTK_RawTrackContainer* trks); FTK_RawTrackContainer* removeDuplicates(const FTK_RawTrackContainer* trks);
private: private:
FTK_RawTrackContainer* m_trks_nodups; FTK_RawTrackContainer* m_trks_nodups;
ToolHandle<IFTK_UncertaintyTool> m_uncertaintyTool;
bool match(const FTK_RawTrack* track, const FTK_RawTrack* oldtrack) const; bool match(const FTK_RawTrack* track, const FTK_RawTrack* oldtrack) const;
const FTK_RawTrack* besttrack(const FTK_RawTrack* track, const FTK_RawTrack* oldtrack) const; const FTK_RawTrack* besttrack(const FTK_RawTrack* track, const FTK_RawTrack* oldtrack) const;
int m_HW_ndiff; int m_HW_ndiff;
......
...@@ -12,11 +12,9 @@ FTK_DuplicateTrackRemovalTool::FTK_DuplicateTrackRemovalTool(const std::string& ...@@ -12,11 +12,9 @@ FTK_DuplicateTrackRemovalTool::FTK_DuplicateTrackRemovalTool(const std::string&
const IInterface* p ): const IInterface* p ):
AthAlgTool(t,n,p), AthAlgTool(t,n,p),
m_trks_nodups(NULL), m_trks_nodups(NULL),
m_uncertaintyTool("FTK_UncertaintyTool",this),
m_HW_ndiff(6) m_HW_ndiff(6)
{ {
declareInterface< IFTK_DuplicateTrackRemovalTool >( this ); declareInterface< IFTK_DuplicateTrackRemovalTool >( this );
declareProperty( "UncertaintyTool", m_uncertaintyTool);
declareProperty("HW_ndiff",m_HW_ndiff); declareProperty("HW_ndiff",m_HW_ndiff);
} }
......
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