diff --git a/Core/include/Acts/Geometry/CylinderVolumeBuilder.hpp b/Core/include/Acts/Geometry/CylinderVolumeBuilder.hpp index 8b242e139f8..c2b0e52c2ea 100644 --- a/Core/include/Acts/Geometry/CylinderVolumeBuilder.hpp +++ b/Core/include/Acts/Geometry/CylinderVolumeBuilder.hpp @@ -527,7 +527,8 @@ class CylinderVolumeBuilder : public ITrackingVolumeBuilder { /// processing MutableTrackingVolumePtr trackingVolume( const GeometryContext& gctx, TrackingVolumePtr existingVolume = nullptr, - VolumeBoundsPtr externalBounds = nullptr) const override; + std::shared_ptr externalBounds = + nullptr) const override; /// Set configuration method /// diff --git a/Core/include/Acts/Geometry/CylinderVolumeHelper.hpp b/Core/include/Acts/Geometry/CylinderVolumeHelper.hpp index 5762552d7ec..84ce33f41cb 100644 --- a/Core/include/Acts/Geometry/CylinderVolumeHelper.hpp +++ b/Core/include/Acts/Geometry/CylinderVolumeHelper.hpp @@ -79,7 +79,8 @@ class CylinderVolumeHelper : public ITrackingVolumeHelper { MutableTrackingVolumePtr createTrackingVolume( const GeometryContext& gctx, const LayerVector& layers, std::shared_ptr volumeMaterial, - VolumeBoundsPtr volumeBounds, MutableTrackingVolumeVector mtvVector = {}, + std::shared_ptr volumeBounds, + MutableTrackingVolumeVector mtvVector = {}, const Transform3& transform = Transform3::Identity(), const std::string& volumeName = "UndefinedVolume", BinningType bType = arbitrary) const override; diff --git a/Core/include/Acts/Geometry/ITrackingVolumeBuilder.hpp b/Core/include/Acts/Geometry/ITrackingVolumeBuilder.hpp index d858ab76817..eb477c203f8 100644 --- a/Core/include/Acts/Geometry/ITrackingVolumeBuilder.hpp +++ b/Core/include/Acts/Geometry/ITrackingVolumeBuilder.hpp @@ -22,7 +22,6 @@ class Layer; class Volume; using TrackingVolumePtr = std::shared_ptr; using MutableTrackingVolumePtr = std::shared_ptr; -using VolumeBoundsPtr = std::shared_ptr; using LayerPtr = std::shared_ptr; using LayerVector = std::vector; /// @class ITrackingVolumeBuilder @@ -51,7 +50,7 @@ class ITrackingVolumeBuilder { /// @return shared pointer to a newly created TrackingVolume virtual MutableTrackingVolumePtr trackingVolume( const GeometryContext& gctx, TrackingVolumePtr oppositeVolume = nullptr, - VolumeBoundsPtr outsideBounds = nullptr) const = 0; + std::shared_ptr outsideBounds = nullptr) const = 0; }; } // namespace Acts diff --git a/Core/include/Acts/Geometry/ITrackingVolumeHelper.hpp b/Core/include/Acts/Geometry/ITrackingVolumeHelper.hpp index 664915b519f..df3e75f2549 100644 --- a/Core/include/Acts/Geometry/ITrackingVolumeHelper.hpp +++ b/Core/include/Acts/Geometry/ITrackingVolumeHelper.hpp @@ -26,7 +26,6 @@ class IVolumeMaterial; using LayerPtr = std::shared_ptr; using TrackingVolumePtr = std::shared_ptr; using MutableTrackingVolumePtr = std::shared_ptr; -using VolumeBoundsPtr = std::shared_ptr; using LayerVector = std::vector; using TrackingVolumeVector = std::vector; @@ -64,7 +63,8 @@ class ITrackingVolumeHelper { virtual MutableTrackingVolumePtr createTrackingVolume( const GeometryContext& gctx, const LayerVector& layers, std::shared_ptr volumeMaterial, - VolumeBoundsPtr volumeBounds, MutableTrackingVolumeVector mtvVector = {}, + std::shared_ptr volumeBounds, + MutableTrackingVolumeVector mtvVector = {}, const Transform3& transform = Transform3::Identity(), const std::string& volumeName = "UndefinedVolume", BinningType btype = arbitrary) const = 0; diff --git a/Core/include/Acts/Geometry/TrackingGeometryBuilder.hpp b/Core/include/Acts/Geometry/TrackingGeometryBuilder.hpp index e7f20ac649a..a3d1bf4a011 100644 --- a/Core/include/Acts/Geometry/TrackingGeometryBuilder.hpp +++ b/Core/include/Acts/Geometry/TrackingGeometryBuilder.hpp @@ -41,7 +41,7 @@ class TrackingGeometryBuilder : public ITrackingGeometryBuilder { /// The list of tracking volume builders std::vector( const GeometryContext& gctx, const TrackingVolumePtr&, - const VolumeBoundsPtr&)>> + const std::shared_ptr&)>> trackingVolumeBuilders; /// The tracking volume helper for detector construction diff --git a/Core/include/Acts/Geometry/TrackingVolume.hpp b/Core/include/Acts/Geometry/TrackingVolume.hpp index 00a4e020dd4..dca9024c672 100644 --- a/Core/include/Acts/Geometry/TrackingVolume.hpp +++ b/Core/include/Acts/Geometry/TrackingVolume.hpp @@ -125,7 +125,8 @@ class TrackingVolume : public Volume { /// /// @return shared pointer to a new TrackingVolume static MutableTrackingVolumePtr create( - const Transform3& transform, VolumeBoundsPtr volumeBounds, + const Transform3& transform, + std::shared_ptr volumeBounds, const std::shared_ptr& containedVolumes = nullptr, const std::string& volumeName = "undefined") { @@ -146,7 +147,8 @@ class TrackingVolume : public Volume { /// /// @return shared pointer to a new TrackingVolume static MutableTrackingVolumePtr create( - const Transform3& transform, VolumeBoundsPtr volumeBounds, + const Transform3& transform, + std::shared_ptr volumeBounds, std::shared_ptr volumeMaterial, std::unique_ptr containedLayers = nullptr, std::shared_ptr containedVolumes = nullptr, @@ -435,7 +437,8 @@ class TrackingVolume : public Volume { /// @param volbounds is the description of the volume boundaries /// @param containedVolumeArray are the static volumes that fill this volume /// @param volumeName is a string identifier - TrackingVolume(const Transform3& transform, VolumeBoundsPtr volbounds, + TrackingVolume(const Transform3& transform, + std::shared_ptr volbounds, const std::shared_ptr& containedVolumeArray = nullptr, const std::string& volumeName = "undefined"); @@ -452,7 +455,8 @@ class TrackingVolume : public Volume { /// @param denseVolumeVector The contained dense volumes /// @param volumeName is a string identifier TrackingVolume( - const Transform3& transform, VolumeBoundsPtr volumeBounds, + const Transform3& transform, + std::shared_ptr volumeBounds, std::shared_ptr volumeMaterial, std::unique_ptr staticLayerArray = nullptr, std::shared_ptr containedVolumeArray = nullptr, diff --git a/Core/include/Acts/Geometry/VolumeBounds.hpp b/Core/include/Acts/Geometry/VolumeBounds.hpp index 93cb16a15a5..23bdcd4f819 100644 --- a/Core/include/Acts/Geometry/VolumeBounds.hpp +++ b/Core/include/Acts/Geometry/VolumeBounds.hpp @@ -26,8 +26,6 @@ class Surface; class VolumeBounds; class Direction; -using VolumeBoundsPtr = std::shared_ptr; - using OrientedSurface = std::pair, Direction>; using OrientedSurfaces = std::vector; diff --git a/Core/src/Geometry/CuboidVolumeBuilder.cpp b/Core/src/Geometry/CuboidVolumeBuilder.cpp index 7c53f557ded..10df4c7a6a6 100644 --- a/Core/src/Geometry/CuboidVolumeBuilder.cpp +++ b/Core/src/Geometry/CuboidVolumeBuilder.cpp @@ -200,7 +200,7 @@ std::shared_ptr Acts::CuboidVolumeBuilder::buildVolume( Acts::MutableTrackingVolumePtr Acts::CuboidVolumeBuilder::trackingVolume( const GeometryContext& gctx, Acts::TrackingVolumePtr /*gctx*/, - Acts::VolumeBoundsPtr /*bounds*/) const { + std::shared_ptr /*bounds*/) const { // Build volumes std::vector> volumes; volumes.reserve(m_cfg.volumeCfg.size()); diff --git a/Core/src/Geometry/CylinderVolumeBuilder.cpp b/Core/src/Geometry/CylinderVolumeBuilder.cpp index a1b532f8b53..66f87529797 100644 --- a/Core/src/Geometry/CylinderVolumeBuilder.cpp +++ b/Core/src/Geometry/CylinderVolumeBuilder.cpp @@ -58,7 +58,7 @@ void Acts::CylinderVolumeBuilder::setLogger( std::shared_ptr Acts::CylinderVolumeBuilder::trackingVolume( const GeometryContext& gctx, TrackingVolumePtr existingVolume, - VolumeBoundsPtr externalBounds) const { + std::shared_ptr externalBounds) const { ACTS_DEBUG("Configured to build volume : " << m_cfg.volumeName); if (existingVolume) { ACTS_DEBUG("- will wrap/enclose : " << existingVolume->volumeName()); diff --git a/Core/src/Geometry/CylinderVolumeHelper.cpp b/Core/src/Geometry/CylinderVolumeHelper.cpp index a67d0991384..5b969ec0d92 100644 --- a/Core/src/Geometry/CylinderVolumeHelper.cpp +++ b/Core/src/Geometry/CylinderVolumeHelper.cpp @@ -202,8 +202,8 @@ Acts::CylinderVolumeHelper::createTrackingVolume( const Transform3 transform = Transform3(Translation3(0., 0., zPosition)); // call to the creation method with Bounds & Translation3 return createTrackingVolume(gctx, layers, volumeMaterial, - VolumeBoundsPtr(cBounds), mtvVector, transform, - volumeName, bType); + std::shared_ptr(cBounds), + mtvVector, transform, volumeName, bType); } std::shared_ptr diff --git a/Core/src/Geometry/TrackingVolume.cpp b/Core/src/Geometry/TrackingVolume.cpp index 2531b688689..89fbb7eda26 100644 --- a/Core/src/Geometry/TrackingVolume.cpp +++ b/Core/src/Geometry/TrackingVolume.cpp @@ -37,7 +37,7 @@ class ISurfaceMaterial; } // namespace Acts Acts::TrackingVolume::TrackingVolume( - const Transform3& transform, VolumeBoundsPtr volbounds, + const Transform3& transform, std::shared_ptr volbounds, const std::shared_ptr& containedVolumeArray, const std::string& volumeName) : Volume(transform, std::move(volbounds)), @@ -52,7 +52,8 @@ Acts::TrackingVolume::TrackingVolume( // constructor for arguments Acts::TrackingVolume::TrackingVolume( - const Transform3& transform, VolumeBoundsPtr volumeBounds, + const Transform3& transform, + std::shared_ptr volumeBounds, std::shared_ptr volumeMaterial, std::unique_ptr staticLayerArray, std::shared_ptr containedVolumeArray, diff --git a/Examples/Detectors/TelescopeDetector/src/BuildTelescopeDetector.cpp b/Examples/Detectors/TelescopeDetector/src/BuildTelescopeDetector.cpp index 11b2244ba10..0f8d2732ef1 100644 --- a/Examples/Detectors/TelescopeDetector/src/BuildTelescopeDetector.cpp +++ b/Examples/Detectors/TelescopeDetector/src/BuildTelescopeDetector.cpp @@ -128,7 +128,7 @@ ActsExamples::Telescope::buildDetector( // The volume bounds is set to be a bit larger than either cubic with planes // or cylinder with discs auto length = positions.back() - positions.front(); - Acts::VolumeBoundsPtr boundsVol = nullptr; + std::shared_ptr boundsVol = nullptr; if (surfaceType == TelescopeSurfaceType::Plane) { boundsVol = std::make_shared( bounds[0] + 5._mm, bounds[1] + 5._mm, length + 10._mm); diff --git a/Plugins/DD4hep/src/ConvertDD4hepDetector.cpp b/Plugins/DD4hep/src/ConvertDD4hepDetector.cpp index 5fcd56d1355..c4432b88161 100644 --- a/Plugins/DD4hep/src/ConvertDD4hepDetector.cpp +++ b/Plugins/DD4hep/src/ConvertDD4hepDetector.cpp @@ -128,14 +128,14 @@ std::unique_ptr convertDD4hepDetector( std::vector( const GeometryContext&, const TrackingVolumePtr&, - const VolumeBoundsPtr&)>> + const std::shared_ptr&)>> volumeFactories; for (const auto& vb : volumeBuilders) { volumeFactories.push_back( [vb](const GeometryContext& vgctx, const std::shared_ptr& inner, - const VolumeBoundsPtr&) { + const std::shared_ptr&) { return vb->trackingVolume(vgctx, inner); }); } diff --git a/Tests/UnitTests/Alignment/Kernel/AlignmentTests.cpp b/Tests/UnitTests/Alignment/Kernel/AlignmentTests.cpp index 3acf3133c3c..20e2f8c676a 100644 --- a/Tests/UnitTests/Alignment/Kernel/AlignmentTests.cpp +++ b/Tests/UnitTests/Alignment/Kernel/AlignmentTests.cpp @@ -143,9 +143,10 @@ struct TelescopeDetector { // The volume transform Translation3 transVol(0, 0, 0); Transform3 trafoVol(rotation * transVol); - VolumeBoundsPtr boundsVol = std::make_shared( - rBounds->halfLengthX() + 10._mm, rBounds->halfLengthY() + 10._mm, - length + 10._mm); + std::shared_ptr boundsVol = + std::make_shared( + rBounds->halfLengthX() + 10._mm, rBounds->halfLengthY() + 10._mm, + length + 10._mm); LayerArrayCreator::Config lacConfig; LayerArrayCreator layArrCreator(