Commit fa068ec7 authored by Adam Edward Barton's avatar Adam Edward Barton 💬
Browse files

Merge branch 'TrkGeometry_rm_unused_member' into 'master'

TrackingGeometry/TrackingVolumes remove some seemingly unused members and methods

See merge request atlas/athena!47796
parents 1dea1c8d e00d6b2f
......@@ -58,6 +58,7 @@ class MaterialProperties;
the confined TrackingVolumes.
@author Andreas.Salzburger@cern.ch
@author Christos Anastopoulos (Athena MT modifications)
*/
class TrackingGeometry
......@@ -183,7 +184,6 @@ private:
/** The known world - and the beam */
TrackingVolume* m_world;
const PerigeeSurface* m_beam;
/** The unique boundary Layers */
std::map<const Layer*, int> m_boundaryLayers;
......@@ -198,12 +198,14 @@ private:
std::unique_ptr<std::vector<
std::vector<std::pair<std::unique_ptr<const Trk::Volume>, float>>>>
m_muonInertMaterialConstituents;
// muon chambers
std::unique_ptr<
const std::vector<std::unique_ptr<const Trk::DetachedTrackingVolume>>>
m_muonStations; // muon chambers
m_muonStations;
// muon inert material
std::unique_ptr<
const std::vector<std::unique_ptr<const Trk::DetachedTrackingVolume>>>
m_muonInertObjs; // muon inert material
m_muonInertObjs;
};
} // end of namespace
......
......@@ -87,6 +87,7 @@ using BoundaryIntersection =
Layers and TrackingVolumes are then owned by the TrackingVolume holding them.
@author Andreas.Salzburger@cern.ch
@author Christos Anastopoulos (Athena MT modifications)
*/
class TrackingVolume
......@@ -329,15 +330,6 @@ public:
GlueVolumesDescriptor& glueVolumesDescriptor();
const GlueVolumesDescriptor& glueVolumesDescriptor() const;
/** the sensitive area */
void registerSensitiveVolume(const AbstractVolume* svol);
/** return the sensitive volume */
const AbstractVolume* sensitiveVolume() const;
/** return the sensitive volume - gives ownership*/
const AbstractVolume* checkoutSensitiveVolume() const;
/** sign the volume - the geometry builder has to do that */
void sign ATLAS_NOT_THREAD_SAFE(GeometrySignature signat,
GeometryType gtype = Static) const;
......@@ -434,40 +426,39 @@ private:
const TrackingVolume* m_motherVolume; //!< mother volume of this volume
//!< boundary Surfaces
std::vector<SharedObject<const BoundarySurface<TrackingVolume>>>*
m_boundarySurfaces{}; //!< boundary Surfaces
m_boundarySurfaces{};
//(a)
const LayerArray* m_confinedLayers; //!< Array of Layers inside the Volume
const TrackingVolumeArray*
m_confinedVolumes; //!< Array of Volumes inside the Volume
//!< Array of Volumes inside the Volume
const TrackingVolumeArray* m_confinedVolumes;
//(b)
const std::vector<const DetachedTrackingVolume*>*
m_confinedDetachedVolumes; //!< Detached subvolumes
//!< Detached subvolumes
const std::vector<const DetachedTrackingVolume*>* m_confinedDetachedVolumes;
// additionally
//!< Unordered subvolumes
const std::vector<const TrackingVolume*>*
m_confinedDenseVolumes; //!< Unordered subvolumes
//(b)
const std::vector<const Layer*>*
m_confinedArbitraryLayers; //!< Unordered Layers inside the Volume
//!< Unordered Layers inside the Volume
const std::vector<const Layer*>* m_confinedArbitraryLayers;
////!< Volumes to glue Volumes from the outside
CxxUtils::CachedUniquePtrT<GlueVolumesDescriptor> m_outsideGlueVolumes;
const AbstractVolume* m_sensitiveVolume; //!< Sensitive volume
//!< provided the number of layer attempts
LayerAttemptsCalculator* m_layerAttemptsCalculator;
LayerAttemptsCalculator*
m_layerAttemptsCalculator; //!< provided the number of layer attempts
GeometrySignature
m_geometrySignature; //!< The Signature done by the GeometryBuilder
GeometryType
m_geometryType; //!< defines how the Extrapolator propagates through this
//!< The Signature done by the GeometryBuilder
GeometrySignature m_geometrySignature;
//!< defines how the Extrapolator propagates through this
GeometryType m_geometryType;
std::string m_name; //!< Volume name for debug reasons
unsigned int m_colorCode; //!< Color code for displaying
bool m_redoNavigation; //!< Navigation boolean. If true navigation needs to be
//!< redone when entering this volume
};
} // end of namespace
......
......@@ -56,24 +56,6 @@ TrackingVolume::confinedDenseVolumes() const
return m_confinedDenseVolumes;
}
inline void
TrackingVolume::registerSensitiveVolume(const AbstractVolume* svol)
{
m_sensitiveVolume = svol;
}
inline const AbstractVolume*
TrackingVolume::sensitiveVolume() const
{
return m_sensitiveVolume;
}
inline const AbstractVolume*
TrackingVolume::checkoutSensitiveVolume() const
{
const AbstractVolume* returnVolume = m_sensitiveVolume;
return returnVolume;
}
template<class T>
bool
......
......@@ -20,7 +20,6 @@
Trk::TrackingGeometry::TrackingGeometry(Trk::TrackingVolume* highestVolume,
Trk::NavigationLevel navLev)
: m_world(highestVolume)
, m_beam(nullptr)
, m_navigationLevel(navLev)
{
// for the time being only world
......@@ -30,7 +29,6 @@ Trk::TrackingGeometry::TrackingGeometry(Trk::TrackingVolume* highestVolume,
Trk::TrackingGeometry::~TrackingGeometry()
{
delete m_beam;
delete m_world;
auto bLayerIter = m_boundaryLayers.begin();
auto bLayerIterE = m_boundaryLayers.end();
......
......@@ -55,7 +55,6 @@ Trk::TrackingVolume::TrackingVolume()
, m_confinedDenseVolumes(nullptr)
, m_confinedArbitraryLayers(nullptr)
, m_outsideGlueVolumes(nullptr)
, m_sensitiveVolume(nullptr)
, m_layerAttemptsCalculator(nullptr)
, m_geometrySignature(Trk::Unsigned)
, m_geometryType(Trk::NumberOfGeometryTypes)
......@@ -80,7 +79,6 @@ Trk::TrackingVolume::TrackingVolume(Amg::Transform3D* htrans,
, m_confinedDenseVolumes(nullptr)
, m_confinedArbitraryLayers(nullptr)
, m_outsideGlueVolumes(nullptr)
, m_sensitiveVolume(nullptr)
, m_layerAttemptsCalculator(nullptr)
, m_geometrySignature(Trk::Unsigned)
, m_geometryType(Trk::NumberOfGeometryTypes)
......@@ -109,7 +107,6 @@ Trk::TrackingVolume::TrackingVolume(const Volume& volume,
, m_confinedDenseVolumes(nullptr)
, m_confinedArbitraryLayers(nullptr)
, m_outsideGlueVolumes(nullptr)
, m_sensitiveVolume(nullptr)
, m_layerAttemptsCalculator(nullptr)
, m_geometrySignature(Trk::Unsigned)
, m_geometryType(Trk::NumberOfGeometryTypes)
......@@ -138,7 +135,6 @@ Trk::TrackingVolume::TrackingVolume(Amg::Transform3D* htrans,
, m_confinedDenseVolumes(nullptr)
, m_confinedArbitraryLayers(nullptr)
, m_outsideGlueVolumes(nullptr)
, m_sensitiveVolume(nullptr)
, m_layerAttemptsCalculator(nullptr)
, m_geometrySignature(Trk::Unsigned)
, m_geometryType(Trk::NumberOfGeometryTypes)
......@@ -167,7 +163,6 @@ Trk::TrackingVolume::TrackingVolume(
, m_confinedDenseVolumes(nullptr)
, m_confinedArbitraryLayers(nullptr)
, m_outsideGlueVolumes(nullptr)
, m_sensitiveVolume(nullptr)
, m_layerAttemptsCalculator(nullptr)
, m_geometrySignature(Trk::Unsigned)
, m_geometryType(Trk::NumberOfGeometryTypes)
......@@ -193,7 +188,6 @@ Trk::TrackingVolume::TrackingVolume(
, m_confinedDenseVolumes(nullptr)
, m_confinedArbitraryLayers(nullptr)
, m_outsideGlueVolumes(nullptr)
, m_sensitiveVolume(nullptr)
, m_layerAttemptsCalculator(nullptr)
, m_geometrySignature(Trk::Unsigned)
, m_geometryType(Trk::NumberOfGeometryTypes)
......@@ -220,7 +214,6 @@ Trk::TrackingVolume::TrackingVolume(
, m_confinedDenseVolumes(unorderedSubVolumes)
, m_confinedArbitraryLayers(nullptr)
, m_outsideGlueVolumes(nullptr)
, m_sensitiveVolume(nullptr)
, m_layerAttemptsCalculator(nullptr)
, m_geometrySignature(Trk::Unsigned)
, m_geometryType(Trk::NumberOfGeometryTypes)
......@@ -246,7 +239,6 @@ Trk::TrackingVolume::TrackingVolume(
, m_confinedDenseVolumes(unorderedSubVolumes)
, m_confinedArbitraryLayers(nullptr)
, m_outsideGlueVolumes(nullptr)
, m_sensitiveVolume(nullptr)
, m_layerAttemptsCalculator(nullptr)
, m_geometrySignature(Trk::Unsigned)
, m_geometryType(Trk::NumberOfGeometryTypes)
......@@ -272,7 +264,6 @@ Trk::TrackingVolume::TrackingVolume(Amg::Transform3D* htrans,
, m_confinedDenseVolumes(nullptr)
, m_confinedArbitraryLayers(layers)
, m_outsideGlueVolumes(nullptr)
, m_sensitiveVolume(nullptr)
, m_layerAttemptsCalculator(nullptr)
, m_geometrySignature(Trk::Unsigned)
, m_geometryType(Trk::NumberOfGeometryTypes)
......@@ -297,7 +288,6 @@ Trk::TrackingVolume::TrackingVolume(const Volume& volume,
, m_confinedDenseVolumes(nullptr)
, m_confinedArbitraryLayers(layers)
, m_outsideGlueVolumes(nullptr)
, m_sensitiveVolume(nullptr)
, m_layerAttemptsCalculator(nullptr)
, m_geometrySignature(Trk::Unsigned)
, m_geometryType(Trk::NumberOfGeometryTypes)
......@@ -325,7 +315,6 @@ Trk::TrackingVolume::TrackingVolume(
, m_confinedDenseVolumes(unorderedSubVolumes)
, m_confinedArbitraryLayers(layers)
, m_outsideGlueVolumes(nullptr)
, m_sensitiveVolume(nullptr)
, m_layerAttemptsCalculator(nullptr)
, m_geometrySignature(Trk::Unsigned)
, m_geometryType(Trk::NumberOfGeometryTypes)
......@@ -352,7 +341,6 @@ Trk::TrackingVolume::TrackingVolume(
, m_confinedDenseVolumes(unorderedSubVolumes)
, m_confinedArbitraryLayers(layers)
, m_outsideGlueVolumes(nullptr)
, m_sensitiveVolume(nullptr)
, m_layerAttemptsCalculator(nullptr)
, m_geometrySignature(Trk::Unsigned)
, m_geometryType(Trk::NumberOfGeometryTypes)
......@@ -375,7 +363,6 @@ Trk::TrackingVolume::TrackingVolume(const Trk::TrackingVolume& trVol,
, m_confinedDenseVolumes(nullptr)
, m_confinedArbitraryLayers(nullptr)
, m_outsideGlueVolumes(nullptr)
, m_sensitiveVolume(trVol.m_sensitiveVolume)
, m_layerAttemptsCalculator(nullptr)
, m_geometrySignature(Trk::Unsigned)
, m_geometryType(Trk::NumberOfGeometryTypes)
......@@ -554,7 +541,6 @@ Trk::TrackingVolume::~TrackingVolume()
delete (*m_confinedArbitraryLayers)[i];
delete m_confinedArbitraryLayers;
}
delete m_sensitiveVolume;
delete m_layerAttemptsCalculator;
}
......
Markdown is supported
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