Skip to content
Snippets Groups Projects
Commit 8557eb88 authored by John Baines's avatar John Baines Committed by Graeme Stewart
Browse files

fix typo preventing filling of TrackParticleCache (FTK_DataProviderSvc-00-00-44)

parent b59bca51
No related branches found
No related tags found
No related merge requests found
################################################################################
# Package: FTK_DataProviderSvc
################################################################################
# Declare the package name:
atlas_subdir( FTK_DataProviderSvc )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Control/StoreGate
Event/xAOD/xAODTracking
GaudiKernel
InnerDetector/InDetRecEvent/InDetPrepRawData
InnerDetector/InDetRecEvent/InDetRIO_OnTrack
Tools/PyJobTransforms
Tracking/TrkEvent/TrkTrack
Trigger/TrigFTK/FTK_DataProviderInterfaces
Trigger/TrigFTK/TrigFTK_RawData
PRIVATE
DetectorDescription/AtlasDetDescr
DetectorDescription/GeoPrimitives
DetectorDescription/IRegionSelector
DetectorDescription/RoiDescriptor
Event/EventInfo
Generators/GeneratorObjects
InnerDetector/InDetConditions/PixelConditionsServices
InnerDetector/InDetDetDescr/InDetIdentifier
InnerDetector/InDetDetDescr/InDetReadoutGeometry
InnerDetector/InDetRecTools/InDetRecToolInterfaces
Tracking/TrkEvent/TrkEventPrimitives
Tracking/TrkEvent/TrkParameters
Tracking/TrkEvent/TrkRIO_OnTrack
Tracking/TrkEvent/TrkTrackSummary
Tracking/TrkEvent/TrkTruthData
Tracking/TrkFitter/TrkFitterInterfaces
Tracking/TrkFitter/TrkFitterUtils
Tracking/TrkTools/TrkToolInterfaces
Trigger/TrigFTK/FTK_RecToolInterfaces )
# External dependencies:
find_package( CLHEP )
find_package( Eigen )
find_package( HepMC )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_library( FTK_DataProviderSvcLib
src/*.cxx
PUBLIC_HEADERS FTK_DataProviderSvc
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps xAODTracking GaudiKernel InDetPrepRawData InDetRIO_OnTrack TrkTrack VxVertex FTK_DataProviderInterfaces TrigFTK_RawData StoreGateLib SGtests
PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} ${EIGEN_LIBRARIES} AtlasDetDescr GeoPrimitives IRegionSelector RoiDescriptor EventInfo GeneratorObjects InDetIdentifier InDetReadoutGeometry InDetRecToolInterfaces TrkEventPrimitives TrkParameters TrkRIO_OnTrack TrkTrackSummary TrkTruthData TrkFitterInterfaces TrkFitterUtils TrkToolInterfaces )
atlas_add_component( FTK_DataProviderSvc
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps StoreGateLib SGtests xAODTracking GaudiKernel InDetPrepRawData InDetRIO_OnTrack TrkTrack VxVertex FTK_DataProviderInterfaces TrigFTK_RawData AtlasDetDescr GeoPrimitives IRegionSelector RoiDescriptor EventInfo GeneratorObjects InDetIdentifier InDetReadoutGeometry InDetRecToolInterfaces TrkEventPrimitives TrkParameters TrkRIO_OnTrack TrkTrackSummary TrkTruthData TrkFitterInterfaces TrkFitterUtils TrkToolInterfaces FTK_DataProviderSvcLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
atlas_install_runtime( share/FTK_DataProviderLoad.py )
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include "TrigFTK_RawData/FTK_RawTrack.h" #include "TrigFTK_RawData/FTK_RawTrack.h"
#include "TrigFTK_RawData/FTK_RawTrackContainer.h" #include "TrigFTK_RawData/FTK_RawTrackContainer.h"
#include "TrkTrack/TrackCollection.h" #include "TrkTrack/TrackCollection.h"
#include "VxVertex/VxContainer.h"
#include "FTK_DataProviderInterfaces/IFTK_DataProviderSvc.h" #include "FTK_DataProviderInterfaces/IFTK_DataProviderSvc.h"
//#include "TrkFitterInterfaces/ITrackFitter.h" //#include "TrkFitterInterfaces/ITrackFitter.h"
...@@ -90,7 +89,6 @@ class FTK_DataProviderSvc : public virtual IFTK_DataProviderSvc, virtual public ...@@ -90,7 +89,6 @@ class FTK_DataProviderSvc : public virtual IFTK_DataProviderSvc, virtual public
virtual xAOD::TrackParticleContainer* getTrackParticles(const bool withRefit); virtual xAOD::TrackParticleContainer* getTrackParticles(const bool withRefit);
virtual xAOD::TrackParticleContainer* getTrackParticlesInRoi(const IRoiDescriptor&, const bool withRefit); virtual xAOD::TrackParticleContainer* getTrackParticlesInRoi(const IRoiDescriptor&, const bool withRefit);
virtual VxContainer* getVxContainer(const ftk::FTK_TrackType trackType);
virtual xAOD::VertexContainer* getVertexContainer(const bool withRefit); virtual xAOD::VertexContainer* getVertexContainer(const bool withRefit);
StatusCode getVertexContainer(xAOD::VertexContainer* vertex, const bool withRefit); StatusCode getVertexContainer(xAOD::VertexContainer* vertex, const bool withRefit);
...@@ -103,7 +101,6 @@ class FTK_DataProviderSvc : public virtual IFTK_DataProviderSvc, virtual public ...@@ -103,7 +101,6 @@ class FTK_DataProviderSvc : public virtual IFTK_DataProviderSvc, virtual public
StatusCode initTrackParticleCache(bool do_refit); StatusCode initTrackParticleCache(bool do_refit);
StatusCode fillTrackCache(bool do_refit); StatusCode fillTrackCache(bool do_refit);
StatusCode fillTrackParticleCache(const bool withRefit); StatusCode fillTrackParticleCache(const bool withRefit);
bool fillVxContainer(bool withRefit, TrackCollection* tracks);
bool fillVertexContainerCache(bool withRefit, xAOD::TrackParticleContainer*); bool fillVertexContainerCache(bool withRefit, xAOD::TrackParticleContainer*);
protected: protected:
...@@ -161,14 +158,6 @@ class FTK_DataProviderSvc : public virtual IFTK_DataProviderSvc, virtual public ...@@ -161,14 +158,6 @@ class FTK_DataProviderSvc : public virtual IFTK_DataProviderSvc, virtual public
xAOD::TrackParticleAuxContainer* m_conv_tpAuxCont; xAOD::TrackParticleAuxContainer* m_conv_tpAuxCont;
xAOD::TrackParticleAuxContainer* m_refit_tpAuxCont; xAOD::TrackParticleAuxContainer* m_refit_tpAuxCont;
// VxVertex cache
VxContainer* m_raw_vx;
VxContainer* m_conv_vx;
VxContainer* m_refit_vx;
bool m_got_raw_vx;
bool m_got_conv_vx;
bool m_got_refit_vx;
// xAOD vertex cache // xAOD vertex cache
xAOD::VertexContainer* m_conv_vertex; xAOD::VertexContainer* m_conv_vertex;
xAOD::VertexAuxContainer* m_conv_vertexAux; xAOD::VertexAuxContainer* m_conv_vertexAux;
...@@ -190,7 +179,6 @@ class FTK_DataProviderSvc : public virtual IFTK_DataProviderSvc, virtual public ...@@ -190,7 +179,6 @@ class FTK_DataProviderSvc : public virtual IFTK_DataProviderSvc, virtual public
bool m_gotRawTracks; bool m_gotRawTracks;
std::string m_trackCacheName; std::string m_trackCacheName;
std::string m_trackParticleCacheName; std::string m_trackParticleCacheName;
std::string m_VxContainerCacheName;
std::string m_VertexContainerCacheName; std::string m_VertexContainerCacheName;
bool m_doTruth; bool m_doTruth;
std::string m_ftkPixelTruthName; std::string m_ftkPixelTruthName;
...@@ -217,7 +205,11 @@ class FTK_DataProviderSvc : public virtual IFTK_DataProviderSvc, virtual public ...@@ -217,7 +205,11 @@ class FTK_DataProviderSvc : public virtual IFTK_DataProviderSvc, virtual public
bool m_useViewContainers; bool m_useViewContainers;
bool m_barrelOnly; bool m_barrelOnly;
float m_barrelMaxCotTheta; float m_barrelMaxCotTheta;
std::vector<float> m_pixelBarrelPhiOffsets;
std::vector<float> m_pixelBarrelEtaOffsets;
std::vector<float> m_pixelEndCapPhiOffsets;
std::vector<float> m_pixelEndCapEtaOffsets;
}; };
inline bool compareFTK_Clusters (InDet::SiClusterOnTrack* cl1, InDet::SiClusterOnTrack* cl2) { inline bool compareFTK_Clusters (InDet::SiClusterOnTrack* cl1, InDet::SiClusterOnTrack* cl2) {
......
...@@ -19,7 +19,6 @@ use TrigFTK_RawData TrigFTK_RawData-* Trigger/TrigFTK ...@@ -19,7 +19,6 @@ use TrigFTK_RawData TrigFTK_RawData-* Trigger/TrigFTK
use FTK_DataProviderInterfaces FTK_DataProviderInterfaces-* Trigger/TrigFTK use FTK_DataProviderInterfaces FTK_DataProviderInterfaces-* Trigger/TrigFTK
#TrkTrack and VxVertec need to be public for Collection typedef #TrkTrack and VxVertec need to be public for Collection typedef
use TrkTrack TrkTrack-* Tracking/TrkEvent use TrkTrack TrkTrack-* Tracking/TrkEvent
use VxVertex VxVertex-* Tracking/TrkEvent
use xAODTracking xAODTracking-* Event/xAOD use xAODTracking xAODTracking-* Event/xAOD
use InDetPrepRawData InDetPrepRawData-* InnerDetector/InDetRecEvent use InDetPrepRawData InDetPrepRawData-* InnerDetector/InDetRecEvent
use InDetRIO_OnTrack InDetRIO_OnTrack-* InnerDetector/InDetRecEvent use InDetRIO_OnTrack InDetRIO_OnTrack-* InnerDetector/InDetRecEvent
......
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