Skip to content
Snippets Groups Projects
Commit ae58dbad authored by Adam Edward Barton's avatar Adam Edward Barton :speech_balloon:
Browse files

Reentrant and cacheable SpacePointFinder

parent 3da53242
1 merge request!20779WIP: Migrate DataQualityTools to ToolHandles
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 191 additions and 177 deletions
InnerDetector/InDetRecAlgs/SiSpacePointFormation/CMakeLists.txt
+ 2
− 3
View file @ ae58dbad
......@@ -18,7 +18,6 @@ atlas_depends_on_subdirs( PUBLIC
Tracking/TrkEvent/TrkSpacePoint
Tracking/TrkEvent/VxVertex
PRIVATE
Control/CxxUtils
DetectorDescription/AtlasDetDescr
Event/xAOD/xAODEventInfo
InnerDetector/InDetConditions/InDetBeamSpotService
......@@ -33,10 +32,10 @@ atlas_add_library( SiSpacePointFormationLib
PUBLIC_HEADERS SiSpacePointFormation
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps AthContainers GeoPrimitives Identifier GaudiKernel InDetReadoutGeometry InDetPrepRawData TrkSpacePoint VxVertex SiSpacePointToolLib
PRIVATE_LINK_LIBRARIES CxxUtils AtlasDetDescr xAODEventInfo InDetIdentifier )
PRIVATE_LINK_LIBRARIES AtlasDetDescr xAODEventInfo InDetIdentifier )
atlas_add_component( SiSpacePointFormation
src/components/*.cxx
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps AthContainers GeoPrimitives Identifier GaudiKernel InDetReadoutGeometry InDetPrepRawData SiSpacePointToolLib TrkSpacePoint VxVertex CxxUtils AtlasDetDescr xAODEventInfo InDetIdentifier SiSpacePointFormationLib )
LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps AthContainers GeoPrimitives Identifier GaudiKernel InDetReadoutGeometry InDetPrepRawData SiSpacePointToolLib TrkSpacePoint VxVertex AtlasDetDescr xAODEventInfo InDetIdentifier SiSpacePointFormationLib )
InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiElementProperties.h
+ 2
− 2
View file @ ae58dbad
......@@ -34,7 +34,7 @@ public:
~SiElementProperties();
std::vector<IdentifierHash>* neighbours (void);
const std::vector<IdentifierHash>* neighbours (void);
float halfWidth (void);
private:
......@@ -49,7 +49,7 @@ private:
//--------------------------------------------------------------------------
inline std::vector<IdentifierHash>*
inline const std::vector<IdentifierHash>*
SiElementProperties::neighbours()
{
return &m_neighbours;
......
InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiElementPropertiesTable.h
+ 6
− 9
View file @ ae58dbad
......@@ -22,7 +22,7 @@ class SiDetectorElementCollection;
namespace InDet {
class SiElementPropertiesTable
class SiElementPropertiesTable final
{
public:
......@@ -31,26 +31,23 @@ public:
float epsilonWidth);
~SiElementPropertiesTable();
std::vector<IdentifierHash>* neighbours(const IdentifierHash& waferID);
float halfWidth(IdentifierHash hashID);
const std::vector<IdentifierHash>* neighbours(const IdentifierHash& waferID) const;
float halfWidth(IdentifierHash hashID) const;
private:
std::vector<SiElementProperties*> m_properties;
const InDetDD::SiDetectorElementCollection& m_elements;
int m_maxSCT;
std::vector<SiElementProperties*>::const_iterator m_propertiesBegin;
};
inline std::vector<IdentifierHash>*
SiElementPropertiesTable::neighbours(const IdentifierHash& waferID)
inline const std::vector<IdentifierHash>*
SiElementPropertiesTable::neighbours(const IdentifierHash& waferID) const
{
return (m_properties[(unsigned int)waferID])->neighbours();
}
inline float
SiElementPropertiesTable::halfWidth(IdentifierHash waferID)
SiElementPropertiesTable::halfWidth(IdentifierHash waferID) const
{
return (m_properties[(unsigned int)waferID])->halfWidth();
}
......
InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h
+ 25
− 20
View file @ ae58dbad
......@@ -46,7 +46,7 @@
#ifndef SiSpacePointFormation_SI_POINT_FINDER_H
#define SiSpacePointFormation_SI_POINT_FINDER_H
#include "AthenaBaseComps/AthAlgorithm.h"
#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AthContainers/DataVector.h"
......@@ -60,7 +60,7 @@
#include "InDetPrepRawData/SiClusterContainer.h"
#include "InDetPrepRawData/PixelClusterContainer.h"
#include "InDetPrepRawData/SCT_ClusterContainer.h"
#include "TrkSpacePoint/SpacePointContainer.h"
#include "GeoPrimitives/GeoPrimitives.h"
class Event;
......@@ -82,7 +82,15 @@ namespace InDet {
class SiElementPropertiesTable;
class SiTrackerSpacePointFinder:public AthAlgorithm {
class SiTrackerSpacePointFinder:public AthReentrantAlgorithm {
struct SPFCache{//This is a temporary object to aid reentrant coding
Amg::Vector3D vertex;
const EventContext& ctx;
const SCT_ClusterContainer* SCTCContainer;
SPFCache(const EventContext& inctx) : ctx(inctx), SCTCContainer(nullptr) { }
};
public:
SiTrackerSpacePointFinder(const std::string& name,
......@@ -90,11 +98,11 @@ namespace InDet {
~SiTrackerSpacePointFinder();
StatusCode initialize();
StatusCode initialize() override;
StatusCode execute();
StatusCode execute_r (const EventContext& ctx) const override;
StatusCode finalize();
StatusCode finalize() override;
private:
// methods
......@@ -106,25 +114,20 @@ namespace InDet {
void addSCT_SpacePoints
(const SCT_ClusterCollection* next,
SpacePointCollection* spacepointCollection, SpacePointOverlapCollection* spacepointOverlapCollection);
SpacePointCollection* spacepointCollection, SpacePointOverlapCollection* spacepointOverlapCollection, SPFCache&) const;
void checkForSCT_Points
(const SCT_ClusterCollection* clusters1,
const IdentifierHash& id2, double minDiff, double maxDiff,
SpacePointCollection* spacepointCollection, bool overlapColl, SpacePointOverlapCollection* spacepointOverlapCollection);
const IdentifierHash id2, double minDiff, double maxDiff,
SpacePointCollection* spacepointCollection, bool overlapColl, SpacePointOverlapCollection* spacepointOverlapCollection, SPFCache&) const;
void checkForSCT_Points
(const SCT_ClusterCollection* clusters1,
const IdentifierHash& id2, double min1, double max1,
double min2, double max2, SpacePointOverlapCollection* spacepointOverlapCollection);
const IdentifierHash id2, double min1, double max1,
double min2, double max2, SpacePointOverlapCollection* spacepointOverlapCollection, SPFCache&) const;
// data members
// std::string m_SCT_ClustersName;
// std::string m_PixelsClustersName;
// std::string m_spacePointsSCTName;
// std::string m_spacePointsPixelName;
// std::string m_spacePointsOverlapName;
SG::ReadHandleKey<SCT_ClusterContainer> m_Sct_clcontainerKey;
SG::ReadHandleKey<PixelClusterContainer> m_Pixel_clcontainerKey;
bool m_selectPixels;
......@@ -147,20 +150,22 @@ namespace InDet {
float m_xVertex;
float m_yVertex;
float m_zVertex;
Amg::Vector3D m_vertex;
ServiceHandle<IBeamCondSvc> m_iBeamCondSvc;
int m_numberOfEvents;
mutable std::atomic<int> m_numberOfEvents;
mutable std::atomic<int> m_numberOfPixel;
mutable std::atomic<int> m_numberOfSCT;
const InDetDD::SCT_DetectorManager* m_manager;
// const InDetDD::PixelDetectorManager* m_managerPixel; // unused
const SCT_ID* m_idHelper;
const PixelID* m_idHelperPixel;
SiElementPropertiesTable* m_properties;
static const SiElementPropertiesTable* s_properties;
SG::WriteHandleKey<SpacePointContainer> m_SpacePointContainer_SCTKey;
SG::WriteHandleKey<SpacePointContainer> m_SpacePointContainerPixelKey;
SG::WriteHandleKey<SpacePointOverlapCollection> m_spacepointoverlapCollectionKey;
SG::UpdateHandleKey<SpacePointCache> m_SpacePointCache_SCTKey;
SG::UpdateHandleKey<SpacePointCache> m_SpacePointCache_PixKey;
ToolHandle< SiSpacePointMakerTool > m_SiSpacePointMakerTool;
};
......
InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiElementPropertiesTable.cxx
+ 7
− 8
View file @ ae58dbad
......@@ -19,24 +19,23 @@ namespace InDet{
SiElementPropertiesTable::SiElementPropertiesTable(const SCT_ID& idHelper,
const InDetDD::SiDetectorElementCollection& elements,
float epsilonWidth)
: m_elements(elements){
m_maxSCT = idHelper.wafer_hash_max();
m_properties.reserve(m_maxSCT);
for (int i = 0; i < m_maxSCT; ++i){
{
size_t maxSCT = idHelper.wafer_hash_max();
m_properties.assign(maxSCT, nullptr);
for (size_t i = 0; i < maxSCT; ++i){
IdentifierHash hash(i);
const InDetDD::SiDetectorElement* element = m_elements[hash];
const InDetDD::SiDetectorElement* element = elements[hash];
if (element != 0){
SiElementProperties* props = new SiElementProperties(hash, idHelper,*element,epsilonWidth);
m_properties[i] = props;
}else{
m_properties[i] = 0;
}
}
}
//--------------------------------------------------------------------------
SiElementPropertiesTable::~SiElementPropertiesTable(){
for (int i=0; i < m_maxSCT; ++i){
size_t maxSCT = m_properties.size();
for (size_t i=0; i < maxSCT; ++i){
delete m_properties[i];m_properties[i] =0;
}
}
......
InnerDetector/InDetRecTools/SiSpacePointTool/SiSpacePointTool/SiSpacePointMakerTool.h 100755 → 100644
+ 6
− 8
View file @ ae58dbad
......@@ -47,38 +47,36 @@ namespace InDet{
// Convert clusters to space points
Trk::SpacePoint* makeSCT_SpacePoint(const InDet::SiCluster& cluster1, const InDet::SiCluster& cluster2,
const Amg::Vector3D& vertexVec,
const InDetDD::SiDetectorElement *element1, const InDetDD::SiDetectorElement *element2);
const InDetDD::SiDetectorElement *element1, const InDetDD::SiDetectorElement *element2, double stripLengthGapTolerance) const;
void fillSCT_SpacePointCollection(const InDet::SCT_ClusterCollection* clusters1,
const InDet::SCT_ClusterCollection* clusters2, double min, double max, bool allClusters,
const Amg::Vector3D& vertexVec, const InDetDD::SCT_DetectorManager *SCT_Manager,
SpacePointCollection* spacepointCollection);
SpacePointCollection* spacepointCollection) const;
void fillPixelSpacePointCollection(const InDet::PixelClusterCollection* clusters,
SpacePointCollection* spacepointCollection);
SpacePointCollection* spacepointCollection) const;
void fillSCT_SpacePointEtaOverlapCollection(const InDet::SCT_ClusterCollection* clusters1,
const InDet::SCT_ClusterCollection* clusters2, double min, double max, bool allClusters,
const Amg::Vector3D& vertexVec, const InDetDD::SCT_DetectorManager *SCT_Manager,
SpacePointOverlapCollection* spacepointOverlapCollection);
SpacePointOverlapCollection* spacepointOverlapCollection) const;
void fillSCT_SpacePointPhiOverlapCollection(const InDet::SCT_ClusterCollection* clusters1,
const InDet::SCT_ClusterCollection* clusters2, double min1, double max1, double min2,
double max2, bool allClusters, const Amg::Vector3D& vertexVec ,
const InDetDD::SCT_DetectorManager *SCT_Manager,
SpacePointOverlapCollection* spacepointOverlapCollection);
SpacePointOverlapCollection* spacepointOverlapCollection) const;
private:
double m_stripLengthTolerance;
double m_SCTgapParameter;
double m_stripLengthGapTolerance;
// option to use closest approach of SCT strips as position for SpacePoint
bool m_usePerpProj;
std::vector<Trk::SpacePoint*> m_tmpSpacePoints;
const SCT_ID* m_idHelper;
double offset(const InDetDD::SiDetectorElement *element1, const InDetDD::SiDetectorElement *element2);
double offset(const InDetDD::SiDetectorElement *element1, const InDetDD::SiDetectorElement *element2, double&) const;
};
}
......
InnerDetector/InDetRecTools/SiSpacePointTool/src/SiSpacePointMakerTool.cxx 100755 → 100644
+ 23
− 26
View file @ ae58dbad
......@@ -59,7 +59,7 @@ StatusCode SiSpacePointMakerTool::finalize() {
//--------------------------------------------------------------------------
Trk::SpacePoint* SiSpacePointMakerTool::makeSCT_SpacePoint(const InDet::SiCluster& cluster1,
const InDet::SiCluster& cluster2, const Amg::Vector3D& vertexVec,
const InDetDD::SiDetectorElement *element1, const InDetDD::SiDetectorElement *element2){
const InDetDD::SiDetectorElement *element1, const InDetDD::SiDetectorElement *element2, double stripLengthGapTolerance) const {
// -ME fixme- const InDetDD::SCT_DetectorManager *m_manager, const SCT_ID* m_idHelper) {
// Find intersection of a line through a cluster on one sct detector and
......@@ -136,10 +136,10 @@ Trk::SpacePoint* SiSpacePointMakerTool::makeSCT_SpacePoint(const InDet::SiCluste
if (fabs( m ) > limit) ok = false;
else if (fabs((n=-(t.dot(qs)/r.dot(qs)))) > limit) ok = false;
if(!ok && m_stripLengthGapTolerance !=0.) {
if(!ok && stripLengthGapTolerance !=0.) {
double qm = q.mag() ;
double limitn = limit+(m_stripLengthGapTolerance/qm);
double limitn = limit+(stripLengthGapTolerance/qm);
if(fabs(m) <= limitn) {
......@@ -180,9 +180,9 @@ Trk::SpacePoint* SiSpacePointMakerTool::makeSCT_SpacePoint(const InDet::SiCluste
//--------------------------------------------------------------------------
void SiSpacePointMakerTool::fillSCT_SpacePointCollection(const InDet::SCT_ClusterCollection* clusters1,
const InDet::SCT_ClusterCollection* clusters2, double min, double max, bool m_allClusters,
const Amg::Vector3D& vertexVec, const InDetDD::SCT_DetectorManager *SCT_Manager, SpacePointCollection* spacepointCollection){
const Amg::Vector3D& vertexVec, const InDetDD::SCT_DetectorManager *SCT_Manager, SpacePointCollection* spacepointCollection) const {
m_stripLengthGapTolerance = 0.;
double stripLengthGapTolerance = 0.;
// Try all combinations of clusters for space points
InDet::SCT_ClusterCollection::const_iterator
......@@ -201,10 +201,8 @@ void SiSpacePointMakerTool::fillSCT_SpacePointCollection(const InDet::SCT_Cluste
return;
}
//Avoid over or under allocation by first putting spacepoints in
//m_tmpSpacePoints and then copying them to the spacepointCollection
//at the end.
m_tmpSpacePoints.clear();
//tmpSpacePoints changed to local variable to enable rentrancy
std::vector<Trk::SpacePoint*> tmpSpacePoints;
for (; clusters1Next!=clusters1Finish; ++clusters1Next){
Amg::Vector2D locpos = (*clusters1Next)->localPosition();
......@@ -222,7 +220,7 @@ void SiSpacePointMakerTool::fillSCT_SpacePointCollection(const InDet::SCT_Cluste
break;
}
if(m_SCTgapParameter!=0.) {double dm = offset(element1,element2); min-=dm; max+=dm; }
if(m_SCTgapParameter!=0.) {double dm = offset(element1,element2, stripLengthGapTolerance); min-=dm; max+=dm; }
for (; clusters2Next != clusters2Finish; ++clusters2Next){
Amg::Vector2D locpos = (*clusters2Next)->localPosition();
......@@ -231,23 +229,22 @@ void SiSpacePointMakerTool::fillSCT_SpacePointCollection(const InDet::SCT_Cluste
if ((min <= diff && diff <= max)||m_allClusters){
Trk::SpacePoint* sp =
makeSCT_SpacePoint(**clusters1Next, **clusters2Next, vertexVec, element1, element2);
makeSCT_SpacePoint(**clusters1Next, **clusters2Next, vertexVec, element1, element2, stripLengthGapTolerance);
if (sp) {
m_tmpSpacePoints.push_back(sp);
tmpSpacePoints.push_back(sp);
}
}
}
}
spacepointCollection->reserve(spacepointCollection->size() + m_tmpSpacePoints.size());
std::vector<Trk::SpacePoint*>::const_iterator it(m_tmpSpacePoints.begin()),itE(m_tmpSpacePoints.end());
spacepointCollection->reserve(spacepointCollection->size() + tmpSpacePoints.size());
std::vector<Trk::SpacePoint*>::const_iterator it(tmpSpacePoints.begin()),itE(tmpSpacePoints.end());
for (;it!=itE;++it) spacepointCollection->push_back(*it);
m_tmpSpacePoints.clear();
}
//--------------------------------------------------------------------------
void SiSpacePointMakerTool::fillPixelSpacePointCollection(const InDet::PixelClusterCollection* clusters, SpacePointCollection* spacepointCollection){
void SiSpacePointMakerTool::fillPixelSpacePointCollection(const InDet::PixelClusterCollection* clusters, SpacePointCollection* spacepointCollection) const {
IdentifierHash idHash = clusters->identifyHash();
InDet::PixelClusterCollection::const_iterator clusStart = clusters->begin();
InDet::PixelClusterCollection::const_iterator clusFinish = clusters->end();
......@@ -268,9 +265,9 @@ void SiSpacePointMakerTool::fillPixelSpacePointCollection(const InDet::PixelClus
void SiSpacePointMakerTool::fillSCT_SpacePointEtaOverlapCollection(const InDet::SCT_ClusterCollection* clusters1,
const InDet::SCT_ClusterCollection* clusters2, double min, double max, bool m_allClusters,
const Amg::Vector3D& vertexVec, const InDetDD::SCT_DetectorManager *SCT_Manager,
SpacePointOverlapCollection* m_spacepointoverlapCollection){
SpacePointOverlapCollection* m_spacepointoverlapCollection) const {
m_stripLengthGapTolerance = 0.;
double stripLengthGapTolerance = 0.;
// Require that (xPhi2 - xPhi1) lie in the range specified.
// Used eta modules
......@@ -304,7 +301,7 @@ void SiSpacePointMakerTool::fillSCT_SpacePointEtaOverlapCollection(const InDet::
msg(MSG::ERROR) << "Bad cluster identifier " << m_idHelper->show_to_string((*clusters2Next)->identify()) <<endmsg;
break;
}
if(m_SCTgapParameter!=0.) {double dm = offset(element1,element2); min-=dm; max+=dm; }
if(m_SCTgapParameter!=0.) {double dm = offset(element1,element2, stripLengthGapTolerance); min-=dm; max+=dm; }
for (; clusters2Next != clusters2Finish; ++clusters2Next){
Amg::Vector2D locpos = (*clusters2Next)->localPosition();
......@@ -313,7 +310,7 @@ void SiSpacePointMakerTool::fillSCT_SpacePointEtaOverlapCollection(const InDet::
if ((min <= diff && diff <= max)||m_allClusters){
Trk::SpacePoint* sp =
makeSCT_SpacePoint(**clusters1Next, **clusters2Next, vertexVec, element1, element2);
makeSCT_SpacePoint(**clusters1Next, **clusters2Next, vertexVec, element1, element2, stripLengthGapTolerance);
if (sp) {
m_spacepointoverlapCollection->push_back(sp);
}
......@@ -328,9 +325,9 @@ void SiSpacePointMakerTool::fillSCT_SpacePointEtaOverlapCollection(const InDet::
void SiSpacePointMakerTool::fillSCT_SpacePointPhiOverlapCollection(const InDet::SCT_ClusterCollection* clusters1,
const InDet::SCT_ClusterCollection* clusters2, double min1, double max1, double min2, double max2,
bool m_allClusters, const Amg::Vector3D& vertexVec, const InDetDD::SCT_DetectorManager *SCT_Manager,
SpacePointOverlapCollection* m_spacepointoverlapCollection){
SpacePointOverlapCollection* m_spacepointoverlapCollection) const {
m_stripLengthGapTolerance = 0.; if(m_SCTgapParameter!=0.) {min1-=20.; max1+=20.;}
double stripLengthGapTolerance = 0.; if(m_SCTgapParameter!=0.) {min1-=20.; max1+=20.;}
// Clus1 must lie
// within min1 and max1 and clus between min2 and max2. Used for phi
......@@ -366,7 +363,7 @@ void SiSpacePointMakerTool::fillSCT_SpacePointPhiOverlapCollection(const InDet::
break;
}
if(m_SCTgapParameter!=0.) {double dm = offset(element1,element2); min2-=dm; max2+=dm; }
if(m_SCTgapParameter!=0.) {double dm = offset(element1,element2, stripLengthGapTolerance); min2-=dm; max2+=dm; }
for (; clusters2Next != clusters2Finish; ++clusters2Next)
{
......@@ -375,7 +372,7 @@ void SiSpacePointMakerTool::fillSCT_SpacePointPhiOverlapCollection(const InDet::
double xPhi2 = InDetDD::SiLocalPosition(localPos.y(),localPos.x(),0).xPhi();
if ((min2<= xPhi2 && xPhi2 <= max2)||m_allClusters){
Trk::SpacePoint* sp
(makeSCT_SpacePoint(**clusters1Next, **clusters2Next, vertexVec, element1, element2));
(makeSCT_SpacePoint(**clusters1Next, **clusters2Next, vertexVec, element1, element2, stripLengthGapTolerance));
if (sp) {
m_spacepointoverlapCollection->push_back(sp);
}
......@@ -392,7 +389,7 @@ void SiSpacePointMakerTool::fillSCT_SpacePointPhiOverlapCollection(const InDet::
///////////////////////////////////////////////////////////////////
double SiSpacePointMakerTool::offset
(const InDetDD::SiDetectorElement *element1, const InDetDD::SiDetectorElement *element2)
(const InDetDD::SiDetectorElement *element1, const InDetDD::SiDetectorElement *element2, double &stripLengthGapTolerance) const
{
const Amg::Transform3D& T1 = element1->transform();
const Amg::Transform3D& T2 = element2->transform();
......@@ -406,7 +403,7 @@ void SiSpacePointMakerTool::fillSCT_SpacePointPhiOverlapCollection(const InDet::
if(fabs(T1(2,2)) > .7) d*=(r/fabs(T1(2,3))); // endcap d = d*R/Z
m_stripLengthGapTolerance = d;
stripLengthGapTolerance = d;
return dm;
}
......
InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/SCT_TrigSpacePointTool.cxx
+ 1
− 1
View file @ ae58dbad
......@@ -173,7 +173,7 @@ addSCT_SpacePoints(const SCT_ClusterCollection* clusCollection,
IdentifierHash thisHash = m_idHelper->wafer_hash(thisID);
std::vector<IdentifierHash>*
const std::vector<IdentifierHash>*
others(m_properties->neighbours(thisHash));
if (others==0 || others->empty() ) return;
std::vector<IdentifierHash>::const_iterator otherHash = others->begin();
......
Tracking/TrkEvent/TrkSpacePoint/TrkSpacePoint/SpacePointContainer.h
+ 9
− 0
View file @ ae58dbad
......@@ -22,6 +22,9 @@
#include "TrkSpacePoint/SpacePointCollection.h"
//#include "TrkSpacePoint/SpacePointCLASS_DEF.h"
typedef EventContainers::IdentifiableCache< SpacePointCollection > SpacePointCache;
class SpacePointContainer
: public IdentifiableContainer<SpacePointCollection>{
......@@ -33,6 +36,8 @@ public:
// Constructor with parameters:
SpacePointContainer(unsigned int max);
SpacePointContainer(SpacePointCache*);
// Destructor:
virtual ~SpacePointContainer();
......@@ -84,4 +89,8 @@ private:
#include "CLIDSvc/CLASS_DEF.h"
CLASS_DEF(SpacePointContainer,1273119430,1)
CLASS_DEF( SpacePointCache , 198940329 , 1 )
#endif // TRKSPACEPOINT_SPACEPOINTCONTAINER_H
Tracking/TrkEvent/TrkSpacePoint/src/SpacePointContainer.cxx
+ 6
− 0
View file @ ae58dbad
......@@ -19,6 +19,12 @@ SpacePointContainer::SpacePointContainer(unsigned int max) :
{
}
// Constructor with parameters:
SpacePointContainer::SpacePointContainer(SpacePointCache *cache) :
IdentifiableContainer<SpacePointCollection>(cache)
{
}
// Destructor:
SpacePointContainer::~SpacePointContainer()
{
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment