Skip to content
Snippets Groups Projects

Common ReadoutGeometry Base Class for InDet and HGTD (SolidStateReadoutGeometry)

Merged Nicholas Styles requested to merge nstyles/athena:master-ReadoutGeometryBase into master
Compare and Show latest version
2 files
+ 5
75
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -197,25 +197,6 @@ namespace InDetDD {
void setCache();
//@}
/**
* @name Navigation setters
* Non-const methods.
* These are inline methods and set neighbours.
*/
//@{
void setNextInEta(const SolidStateDetectorElementBase* element);
void setPrevInEta(const SolidStateDetectorElementBase* element);
void setNextInPhi(const SolidStateDetectorElementBase* element);
void setPrevInPhi(const SolidStateDetectorElementBase* element);
/**
* @name Navigation
* Inline methods to access neighbours.
*/
//@{
const SolidStateDetectorElementBase* nextInEta() const;
const SolidStateDetectorElementBase* prevInEta() const;
const SolidStateDetectorElementBase* nextInPhi() const;
const SolidStateDetectorElementBase* prevInPhi() const;
/**
* @name Common items
* Inline method
@@ -233,11 +214,13 @@ namespace InDetDD {
/**
* identifier of this detector element (inline)
*/
//do these need to be virtual? - they are in 21.9 but I don't see why
Identifier identify() const;
/**
* identifier hash (inline)
*/
//do these need to be virtual? - as above
IdentifierHash identifyHash() const;
/**
@@ -440,7 +423,8 @@ namespace InDetDD {
/**
* access to the local description (inline):
*/
const DetectorDesign& design() const;
virtual const DetectorDesign& design() const;
virtual const Trk::SurfaceBounds& bounds() const;
/**
@@ -582,7 +566,7 @@ namespace InDetDD {
/**
* Recalculate cached values.
*/
void updateCache() const;
virtual void updateCache() const;
/**
* Calculate extent in r,z and phi. The values are cached and there
@@ -688,20 +672,6 @@ namespace InDetDD {
* hash id of this detector element
*/
IdentifierHash m_idHash{};
//not for base class?
//bool m_isPixel{false};
//bool m_isDBM{false};
//@}
/**
* @name Variables set by individual setter methods
*/
//@{
const SolidStateDetectorElementBase* m_nextInEta{nullptr}; // set by setNextInEta
const SolidStateDetectorElementBase* m_prevInEta{nullptr}; // set by setPrevInEta
const SolidStateDetectorElementBase* m_nextInPhi{nullptr}; // set by setNextInPhi
const SolidStateDetectorElementBase* m_prevInPhi{nullptr}; // set by setPrevInPhi
//@}
/**
Loading