diff --git a/Core/include/Acts/Detector/Detector.hpp b/Core/include/Acts/Detector/Detector.hpp index 62e4605ae99..f5c22ca9636 100644 --- a/Core/include/Acts/Detector/Detector.hpp +++ b/Core/include/Acts/Detector/Detector.hpp @@ -37,21 +37,21 @@ class Detector : public std::enable_shared_from_this { /// /// @param name the detecor name /// @param rootVolumes the volumes contained by this detector - /// @param detectorVolumeUpdator is a Delegate to find the associated volume + /// @param detectorVolumeUpdater is a Delegate to find the associated volume /// /// @note will throw an exception if volumes vector is empty /// @note will throw an exception if duplicate volume names exist /// @note will throw an exception if the delegate is not connected Detector(std::string name, std::vector> rootVolumes, - DetectorVolumeUpdator detectorVolumeUpdator) noexcept(false); + DetectorVolumeUpdater detectorVolumeUpdater) noexcept(false); public: /// Factory for producing memory managed instances of Detector. static std::shared_ptr makeShared( std::string name, std::vector> rootVolumes, - DetectorVolumeUpdator detectorVolumeUpdator); + DetectorVolumeUpdater detectorVolumeUpdater); /// Retrieve a @c std::shared_ptr for this surface (non-const version) /// @@ -128,11 +128,11 @@ class Detector : public std::enable_shared_from_this { /// Update the volume finder /// - /// @param detectorVolumeUpdator the new volume finder - void updateDetectorVolumeFinder(DetectorVolumeUpdator detectorVolumeUpdator); + /// @param detectorVolumeUpdater the new volume finder + void updateDetectorVolumeFinder(DetectorVolumeUpdater detectorVolumeUpdater); /// Const access to the volume finder - const DetectorVolumeUpdator& detectorVolumeFinder() const; + const DetectorVolumeUpdater& detectorVolumeFinder() const; /// Return the name of the detector const std::string& name() const; @@ -148,7 +148,7 @@ class Detector : public std::enable_shared_from_this { DetectorVolume::ObjectStore> m_volumes; /// A volume finder delegate - DetectorVolumeUpdator m_detectorVolumeUpdator; + DetectorVolumeUpdater m_detectorVolumeUpdater; /// Name/index map to find volumes by name and detect duplicates std::unordered_map m_volumeNameIndex; diff --git a/Core/include/Acts/Detector/DetectorComponents.hpp b/Core/include/Acts/Detector/DetectorComponents.hpp index 176e975b5f4..8fbd4c9acdc 100644 --- a/Core/include/Acts/Detector/DetectorComponents.hpp +++ b/Core/include/Acts/Detector/DetectorComponents.hpp @@ -10,8 +10,8 @@ #include "Acts/Definitions/Algebra.hpp" #include "Acts/Detector/PortalGenerators.hpp" -#include "Acts/Navigation/DetectorVolumeUpdators.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/DetectorVolumeUpdaters.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include #include @@ -39,7 +39,7 @@ struct RootDetectorVolumes { /// The list of root volumes std::vector> volumes = {}; /// The Root volumes finder - DetectorVolumeUpdator volumeFinder; + DetectorVolumeUpdater volumeFinder; }; /// @brief The currently built detector components @@ -74,17 +74,17 @@ struct ExternalStructure { /// @brief Holder struct for the internal structure components of a DetectorVolume /// -/// @note the surface surfacesUpdator needs to handle also portal providing +/// @note the surface surfacesUpdater needs to handle also portal providing /// of contained volumes. struct InternalStructure { - /// Contained surfaces of this volume, handled by the surfacesUpdator + /// Contained surfaces of this volume, handled by the surfacesUpdater std::vector> surfaces = {}; - /// Contained volumes of this volume, handled by the volumeUpdator + /// Contained volumes of this volume, handled by the volumeUpdater std::vector> volumes = {}; /// Navigation delegate for surfaces - SurfaceCandidatesUpdator surfacesUpdator; + SurfaceCandidatesUpdater surfacesUpdater; // Navigation delegate for volumes - DetectorVolumeUpdator volumeUpdator; + DetectorVolumeUpdater volumeUpdater; }; } // namespace Experimental diff --git a/Core/include/Acts/Detector/DetectorVolume.hpp b/Core/include/Acts/Detector/DetectorVolume.hpp index b516a48b205..9779a998b8b 100644 --- a/Core/include/Acts/Detector/DetectorVolume.hpp +++ b/Core/include/Acts/Detector/DetectorVolume.hpp @@ -99,8 +99,8 @@ class DetectorVolume : public std::enable_shared_from_this { /// @param bounds the volume bounds /// @param surfaces are the contained surfaces of this volume /// @param volumes are the contains volumes of this volume - /// @param detectorVolumeUpdator is a Delegate to find the associated volume - /// @param surfaceCandidateUpdator the navigation state updator for surfaces/portals + /// @param detectorVolumeUpdater is a Delegate to find the associated volume + /// @param surfaceCandidateUpdater the navigation state updator for surfaces/portals /// /// @note throws exception if misconfigured: no bounds /// @note throws exception if ghe portal general or navigation @@ -110,8 +110,8 @@ class DetectorVolume : public std::enable_shared_from_this { const Transform3& transform, std::shared_ptr bounds, std::vector> surfaces, std::vector> volumes, - DetectorVolumeUpdator detectorVolumeUpdator, - SurfaceCandidatesUpdator surfaceCandidateUpdator) noexcept(false); + DetectorVolumeUpdater detectorVolumeUpdater, + SurfaceCandidatesUpdater surfaceCandidateUpdater) noexcept(false); /// Create a detector volume - empty/gap volume constructor /// @@ -119,7 +119,7 @@ class DetectorVolume : public std::enable_shared_from_this { /// @param name the volume name /// @param transform the transform defining the volume position /// @param bounds the volume bounds - /// @param surfaceCandidateUpdator the navigation state updator for surfaces/portals + /// @param surfaceCandidateUpdater the navigation state updator for surfaces/portals /// /// @note throws exception if misconfigured: no bounds /// @note throws exception if ghe portal general or navigation @@ -127,7 +127,7 @@ class DetectorVolume : public std::enable_shared_from_this { DetectorVolume( const GeometryContext& gctx, std::string name, const Transform3& transform, std::shared_ptr bounds, - SurfaceCandidatesUpdator surfaceCandidateUpdator) noexcept(false); + SurfaceCandidatesUpdater surfaceCandidateUpdater) noexcept(false); /// Factory method for producing memory managed instances of DetectorVolume. /// @@ -137,8 +137,8 @@ class DetectorVolume : public std::enable_shared_from_this { const Transform3& transform, std::shared_ptr bounds, std::vector> surfaces, std::vector> volumes, - DetectorVolumeUpdator detectorVolumeUpdator, - SurfaceCandidatesUpdator surfaceCandidateUpdator); + DetectorVolumeUpdater detectorVolumeUpdater, + SurfaceCandidatesUpdater surfaceCandidateUpdater); /// Factory method for producing memory managed instances of DetectorVolume. /// @@ -146,7 +146,7 @@ class DetectorVolume : public std::enable_shared_from_this { static std::shared_ptr makeShared( const GeometryContext& gctx, std::string name, const Transform3& transform, std::shared_ptr bounds, - SurfaceCandidatesUpdator surfaceCandidateUpdator); + SurfaceCandidatesUpdater surfaceCandidateUpdater); public: /// Retrieve a @c std::shared_ptr for this surface (non-const version) @@ -280,22 +280,22 @@ class DetectorVolume : public std::enable_shared_from_this { const std::vector& volumes() const; /// Const access to the detector volume updator - const DetectorVolumeUpdator& detectorVolumeUpdator() const; + const DetectorVolumeUpdater& detectorVolumeUpdater() const; /// This method allows to udate the navigation state updator /// module. /// - /// @param surfaceCandidateUpdator the new navigation state updator for surfaces + /// @param surfaceCandidateUpdater the new navigation state updator for surfaces /// @param surfaces the surfaces the new navigation state updator points to /// @param volumes the volumes the new navigation state updator points to /// - void assignSurfaceCandidatesUpdator( - SurfaceCandidatesUpdator surfaceCandidateUpdator, + void assignSurfaceCandidatesUpdater( + SurfaceCandidatesUpdater surfaceCandidateUpdater, const std::vector>& surfaces = {}, const std::vector>& volumes = {}); /// Const access to the navigation state updator - const SurfaceCandidatesUpdator& surfaceCandidatesUpdator() const; + const SurfaceCandidatesUpdater& surfaceCandidatesUpdater() const; /// Update a portal given a portal index /// @@ -389,10 +389,10 @@ class DetectorVolume : public std::enable_shared_from_this { /// BoundingBox std::shared_ptr m_boundingBox; - DetectorVolumeUpdator m_detectorVolumeUpdator; + DetectorVolumeUpdater m_detectorVolumeUpdater; /// The navigation state updator - SurfaceCandidatesUpdator m_surfaceCandidatesUpdator; + SurfaceCandidatesUpdater m_surfaceCandidatesUpdater; /// Volume material (optional) std::shared_ptr m_volumeMaterial = nullptr; @@ -416,11 +416,11 @@ class DetectorVolumeFactory { std::shared_ptr bounds, const std::vector>& surfaces, const std::vector>& volumes, - DetectorVolumeUpdator detectorVolumeUpdator, - SurfaceCandidatesUpdator surfaceCandidateUpdator) { + DetectorVolumeUpdater detectorVolumeUpdater, + SurfaceCandidatesUpdater surfaceCandidateUpdater) { auto dVolume = DetectorVolume::makeShared( gctx, name, transform, std::move(bounds), surfaces, volumes, - std::move(detectorVolumeUpdator), std::move(surfaceCandidateUpdator)); + std::move(detectorVolumeUpdater), std::move(surfaceCandidateUpdater)); dVolume->construct(gctx, portalGenerator); return dVolume; } @@ -430,10 +430,10 @@ class DetectorVolumeFactory { const PortalGenerator& portalGenerator, const GeometryContext& gctx, std::string name, const Transform3& transform, std::shared_ptr bounds, - SurfaceCandidatesUpdator surfaceCandidateUpdator) { + SurfaceCandidatesUpdater surfaceCandidateUpdater) { auto dVolume = DetectorVolume::makeShared( gctx, std::move(name), transform, std::move(bounds), - std::move(surfaceCandidateUpdator)); + std::move(surfaceCandidateUpdater)); dVolume->construct(gctx, portalGenerator); return dVolume; } diff --git a/Core/include/Acts/Detector/IndexedRootVolumeFinderBuilder.hpp b/Core/include/Acts/Detector/IndexedRootVolumeFinderBuilder.hpp index c9959bf670c..e817ce599c5 100644 --- a/Core/include/Acts/Detector/IndexedRootVolumeFinderBuilder.hpp +++ b/Core/include/Acts/Detector/IndexedRootVolumeFinderBuilder.hpp @@ -10,7 +10,7 @@ #include "Acts/Detector/interface/IRootVolumeFinderBuilder.hpp" #include "Acts/Geometry/GeometryContext.hpp" -#include "Acts/Navigation/DetectorVolumeUpdators.hpp" +#include "Acts/Navigation/DetectorVolumeUpdaters.hpp" #include "Acts/Utilities/BinningData.hpp" #include @@ -36,7 +36,7 @@ class IndexedRootVolumeFinderBuilder final : public IRootVolumeFinderBuilder { /// @param rootVolumes the root volumes to be used for the finder /// /// @return a shared detector object - DetectorVolumeUpdator construct( + DetectorVolumeUpdater construct( const GeometryContext& gctx, const std::vector>& rootVolumes) const final; diff --git a/Core/include/Acts/Detector/Portal.hpp b/Core/include/Acts/Detector/Portal.hpp index cde49ba00d8..bde88aa523f 100644 --- a/Core/include/Acts/Detector/Portal.hpp +++ b/Core/include/Acts/Detector/Portal.hpp @@ -50,7 +50,7 @@ class Portal : public std::enable_shared_from_this { public: /// The volume links forward/backward with respect to the surface normal - using DetectorVolumeUpdators = std::array; + using DetectorVolumeUpdaters = std::array; /// The vector of attached volumes forward/backward, this is useful in the /// geometry building @@ -126,27 +126,27 @@ class Portal : public std::enable_shared_from_this { /// Update the volume link /// /// @param dir the direction of the link - /// @param dVolumeUpdator is the mangaged volume updator delegate + /// @param dVolumeUpdater is the mangaged volume updator delegate /// @param attachedVolumes is the list of attached volumes for book keeping /// /// @note this overwrites the existing link - void assignDetectorVolumeUpdator( - Direction dir, DetectorVolumeUpdator dVolumeUpdator, + void assignDetectorVolumeUpdater( + Direction dir, DetectorVolumeUpdater dVolumeUpdater, std::vector> attachedVolumes); /// Update the volume link, w/o directive, i.e. it relies that there's only /// one remaining link to be set, throws an exception if that's not the case /// - /// @param dVolumeUpdator is the mangaged volume updator delegate + /// @param dVolumeUpdater is the mangaged volume updator delegate /// @param attachedVolumes is the list of attached volumes for book keeping /// /// @note this overwrites the existing link - void assignDetectorVolumeUpdator(DetectorVolumeUpdator dVolumeUpdator, + void assignDetectorVolumeUpdater(DetectorVolumeUpdater dVolumeUpdater, std::vector> attachedVolumes) noexcept(false); // Access to the portal targets: opposite/along normal vector - const DetectorVolumeUpdators& detectorVolumeUpdators() const; + const DetectorVolumeUpdaters& detectorVolumeUpdaters() const; // Access to the attached volumes - non-const access AttachedDetectorVolumes& attachedDetectorVolumes(); @@ -156,8 +156,8 @@ class Portal : public std::enable_shared_from_this { std::shared_ptr m_surface; /// The portal targets along/opposite the normal vector - DetectorVolumeUpdators m_volumeUpdators = {unconnectedUpdator(), - unconnectedUpdator()}; + DetectorVolumeUpdaters m_volumeUpdaters = {unconnectedUpdater(), + unconnectedUpdater()}; /// The portal attaches to the following volumes AttachedDetectorVolumes m_attachedVolumes; diff --git a/Core/include/Acts/Detector/detail/IndexedGridFiller.hpp b/Core/include/Acts/Detector/detail/IndexedGridFiller.hpp index f514c11126b..2d180bcc81b 100644 --- a/Core/include/Acts/Detector/detail/IndexedGridFiller.hpp +++ b/Core/include/Acts/Detector/detail/IndexedGridFiller.hpp @@ -13,7 +13,7 @@ #include "Acts/Detector/detail/ReferenceGenerators.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Geometry/Polyhedron.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Utilities/Delegate.hpp" #include "Acts/Utilities/Enumerate.hpp" #include "Acts/Utilities/IAxis.hpp" diff --git a/Core/include/Acts/Detector/detail/IndexedSurfacesGenerator.hpp b/Core/include/Acts/Detector/detail/IndexedSurfacesGenerator.hpp index 98a9e94c019..fbc510ae854 100644 --- a/Core/include/Acts/Detector/detail/IndexedSurfacesGenerator.hpp +++ b/Core/include/Acts/Detector/detail/IndexedSurfacesGenerator.hpp @@ -10,7 +10,7 @@ #include "Acts/Definitions/Algebra.hpp" #include "Acts/Detector/detail/IndexedGridFiller.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Utilities/Enumerate.hpp" #include @@ -23,7 +23,7 @@ namespace detail { /// @brief A templated indexed grid generator. /// -/// This Generator creates a SurfaceCandidatesUpdator delegate +/// This Generator creates a SurfaceCandidatesUpdater delegate /// which can then be used in the DetectorVolume class for updating /// given surface candidates based on an index grid. /// @@ -58,9 +58,9 @@ struct IndexedSurfacesGenerator { /// @param aGenerator the axis generator /// @param rGenerator the reference generataor /// - /// @return a SurfaceCandidateUpdator delegate + /// @return a SurfaceCandidateUpdater delegate template - SurfaceCandidatesUpdator operator()( + SurfaceCandidatesUpdater operator()( const GeometryContext& gctx, const axis_generator& aGenerator, const reference_generator& rGenerator) const { ACTS_DEBUG("Indexing " << surfaces.size() << " surface, " @@ -92,10 +92,10 @@ struct IndexedSurfacesGenerator { std::tie(allPortals, indexedSurfaces)); // Create the delegate and connect it - SurfaceCandidatesUpdator nStateUpdator; - nStateUpdator.connect<&DelegateType::update>( + SurfaceCandidatesUpdater nStateUpdater; + nStateUpdater.connect<&DelegateType::update>( std::move(indexedSurfacesAllPortals)); - return nStateUpdator; + return nStateUpdater; } /// Access to the logger diff --git a/Core/include/Acts/Detector/detail/PortalHelper.hpp b/Core/include/Acts/Detector/detail/PortalHelper.hpp index 76a3487190b..45a9c2a4013 100644 --- a/Core/include/Acts/Detector/detail/PortalHelper.hpp +++ b/Core/include/Acts/Detector/detail/PortalHelper.hpp @@ -44,7 +44,7 @@ namespace PortalHelper { /// @param volume is the volume that is attached to the portal /// @param direction is the direction to which it is attached /// -void attachDetectorVolumeUpdator(Portal& portal, +void attachDetectorVolumeUpdater(Portal& portal, const std::shared_ptr& volume, const Direction& direction); @@ -59,7 +59,7 @@ void attachDetectorVolumeUpdator(Portal& portal, /// @param boundaries are the value boundaries /// @param binning is the binning type /// -void attachDetectorVolumesUpdator( +void attachDetectorVolumesUpdater( const GeometryContext& gctx, Portal& portal, const std::vector>& volumes, const Direction& direction, const std::vector& boundaries, @@ -73,7 +73,7 @@ void attachDetectorVolumesUpdator( /// @param volumes are the volumes that are pointed to /// @param pReplacements are the portal replacements that are newly connected /// -void attachDetectorVolumeUpdators( +void attachDetectorVolumeUpdaters( const GeometryContext& gctx, const std::vector>& volumes, std::vector& pReplacements); diff --git a/Core/include/Acts/Detector/interface/IRootVolumeFinderBuilder.hpp b/Core/include/Acts/Detector/interface/IRootVolumeFinderBuilder.hpp index dc3d66f0f69..f2f392ccb79 100644 --- a/Core/include/Acts/Detector/interface/IRootVolumeFinderBuilder.hpp +++ b/Core/include/Acts/Detector/interface/IRootVolumeFinderBuilder.hpp @@ -9,7 +9,7 @@ #pragma once #include "Acts/Geometry/GeometryContext.hpp" -#include "Acts/Navigation/DetectorVolumeUpdators.hpp" +#include "Acts/Navigation/DetectorVolumeUpdaters.hpp" #include #include @@ -32,7 +32,7 @@ class IRootVolumeFinderBuilder { /// @param rootVolumes the root volumes to be used for the search /// /// @return a shared detector object - virtual DetectorVolumeUpdator construct( + virtual DetectorVolumeUpdater construct( const GeometryContext& gctx, const std::vector>& rootVolumes) const = 0; diff --git a/Core/include/Acts/Navigation/DetectorVolumeFinders.hpp b/Core/include/Acts/Navigation/DetectorVolumeFinders.hpp index bff354eea1d..ebaecba4761 100644 --- a/Core/include/Acts/Navigation/DetectorVolumeFinders.hpp +++ b/Core/include/Acts/Navigation/DetectorVolumeFinders.hpp @@ -14,7 +14,7 @@ #include "Acts/Navigation/NavigationDelegates.hpp" #include "Acts/Navigation/NavigationState.hpp" #include "Acts/Navigation/NavigationStateFillers.hpp" -#include "Acts/Navigation/NavigationStateUpdators.hpp" +#include "Acts/Navigation/NavigationStateUpdaters.hpp" #include "Acts/Utilities/Grid.hpp" #include "Acts/Utilities/detail/Axis.hpp" @@ -40,7 +40,7 @@ struct RootVolumeFinder : public INavigationDelegate { for (const auto v : volumes) { if (v->inside(gctx, nState.position)) { nState.currentVolume = v; - v->detectorVolumeUpdator()(gctx, nState); + v->detectorVolumeUpdater()(gctx, nState); return; } } @@ -60,7 +60,7 @@ struct TrialAndErrorVolumeFinder : public INavigationDelegate { for (const auto v : volumes) { if (v->inside(gctx, nState.position)) { nState.currentVolume = v; - v->detectorVolumeUpdator()(gctx, nState); + v->detectorVolumeUpdater()(gctx, nState); return; } } @@ -68,24 +68,24 @@ struct TrialAndErrorVolumeFinder : public INavigationDelegate { }; /// Generate a delegate to try the root volumes -inline static DetectorVolumeUpdator tryRootVolumes() { - DetectorVolumeUpdator vFinder; +inline static DetectorVolumeUpdater tryRootVolumes() { + DetectorVolumeUpdater vFinder; vFinder.connect<&RootVolumeFinder::update>( std::make_unique()); return vFinder; } /// Generate a delegate to try all sub volumes -inline static DetectorVolumeUpdator tryAllSubVolumes() { - DetectorVolumeUpdator vFinder; +inline static DetectorVolumeUpdater tryAllSubVolumes() { + DetectorVolumeUpdater vFinder; vFinder.connect<&TrialAndErrorVolumeFinder::update>( std::make_unique()); return vFinder; } /// Generate a delegate to try no volume -inline static DetectorVolumeUpdator tryNoVolumes() { - DetectorVolumeUpdator vFinder; +inline static DetectorVolumeUpdater tryNoVolumes() { + DetectorVolumeUpdater vFinder; vFinder.connect<&NoopFinder::update>(std::make_unique()); return vFinder; } @@ -117,7 +117,7 @@ struct IndexedDetectorVolumeExtractor { /// @tparam grid_type is the grid type used for this template using IndexedDetectorVolumesImpl = - IndexedUpdatorImpl; } // namespace Experimental diff --git a/Core/include/Acts/Navigation/DetectorVolumeUpdators.hpp b/Core/include/Acts/Navigation/DetectorVolumeUpdaters.hpp similarity index 90% rename from Core/include/Acts/Navigation/DetectorVolumeUpdators.hpp rename to Core/include/Acts/Navigation/DetectorVolumeUpdaters.hpp index 4fd5e18dff5..4f9a8cf2684 100644 --- a/Core/include/Acts/Navigation/DetectorVolumeUpdators.hpp +++ b/Core/include/Acts/Navigation/DetectorVolumeUpdaters.hpp @@ -12,7 +12,7 @@ #include "Acts/Navigation/NavigationDelegates.hpp" #include "Acts/Navigation/NavigationState.hpp" #include "Acts/Navigation/NavigationStateFillers.hpp" -#include "Acts/Navigation/NavigationStateUpdators.hpp" +#include "Acts/Navigation/NavigationStateUpdaters.hpp" #include "Acts/Utilities/Grid.hpp" #include "Acts/Utilities/detail/Axis.hpp" @@ -48,7 +48,7 @@ struct SingleDetectorVolumeImpl : public INavigationDelegate { : dVolume(sVolume) { if (sVolume == nullptr) { throw std::invalid_argument( - "DetectorVolumeUpdators: nullptr provided, use EndOfWorld instead."); + "DetectorVolumeUpdaters: nullptr provided, use EndOfWorld instead."); } } @@ -98,11 +98,11 @@ struct DetectorVolumesCollection { /// of volumes. /// struct BoundVolumesGrid1Impl : public INavigationDelegate { - using IndexedUpdator = - IndexedUpdatorImpl; // The indexed updator - IndexedUpdator indexedUpdator; + IndexedUpdater indexedUpdater; /// Allowed constructor with explicit arguments /// @@ -114,18 +114,18 @@ struct BoundVolumesGrid1Impl : public INavigationDelegate { const std::vector& gBoundaries, BinningValue bValue, const std::vector& cVolumes, const Transform3& bTransform = Transform3::Identity()) noexcept(false) - : indexedUpdator(IndexedUpdator(VariableBoundIndexGrid1(std::make_tuple( + : indexedUpdater(IndexedUpdater(VariableBoundIndexGrid1(std::make_tuple( VariableBoundAxis(gBoundaries))), {bValue}, bTransform)) { - indexedUpdator.extractor.dVolumes = cVolumes; + indexedUpdater.extractor.dVolumes = cVolumes; if (gBoundaries.size() != cVolumes.size() + 1u) { throw std::invalid_argument( - "DetectorVolumeUpdators: mismatching boundaries and volume numbers"); + "DetectorVolumeUpdaters: mismatching boundaries and volume numbers"); } // Initialize the grid entries for (std::size_t ib = 1u; ib < gBoundaries.size(); ++ib) { - indexedUpdator.grid.at(ib) = ib - 1; + indexedUpdater.grid.at(ib) = ib - 1; } } // Deleted default constructor @@ -137,7 +137,7 @@ struct BoundVolumesGrid1Impl : public INavigationDelegate { /// @param nState [in,out] the navigation state to be updated inline void update(const GeometryContext& gctx, NavigationState& nState) const { - indexedUpdator.update(gctx, nState); + indexedUpdater.update(gctx, nState); } }; diff --git a/Core/include/Acts/Navigation/MultiLayerSurfacesUpdator.hpp b/Core/include/Acts/Navigation/MultiLayerSurfacesUpdater.hpp similarity index 96% rename from Core/include/Acts/Navigation/MultiLayerSurfacesUpdator.hpp rename to Core/include/Acts/Navigation/MultiLayerSurfacesUpdater.hpp index 95e90066c77..8bea8df5568 100644 --- a/Core/include/Acts/Navigation/MultiLayerSurfacesUpdator.hpp +++ b/Core/include/Acts/Navigation/MultiLayerSurfacesUpdater.hpp @@ -11,7 +11,7 @@ #include "Acts/Detector/DetectorVolume.hpp" #include "Acts/Navigation/NavigationDelegates.hpp" #include "Acts/Navigation/NavigationStateFillers.hpp" -#include "Acts/Navigation/NavigationStateUpdators.hpp" +#include "Acts/Navigation/NavigationStateUpdaters.hpp" #include "Acts/Utilities/VectorHelpers.hpp" #include @@ -21,7 +21,7 @@ namespace Acts { namespace Experimental { template -class MultiLayerSurfacesUpdatorImpl : public INavigationDelegate { +class MultiLayerSurfacesUpdaterImpl : public INavigationDelegate { public: /// Broadcast the grid type using grid_type = grid_t; @@ -42,12 +42,12 @@ class MultiLayerSurfacesUpdatorImpl : public INavigationDelegate { /// @param igrid the grid that is moved into this attacher /// @param icasts is the cast values array /// @param itr a transform applied to the global position - MultiLayerSurfacesUpdatorImpl( + MultiLayerSurfacesUpdaterImpl( grid_type&& igrid, const std::array& icasts, const Transform3& itr = Transform3::Identity()) : grid(std::move(igrid)), casts(icasts), transform(itr) {} - MultiLayerSurfacesUpdatorImpl() = delete; + MultiLayerSurfacesUpdaterImpl() = delete; void update(const GeometryContext& gctx, NavigationState& nState) const { auto step = std::sqrt(std::pow(grid.binWidth()[0], 2) + diff --git a/Core/include/Acts/Navigation/NavigationDelegates.hpp b/Core/include/Acts/Navigation/NavigationDelegates.hpp index 2feedc430cf..17de1f2ebb7 100644 --- a/Core/include/Acts/Navigation/NavigationDelegates.hpp +++ b/Core/include/Acts/Navigation/NavigationDelegates.hpp @@ -41,7 +41,7 @@ class INavigationDelegate { /// /// @note it relies on the detector volume to be set to the state /// Memory managed navigation state updator -using SurfaceCandidatesUpdator = +using SurfaceCandidatesUpdater = OwningDelegate; @@ -51,13 +51,13 @@ using SurfaceCandidatesUpdator = /// @param nState [in, out] is the navigation state to be updated /// /// @return the new DetectorVolume into which one changes at this switch -using DetectorVolumeUpdator = +using DetectorVolumeUpdater = OwningDelegate; /// @brief A dummy constructed updator -inline static DetectorVolumeUpdator unconnectedUpdator() { - DetectorVolumeUpdator unconnected; +inline static DetectorVolumeUpdater unconnectedUpdater() { + DetectorVolumeUpdater unconnected; unconnected.disconnect(); return unconnected; } diff --git a/Core/include/Acts/Navigation/NavigationStateUpdators.hpp b/Core/include/Acts/Navigation/NavigationStateUpdaters.hpp similarity index 96% rename from Core/include/Acts/Navigation/NavigationStateUpdators.hpp rename to Core/include/Acts/Navigation/NavigationStateUpdaters.hpp index b1cdb1278e1..0658ccfe8de 100644 --- a/Core/include/Acts/Navigation/NavigationStateUpdators.hpp +++ b/Core/include/Acts/Navigation/NavigationStateUpdaters.hpp @@ -85,7 +85,7 @@ class SingleObjectImpl : public INavigationDelegate { /// @tparam extractor_type the helper to extract the objects from /// @tparam filler_type is the helper to fill the object into nState template -class StaticUpdatorImpl : public INavigationDelegate { +class StaticUpdaterImpl : public INavigationDelegate { public: /// @brief updates the navigation state with a single object that is filled in /// @@ -112,7 +112,7 @@ class StaticUpdatorImpl : public INavigationDelegate { /// @tparam extractor_type is the helper to extract the object /// @tparam filler_type is the helper to fill the object into the nState template -class IndexedUpdatorImpl : public INavigationDelegate { +class IndexedUpdaterImpl : public INavigationDelegate { public: /// Broadcast the grid type using grid_type = grid_t; @@ -133,12 +133,12 @@ class IndexedUpdatorImpl : public INavigationDelegate { /// @param igrid the grid that is moved into this attacher /// @param icasts is the cast values array /// @param itr a transform applied to the global position - IndexedUpdatorImpl(grid_type&& igrid, + IndexedUpdaterImpl(grid_type&& igrid, const std::array& icasts, const Transform3& itr = Transform3::Identity()) : grid(std::move(igrid)), casts(icasts), transform(itr) {} - IndexedUpdatorImpl() = delete; + IndexedUpdaterImpl() = delete; /// @brief updates the navigation state with objects from the grid according /// to the filling type AFTER applying `p3loc = transform * p3` @@ -187,7 +187,7 @@ class IndexedUpdatorImpl : public INavigationDelegate { /// /// @tparam updators_t the updators that will be called in sequence template -class ChainedUpdatorImpl : public INavigationDelegate { +class ChainedUpdaterImpl : public INavigationDelegate { public: /// The stored updators std::tuple updators; @@ -196,7 +196,7 @@ class ChainedUpdatorImpl : public INavigationDelegate { /// the tuple and call them in sequence /// /// @param upts the updators to be called in chain - ChainedUpdatorImpl(const std::tuple&& upts) + ChainedUpdaterImpl(const std::tuple&& upts) : updators(std::move(upts)) {} /// A combined navigation state updator w/o intersection specifics diff --git a/Core/include/Acts/Navigation/SurfaceCandidatesUpdators.hpp b/Core/include/Acts/Navigation/SurfaceCandidatesUpdaters.hpp similarity index 88% rename from Core/include/Acts/Navigation/SurfaceCandidatesUpdators.hpp rename to Core/include/Acts/Navigation/SurfaceCandidatesUpdaters.hpp index f516d29e766..534170ec06e 100644 --- a/Core/include/Acts/Navigation/SurfaceCandidatesUpdators.hpp +++ b/Core/include/Acts/Navigation/SurfaceCandidatesUpdaters.hpp @@ -13,10 +13,10 @@ #include "Acts/Detector/DetectorVolume.hpp" #include "Acts/Detector/Portal.hpp" #include "Acts/Geometry/GeometryContext.hpp" -#include "Acts/Navigation/MultiLayerSurfacesUpdator.hpp" +#include "Acts/Navigation/MultiLayerSurfacesUpdater.hpp" #include "Acts/Navigation/NavigationState.hpp" #include "Acts/Navigation/NavigationStateFillers.hpp" -#include "Acts/Navigation/NavigationStateUpdators.hpp" +#include "Acts/Navigation/NavigationStateUpdaters.hpp" #include "Acts/Surfaces/Surface.hpp" #include @@ -95,11 +95,11 @@ struct AllPortalsAndSurfacesImpl : public INavigationDelegate { /// Generate a provider for all portals /// /// @return a connected navigationstate updator -inline static SurfaceCandidatesUpdator tryAllPortals() { +inline static SurfaceCandidatesUpdater tryAllPortals() { auto ap = std::make_unique(); - SurfaceCandidatesUpdator nStateUpdator; - nStateUpdator.connect<&AllPortalsImpl::update>(std::move(ap)); - return nStateUpdator; + SurfaceCandidatesUpdater nStateUpdater; + nStateUpdater.connect<&AllPortalsImpl::update>(std::move(ap)); + return nStateUpdater; } /// Generate a provider for all portals and Surfacess @@ -108,11 +108,11 @@ inline static SurfaceCandidatesUpdator tryAllPortals() { /// setup with many surfaces /// /// @return a connected navigationstate updator -inline static SurfaceCandidatesUpdator tryAllPortalsAndSurfaces() { +inline static SurfaceCandidatesUpdater tryAllPortalsAndSurfaces() { auto aps = std::make_unique(); - SurfaceCandidatesUpdator nStateUpdator; - nStateUpdator.connect<&AllPortalsAndSurfacesImpl::update>(std::move(aps)); - return nStateUpdator; + SurfaceCandidatesUpdater nStateUpdater; + nStateUpdater.connect<&AllPortalsAndSurfacesImpl::update>(std::move(aps)); + return nStateUpdater; } /// @brief This holds and extracts a collection of surfaces without much @@ -139,21 +139,21 @@ struct AdditionalSurfacesImpl : public INavigationDelegate { /// @tparam grid_type is the grid type used for this indexed lookup template using IndexedSurfacesImpl = - IndexedUpdatorImpl; + IndexedUpdaterImpl; /// @brief An indexed multi layer surface implementation access /// /// @tparam grid_type is the grid type used for this indexed lookup template using MultiLayerSurfacesImpl = - MultiLayerSurfacesUpdatorImpl; + MultiLayerSurfacesUpdaterImpl; /// @brief An indexed surface implementation with portal access /// ///@tparam inexed_updator is the updator for the indexed surfaces template class indexed_updator> using IndexedSurfacesAllPortalsImpl = - ChainedUpdatorImpl>; + ChainedUpdaterImpl>; } // namespace Experimental } // namespace Acts diff --git a/Core/src/Detector/Detector.cpp b/Core/src/Detector/Detector.cpp index 693ad432b34..9e40b0e0340 100644 --- a/Core/src/Detector/Detector.cpp +++ b/Core/src/Detector/Detector.cpp @@ -21,14 +21,14 @@ Acts::Experimental::Detector::Detector( std::string name, std::vector> rootVolumes, - DetectorVolumeUpdator detectorVolumeUpdator) + DetectorVolumeUpdater detectorVolumeUpdater) : m_name(std::move(name)), m_rootVolumes(std::move(rootVolumes)), - m_detectorVolumeUpdator(std::move(detectorVolumeUpdator)) { + m_detectorVolumeUpdater(std::move(detectorVolumeUpdater)) { if (m_rootVolumes.internal.empty()) { throw std::invalid_argument("Detector: no volume were given."); } - if (!m_detectorVolumeUpdator.connected()) { + if (!m_detectorVolumeUpdater.connected()) { throw std::invalid_argument( "Detector: volume finder delegate is not connected."); } @@ -93,10 +93,10 @@ Acts::Experimental::Detector::Detector( std::shared_ptr Acts::Experimental::Detector::makeShared( std::string name, std::vector> rootVolumes, - DetectorVolumeUpdator detectorVolumeUpdator) { + DetectorVolumeUpdater detectorVolumeUpdater) { return std::shared_ptr( new Detector(std::move(name), std::move(rootVolumes), - std::move(detectorVolumeUpdator))); + std::move(detectorVolumeUpdater))); } std::vector>& @@ -120,13 +120,13 @@ Acts::Experimental::Detector::volumes() const { } void Acts::Experimental::Detector::updateDetectorVolumeFinder( - DetectorVolumeUpdator detectorVolumeUpdator) { - m_detectorVolumeUpdator = std::move(detectorVolumeUpdator); + DetectorVolumeUpdater detectorVolumeUpdater) { + m_detectorVolumeUpdater = std::move(detectorVolumeUpdater); } -const Acts::Experimental::DetectorVolumeUpdator& +const Acts::Experimental::DetectorVolumeUpdater& Acts::Experimental::Detector::detectorVolumeFinder() const { - return m_detectorVolumeUpdator; + return m_detectorVolumeUpdater; } const std::string& Acts::Experimental::Detector::name() const { @@ -145,7 +145,7 @@ Acts::Experimental::Detector::getSharedPtr() const { void Acts::Experimental::Detector::updateDetectorVolume( const GeometryContext& gctx, NavigationState& nState) const { - m_detectorVolumeUpdator(gctx, nState); + m_detectorVolumeUpdater(gctx, nState); } const Acts::Experimental::DetectorVolume* @@ -154,7 +154,7 @@ Acts::Experimental::Detector::findDetectorVolume( NavigationState nState; nState.currentDetector = this; nState.position = position; - m_detectorVolumeUpdator(gctx, nState); + m_detectorVolumeUpdater(gctx, nState); return nState.currentVolume; } diff --git a/Core/src/Detector/DetectorVolume.cpp b/Core/src/Detector/DetectorVolume.cpp index c06663e138c..2b49b3476a0 100644 --- a/Core/src/Detector/DetectorVolume.cpp +++ b/Core/src/Detector/DetectorVolume.cpp @@ -13,7 +13,7 @@ #include "Acts/Geometry/Polyhedron.hpp" #include "Acts/Geometry/VolumeBounds.hpp" #include "Acts/Navigation/DetectorVolumeFinders.hpp" -#include "Acts/Navigation/DetectorVolumeUpdators.hpp" +#include "Acts/Navigation/DetectorVolumeUpdaters.hpp" #include "Acts/Navigation/NavigationState.hpp" #include "Acts/Surfaces/Surface.hpp" #include "Acts/Utilities/Delegate.hpp" @@ -31,25 +31,25 @@ Acts::Experimental::DetectorVolume::DetectorVolume( std::shared_ptr bounds, std::vector> surfaces, std::vector> volumes, - DetectorVolumeUpdator detectorVolumeUpdator, - SurfaceCandidatesUpdator surfaceCandidateUpdator) + DetectorVolumeUpdater detectorVolumeUpdater, + SurfaceCandidatesUpdater surfaceCandidateUpdater) : m_name(std::move(name)), m_transform(transform), m_bounds(std::move(bounds)), m_surfaces(std::move(surfaces)), m_volumes(std::move(volumes)), - m_detectorVolumeUpdator(std::move(detectorVolumeUpdator)), - m_surfaceCandidatesUpdator(std::move(surfaceCandidateUpdator)), + m_detectorVolumeUpdater(std::move(detectorVolumeUpdater)), + m_surfaceCandidatesUpdater(std::move(surfaceCandidateUpdater)), m_volumeMaterial(nullptr) { if (m_bounds == nullptr) { throw std::invalid_argument( "DetectorVolume: construction with nullptr bounds."); } - if (!m_detectorVolumeUpdator.connected()) { + if (!m_detectorVolumeUpdater.connected()) { throw std::invalid_argument( "DetectorVolume: navigation state updator delegate is not connected."); } - if (!m_surfaceCandidatesUpdator.connected()) { + if (!m_surfaceCandidatesUpdater.connected()) { throw std::invalid_argument( "DetectorVolume: navigation state updator delegate is not connected."); } @@ -61,9 +61,9 @@ Acts::Experimental::DetectorVolume::DetectorVolume( Acts::Experimental::DetectorVolume::DetectorVolume( const GeometryContext& gctx, std::string name, const Transform3& transform, std::shared_ptr bounds, - SurfaceCandidatesUpdator surfaceCandidateUpdator) + SurfaceCandidatesUpdater surfaceCandidateUpdater) : DetectorVolume(gctx, std::move(name), transform, std::move(bounds), {}, - {}, tryNoVolumes(), std::move(surfaceCandidateUpdator)) {} + {}, tryNoVolumes(), std::move(surfaceCandidateUpdater)) {} std::shared_ptr Acts::Experimental::DetectorVolume::makeShared( @@ -71,22 +71,22 @@ Acts::Experimental::DetectorVolume::makeShared( std::shared_ptr bounds, std::vector> surfaces, std::vector> volumes, - DetectorVolumeUpdator detectorVolumeUpdator, - SurfaceCandidatesUpdator surfaceCandidateUpdator) { + DetectorVolumeUpdater detectorVolumeUpdater, + SurfaceCandidatesUpdater surfaceCandidateUpdater) { return std::shared_ptr(new DetectorVolume( gctx, std::move(name), transform, std::move(bounds), std::move(surfaces), - std::move(volumes), std::move(detectorVolumeUpdator), - std::move(surfaceCandidateUpdator))); + std::move(volumes), std::move(detectorVolumeUpdater), + std::move(surfaceCandidateUpdater))); } std::shared_ptr Acts::Experimental::DetectorVolume::makeShared( const GeometryContext& gctx, std::string name, const Transform3& transform, std::shared_ptr bounds, - SurfaceCandidatesUpdator surfaceCandidateUpdator) { + SurfaceCandidatesUpdater surfaceCandidateUpdater) { return std::shared_ptr( new DetectorVolume(gctx, std::move(name), transform, std::move(bounds), - std::move(surfaceCandidateUpdator))); + std::move(surfaceCandidateUpdater))); } const Acts::Transform3& Acts::Experimental::DetectorVolume::transform( @@ -134,14 +134,14 @@ Acts::Experimental::DetectorVolume::volumes() const { return m_volumes.external; } -const Acts::Experimental::DetectorVolumeUpdator& -Acts::Experimental::DetectorVolume::detectorVolumeUpdator() const { - return m_detectorVolumeUpdator; +const Acts::Experimental::DetectorVolumeUpdater& +Acts::Experimental::DetectorVolume::detectorVolumeUpdater() const { + return m_detectorVolumeUpdater; } -const Acts::Experimental::SurfaceCandidatesUpdator& -Acts::Experimental::DetectorVolume::surfaceCandidatesUpdator() const { - return m_surfaceCandidatesUpdator; +const Acts::Experimental::SurfaceCandidatesUpdater& +Acts::Experimental::DetectorVolume::surfaceCandidatesUpdater() const { + return m_surfaceCandidatesUpdater; } void Acts::Experimental::DetectorVolume::assignVolumeMaterial( @@ -239,15 +239,15 @@ bool Acts::Experimental::DetectorVolume::exclusivelyInside( void Acts::Experimental::DetectorVolume::updateNavigationState( const GeometryContext& gctx, NavigationState& nState) const { nState.currentVolume = this; - m_surfaceCandidatesUpdator(gctx, nState); + m_surfaceCandidatesUpdater(gctx, nState); nState.surfaceCandidate = nState.surfaceCandidates.begin(); } -void Acts::Experimental::DetectorVolume::assignSurfaceCandidatesUpdator( - SurfaceCandidatesUpdator surfaceCandidateUpdator, +void Acts::Experimental::DetectorVolume::assignSurfaceCandidatesUpdater( + SurfaceCandidatesUpdater surfaceCandidateUpdater, const std::vector>& surfaces, const std::vector>& volumes) { - m_surfaceCandidatesUpdator = std::move(surfaceCandidateUpdator); + m_surfaceCandidatesUpdater = std::move(surfaceCandidateUpdater); m_surfaces = ObjectStore>(surfaces); m_volumes = ObjectStore>(volumes); } @@ -287,13 +287,13 @@ bool Acts::Experimental::DetectorVolume::checkContainment( void Acts::Experimental::DetectorVolume::closePortals() { for (auto& p : m_portals.internal) { // Create a null link - for (auto [ivu, vu] : enumerate(p->detectorVolumeUpdators())) { + for (auto [ivu, vu] : enumerate(p->detectorVolumeUpdaters())) { if (!vu.connected()) { auto eowDir = Direction::fromIndex(ivu); auto eow = std::make_unique(); - Acts::Experimental::DetectorVolumeUpdator eowLink; + Acts::Experimental::DetectorVolumeUpdater eowLink; eowLink.connect<&EndOfWorldImpl::update>(std::move(eow)); - p->assignDetectorVolumeUpdator(eowDir, std::move(eowLink), {}); + p->assignDetectorVolumeUpdater(eowDir, std::move(eowLink), {}); } } } diff --git a/Core/src/Detector/DetectorVolumeBuilder.cpp b/Core/src/Detector/DetectorVolumeBuilder.cpp index 3365b7ee4e6..2269538eebe 100644 --- a/Core/src/Detector/DetectorVolumeBuilder.cpp +++ b/Core/src/Detector/DetectorVolumeBuilder.cpp @@ -14,7 +14,7 @@ #include "Acts/Detector/interface/IInternalStructureBuilder.hpp" #include "Acts/Geometry/VolumeBounds.hpp" #include "Acts/Navigation/DetectorVolumeFinders.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Utilities/Enumerate.hpp" #include @@ -63,7 +63,7 @@ Acts::Experimental::DetectorVolumeBuilder::construct( } else { // Internal structure is present ACTS_VERBOSE("Internal structure is being built.") - auto [surfaces, volumes, surfacesUpdator, volumeUpdator] = + auto [surfaces, volumes, surfacesUpdater, volumeUpdater] = m_cfg.internalsBuilder->construct(gctx); // Add the internally created volumes as root volumes @@ -75,8 +75,8 @@ Acts::Experimental::DetectorVolumeBuilder::construct( // Construct the DetectorVolume dVolume = DetectorVolumeFactory::construct( portalGenerator, gctx, m_cfg.name, transform, std::move(bounds), - surfaces, volumes, std::move(volumeUpdator), - std::move(surfacesUpdator)); + surfaces, volumes, std::move(volumeUpdater), + std::move(surfacesUpdater)); } // All portals are defined and build the current shell for (auto [ip, p] : enumerate(dVolume->portalPtrs())) { diff --git a/Core/src/Detector/IndexedRootVolumeFinderBuilder.cpp b/Core/src/Detector/IndexedRootVolumeFinderBuilder.cpp index 17c2194f8a5..60a6bae3315 100644 --- a/Core/src/Detector/IndexedRootVolumeFinderBuilder.cpp +++ b/Core/src/Detector/IndexedRootVolumeFinderBuilder.cpp @@ -55,7 +55,7 @@ Acts::Experimental::IndexedRootVolumeFinderBuilder:: } } -Acts::Experimental::DetectorVolumeUpdator +Acts::Experimental::DetectorVolumeUpdater Acts::Experimental::IndexedRootVolumeFinderBuilder::construct( const GeometryContext& gctx, const std::vector>& rootVolumes) const { @@ -78,7 +78,7 @@ Acts::Experimental::IndexedRootVolumeFinderBuilder::construct( fillGridIndices2D(gctx, grid, rootVolumes, boundaries, casts); using IndexedDetectorVolumesImpl = - IndexedUpdatorImpl; auto indexedDetectorVolumeImpl = @@ -86,7 +86,7 @@ Acts::Experimental::IndexedRootVolumeFinderBuilder::construct( casts); // Return the root volume finder - DetectorVolumeUpdator rootVolumeFinder; + DetectorVolumeUpdater rootVolumeFinder; rootVolumeFinder.connect<&IndexedDetectorVolumesImpl::update>( std::move(indexedDetectorVolumeImpl)); return rootVolumeFinder; diff --git a/Core/src/Detector/LayerStructureBuilder.cpp b/Core/src/Detector/LayerStructureBuilder.cpp index 90b4c364c7c..5b8662bb7e1 100644 --- a/Core/src/Detector/LayerStructureBuilder.cpp +++ b/Core/src/Detector/LayerStructureBuilder.cpp @@ -49,13 +49,13 @@ namespace { /// /// @return a configured surface candidate updators template -Acts::Experimental::SurfaceCandidatesUpdator createUpdator( +Acts::Experimental::SurfaceCandidatesUpdater createUpdater( const Acts::GeometryContext& gctx, std::vector> lSurfaces, std::vector assignToAll, const Acts::Experimental::ProtoBinning& binning) { // The surface candidate updator & a generator for polyhedrons - Acts::Experimental::SurfaceCandidatesUpdator sfCandidates; + Acts::Experimental::SurfaceCandidatesUpdater sfCandidates; Acts::Experimental::detail::PolyhedronReferenceGenerator rGenerator; // Indexed Surface generator for this case Acts::Experimental::detail::IndexedSurfacesGenerator< @@ -92,14 +92,14 @@ Acts::Experimental::SurfaceCandidatesUpdator createUpdator( /// @return a configured surface candidate updators template -Acts::Experimental::SurfaceCandidatesUpdator createUpdator( +Acts::Experimental::SurfaceCandidatesUpdater createUpdater( const Acts::GeometryContext& gctx, const std::vector>& lSurfaces, const std::vector& assignToAll, const Acts::Experimental::ProtoBinning& aBinning, const Acts::Experimental::ProtoBinning& bBinning) { // The surface candidate updator & a generator for polyhedrons - Acts::Experimental::SurfaceCandidatesUpdator sfCandidates; + Acts::Experimental::SurfaceCandidatesUpdater sfCandidates; Acts::Experimental::detail::PolyhedronReferenceGenerator rGenerator; // Indexed Surface generator for this case Acts::Experimental::detail::IndexedSurfacesGenerator< @@ -159,7 +159,7 @@ Acts::Experimental::LayerStructureBuilder::construct( const Acts::GeometryContext& gctx) const { // Trivialities first: internal volumes std::vector> internalVolumes = {}; - DetectorVolumeUpdator internalVolumeUpdator = tryNoVolumes(); + DetectorVolumeUpdater internalVolumeUpdater = tryNoVolumes(); // Print the auxiliary information if (!m_cfg.auxiliary.empty()) { @@ -167,7 +167,7 @@ Acts::Experimental::LayerStructureBuilder::construct( } // Retrieve the layer surfaces - SurfaceCandidatesUpdator internalCandidatesUpdator = + SurfaceCandidatesUpdater internalCandidatesUpdater = tryAllPortalsAndSurfaces(); auto internalSurfaces = m_cfg.surfacesProvider->surfaces(gctx); ACTS_DEBUG("Building internal layer structure from " @@ -226,13 +226,13 @@ Acts::Experimental::LayerStructureBuilder::construct( auto binning = m_cfg.binnings[0u]; if (binning.boundaryType == Acts::detail::AxisBoundaryType::Closed) { ACTS_VERBOSE("-- closed binning option."); - internalCandidatesUpdator = - createUpdator( + internalCandidatesUpdater = + createUpdater( gctx, internalSurfaces, assignToAll, binning); } else { ACTS_VERBOSE("-- bound binning option."); - internalCandidatesUpdator = - createUpdator( + internalCandidatesUpdater = + createUpdater( gctx, internalSurfaces, assignToAll, binning); } } else if (m_cfg.binnings.size() == 2u) { @@ -243,21 +243,21 @@ Acts::Experimental::LayerStructureBuilder::construct( if (binning0.boundaryType == Acts::detail::AxisBoundaryType::Closed) { ACTS_VERBOSE("-- closed/bound binning option."); - internalCandidatesUpdator = - createUpdator( gctx, internalSurfaces, assignToAll, binning0, binning1); } else if (binning1.boundaryType == Acts::detail::AxisBoundaryType::Closed) { ACTS_VERBOSE("-- bound/closed binning option."); - internalCandidatesUpdator = - createUpdator( gctx, internalSurfaces, assignToAll, binning0, binning1); } else { ACTS_VERBOSE("-- bound/bound binning option."); - internalCandidatesUpdator = - createUpdator( gctx, internalSurfaces, assignToAll, binning0, binning1); } @@ -271,13 +271,13 @@ Acts::Experimental::LayerStructureBuilder::construct( } // Check if everything went ok - if (!internalCandidatesUpdator.connected()) { + if (!internalCandidatesUpdater.connected()) { throw std::runtime_error( "LayerStructureBuilder: could not connect surface candidate updator."); } // Return the internal structure return InternalStructure{internalSurfaces, internalVolumes, - std::move(internalCandidatesUpdator), - std::move(internalVolumeUpdator)}; + std::move(internalCandidatesUpdater), + std::move(internalVolumeUpdater)}; } diff --git a/Core/src/Detector/MultiWireStructureBuilder.cpp b/Core/src/Detector/MultiWireStructureBuilder.cpp index 59848ad945e..1f78206276c 100644 --- a/Core/src/Detector/MultiWireStructureBuilder.cpp +++ b/Core/src/Detector/MultiWireStructureBuilder.cpp @@ -21,7 +21,7 @@ #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Geometry/VolumeBounds.hpp" #include "Acts/Navigation/DetectorVolumeFinders.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Utilities/Logger.hpp" #include @@ -63,7 +63,7 @@ class MultiWireInternalStructureBuilder ACTS_DEBUG(m_cfg.auxiliary); } - Acts::Experimental::DetectorVolumeUpdator internalVolumeUpdator = + Acts::Experimental::DetectorVolumeUpdater internalVolumeUpdater = Acts::Experimental::tryNoVolumes(); // Create the indexed surfaces auto internalSurfaces = m_cfg.iSurfaces; @@ -80,12 +80,12 @@ class MultiWireInternalStructureBuilder {m_cfg.binning[1u].edges.front(), m_cfg.binning[1u].edges.back()}, m_cfg.binning[1u].edges.size() - 1}; - auto sfCandidatesUpdator = isg(gctx, aGenerator, rGenerator); + auto sfCandidatesUpdater = isg(gctx, aGenerator, rGenerator); return {internalSurfaces, {}, - std::move(sfCandidatesUpdator), - std::move(internalVolumeUpdator)}; + std::move(sfCandidatesUpdater), + std::move(internalVolumeUpdater)}; } private: diff --git a/Core/src/Detector/Portal.cpp b/Core/src/Detector/Portal.cpp index 77b67d0633b..cda979faf01 100644 --- a/Core/src/Detector/Portal.cpp +++ b/Core/src/Detector/Portal.cpp @@ -43,9 +43,9 @@ Acts::RegularSurface& Acts::Experimental::Portal::surface() { return *m_surface.get(); } -const Acts::Experimental::Portal::DetectorVolumeUpdators& -Acts::Experimental::Portal::detectorVolumeUpdators() const { - return m_volumeUpdators; +const Acts::Experimental::Portal::DetectorVolumeUpdaters& +Acts::Experimental::Portal::detectorVolumeUpdaters() const { + return m_volumeUpdaters; } Acts::Experimental::Portal::AttachedDetectorVolumes& @@ -72,17 +72,17 @@ void Acts::Experimental::Portal::fuse(std::shared_ptr& other) { Direction bDir = Direction::Backward; // Determine this directioon - Direction tDir = (!m_volumeUpdators[bDir.index()].connected()) + Direction tDir = (!m_volumeUpdaters[bDir.index()].connected()) ? Direction::Forward : Direction::Backward; - if (!m_volumeUpdators[tDir.index()].connected()) { + if (!m_volumeUpdaters[tDir.index()].connected()) { throw std::invalid_argument( "Portal: trying to fuse portal (keep) with no links."); } // And now check other direction Direction oDir = tDir.invert(); - if (!other->m_volumeUpdators[oDir.index()].connected()) { + if (!other->m_volumeUpdaters[oDir.index()].connected()) { throw std::runtime_error( "Portal: trying to fuse portal (waste) with no links."); } @@ -98,32 +98,32 @@ void Acts::Experimental::Portal::fuse(std::shared_ptr& other) { } auto odx = oDir.index(); - m_volumeUpdators[odx] = std::move(other->m_volumeUpdators[odx]); + m_volumeUpdaters[odx] = std::move(other->m_volumeUpdaters[odx]); m_attachedVolumes[odx] = other->m_attachedVolumes[odx]; // And finally overwrite the original portal other = getSharedPtr(); } -void Acts::Experimental::Portal::assignDetectorVolumeUpdator( - Direction dir, DetectorVolumeUpdator dVolumeUpdator, +void Acts::Experimental::Portal::assignDetectorVolumeUpdater( + Direction dir, DetectorVolumeUpdater dVolumeUpdater, std::vector> attachedVolumes) { auto idx = dir.index(); - m_volumeUpdators[idx] = std::move(dVolumeUpdator); + m_volumeUpdaters[idx] = std::move(dVolumeUpdater); m_attachedVolumes[idx] = std::move(attachedVolumes); } -void Acts::Experimental::Portal::assignDetectorVolumeUpdator( - DetectorVolumeUpdator dVolumeUpdator, +void Acts::Experimental::Portal::assignDetectorVolumeUpdater( + DetectorVolumeUpdater dVolumeUpdater, std::vector> attachedVolumes) { // Check and throw exceptions - if (!m_volumeUpdators[0u].connected() && !m_volumeUpdators[1u].connected()) { + if (!m_volumeUpdaters[0u].connected() && !m_volumeUpdaters[1u].connected()) { throw std::runtime_error("Portal: portal has no link on either side."); } - if (m_volumeUpdators[0u].connected() && m_volumeUpdators[1u].connected()) { + if (m_volumeUpdaters[0u].connected() && m_volumeUpdaters[1u].connected()) { throw std::runtime_error("Portal: portal already has links on both sides."); } - std::size_t idx = m_volumeUpdators[0u].connected() ? 1u : 0u; - m_volumeUpdators[idx] = std::move(dVolumeUpdator); + std::size_t idx = m_volumeUpdaters[0u].connected() ? 1u : 0u; + m_volumeUpdaters[idx] = std::move(dVolumeUpdater); m_attachedVolumes[idx] = std::move(attachedVolumes); } @@ -133,9 +133,9 @@ void Acts::Experimental::Portal::updateDetectorVolume( const auto& direction = nState.direction; const Vector3 normal = surface().normal(gctx, position); Direction dir = Direction::fromScalar(normal.dot(direction)); - const auto& vUpdator = m_volumeUpdators[dir.index()]; - if (vUpdator.connected()) { - vUpdator(gctx, nState); + const auto& vUpdater = m_volumeUpdaters[dir.index()]; + if (vUpdater.connected()) { + vUpdater(gctx, nState); } else { nState.currentVolume = nullptr; } diff --git a/Core/src/Detector/PortalGenerators.cpp b/Core/src/Detector/PortalGenerators.cpp index 4c2c6380c29..d950054ca90 100644 --- a/Core/src/Detector/PortalGenerators.cpp +++ b/Core/src/Detector/PortalGenerators.cpp @@ -11,7 +11,7 @@ #include "Acts/Detector/DetectorVolume.hpp" #include "Acts/Detector/Portal.hpp" #include "Acts/Geometry/VolumeBounds.hpp" -#include "Acts/Navigation/DetectorVolumeUpdators.hpp" +#include "Acts/Navigation/DetectorVolumeUpdaters.hpp" #include "Acts/Navigation/NavigationDelegates.hpp" #include "Acts/Utilities/Enumerate.hpp" @@ -37,11 +37,11 @@ Acts::Experimental::generatePortals( // Create a shared link instance & delegate auto singleLinkImpl = std::make_unique(dVolume.get()); - DetectorVolumeUpdator singleLink; + DetectorVolumeUpdater singleLink; singleLink.connect<&SingleDetectorVolumeImpl::update>( std::move(singleLinkImpl)); // Update the volume link and the store - portal->assignDetectorVolumeUpdator(oSurface.second, std::move(singleLink), + portal->assignDetectorVolumeUpdater(oSurface.second, std::move(singleLink), {dVolume}); // Portal is prepared portals.push_back(std::move(portal)); @@ -73,10 +73,10 @@ Acts::Experimental::generatePortalsUpdateInternals( // Creating a link to the mother auto motherLinkImpl = std::make_unique(dVolume.get()); - DetectorVolumeUpdator motherLink; + DetectorVolumeUpdater motherLink; motherLink.connect<&SingleDetectorVolumeImpl::update>( std::move(motherLinkImpl)); - pPtr->assignDetectorVolumeUpdator(std::move(motherLink), {dVolume}); + pPtr->assignDetectorVolumeUpdater(std::move(motherLink), {dVolume}); } } // Return from the standard generator diff --git a/Core/src/Detector/detail/CylindricalDetectorHelper.cpp b/Core/src/Detector/detail/CylindricalDetectorHelper.cpp index 6b6aa81f5e1..c211dd7be9d 100644 --- a/Core/src/Detector/detail/CylindricalDetectorHelper.cpp +++ b/Core/src/Detector/detail/CylindricalDetectorHelper.cpp @@ -495,7 +495,7 @@ Acts::Experimental::detail::CylindricalDetectorHelper::connectInR( } // Attach the new volume multi links - PortalHelper::attachDetectorVolumeUpdators(gctx, volumes, pReplacements); + PortalHelper::attachDetectorVolumeUpdaters(gctx, volumes, pReplacements); // Exchange the portals of the volumes ACTS_VERBOSE("Portals of " << volumes.size() << " volumes need updating."); @@ -704,7 +704,7 @@ Acts::Experimental::detail::CylindricalDetectorHelper::connectInZ( } // Attach the new volume multi links - PortalHelper::attachDetectorVolumeUpdators(gctx, volumes, pReplacements); + PortalHelper::attachDetectorVolumeUpdaters(gctx, volumes, pReplacements); // Exchange the portals of the volumes ACTS_VERBOSE("Portals of " << volumes.size() << " volumes need updating."); @@ -833,7 +833,7 @@ Acts::Experimental::detail::CylindricalDetectorHelper::connectInPhi( } // Attach the new volume multi links - PortalHelper::attachDetectorVolumeUpdators(gctx, volumes, pReplacements); + PortalHelper::attachDetectorVolumeUpdaters(gctx, volumes, pReplacements); // Exchange the portals of the volumes ACTS_VERBOSE("Portals of " << volumes.size() << " volumes need updating."); for (auto& iv : volumes) { @@ -915,7 +915,7 @@ Acts::Experimental::detail::CylindricalDetectorHelper::wrapInZR( std::vector> zVolumes = { volumes[1u], volumes[0u], volumes[1u]}; // Attach the new volume multi links - PortalHelper::attachDetectorVolumeUpdators(gctx, zVolumes, pReplacements); + PortalHelper::attachDetectorVolumeUpdaters(gctx, zVolumes, pReplacements); auto& [p, i, dir, boundaries, binning] = pReplacements[0u]; // Update the portals volumes[1u]->updatePortal(p, 6u); diff --git a/Core/src/Detector/detail/IndexedGridFiller.cpp b/Core/src/Detector/detail/IndexedGridFiller.cpp index 94c530a30a8..61b35c3b45e 100644 --- a/Core/src/Detector/detail/IndexedGridFiller.cpp +++ b/Core/src/Detector/detail/IndexedGridFiller.cpp @@ -13,7 +13,7 @@ #include "Acts/Detector/detail/ReferenceGenerators.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Geometry/Polyhedron.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Utilities/Delegate.hpp" #include "Acts/Utilities/Enumerate.hpp" #include "Acts/Utilities/IAxis.hpp" diff --git a/Core/src/Detector/detail/PortalHelper.cpp b/Core/src/Detector/detail/PortalHelper.cpp index 6753f0b590f..d6e4c951b03 100644 --- a/Core/src/Detector/detail/PortalHelper.cpp +++ b/Core/src/Detector/detail/PortalHelper.cpp @@ -9,7 +9,7 @@ #include "Acts/Detector/detail/PortalHelper.hpp" #include "Acts/Detector/Portal.hpp" -#include "Acts/Navigation/DetectorVolumeUpdators.hpp" +#include "Acts/Navigation/DetectorVolumeUpdaters.hpp" #include "Acts/Navigation/NavigationDelegates.hpp" #include "Acts/Surfaces/Surface.hpp" #include "Acts/Utilities/Helpers.hpp" @@ -18,22 +18,22 @@ #include #include -void Acts::Experimental::detail::PortalHelper::attachDetectorVolumeUpdator( +void Acts::Experimental::detail::PortalHelper::attachDetectorVolumeUpdater( Portal& portal, const std::shared_ptr& volume, const Direction& direction) { // Create a shared link instance & delegate auto volumeLinkImpl = std::make_unique( volume.get()); - Acts::Experimental::DetectorVolumeUpdator volumeLink; + Acts::Experimental::DetectorVolumeUpdater volumeLink; volumeLink.connect<&Acts::Experimental::SingleDetectorVolumeImpl::update>( std::move(volumeLinkImpl)); // Update the volume link and the store - portal.assignDetectorVolumeUpdator(direction, std::move(volumeLink), + portal.assignDetectorVolumeUpdater(direction, std::move(volumeLink), {volume}); } -void Acts::Experimental::detail::PortalHelper::attachDetectorVolumesUpdator( +void Acts::Experimental::detail::PortalHelper::attachDetectorVolumesUpdater( const GeometryContext& gctx, Portal& portal, const std::vector>& volumes, const Direction& direction, const std::vector& boundaries, @@ -44,13 +44,13 @@ void Acts::Experimental::detail::PortalHelper::attachDetectorVolumesUpdator( auto volumes1D = std::make_unique( boundaries, binning, unpack_shared_const_vector(volumes), pTransform.inverse()); - DetectorVolumeUpdator dVolumeUpdator; - dVolumeUpdator.connect<&BoundVolumesGrid1Impl::update>(std::move(volumes1D)); - portal.assignDetectorVolumeUpdator(direction, std::move(dVolumeUpdator), + DetectorVolumeUpdater dVolumeUpdater; + dVolumeUpdater.connect<&BoundVolumesGrid1Impl::update>(std::move(volumes1D)); + portal.assignDetectorVolumeUpdater(direction, std::move(dVolumeUpdater), volumes); } -void Acts::Experimental::detail::PortalHelper::attachDetectorVolumeUpdators( +void Acts::Experimental::detail::PortalHelper::attachDetectorVolumeUpdaters( const GeometryContext& gctx, const std::vector>& volumes, std::vector& pReplacements) { @@ -64,10 +64,10 @@ void Acts::Experimental::detail::PortalHelper::attachDetectorVolumeUpdators( // Creating a link to the mother auto volumes1D = std::make_unique( boundaries, binning, cVolumes, pTransform.inverse()); - DetectorVolumeUpdator dVolumeUpdator; - dVolumeUpdator.connect<&BoundVolumesGrid1Impl::update>( + DetectorVolumeUpdater dVolumeUpdater; + dVolumeUpdater.connect<&BoundVolumesGrid1Impl::update>( std::move(volumes1D)); - p->assignDetectorVolumeUpdator(dir, std::move(dVolumeUpdator), volumes); + p->assignDetectorVolumeUpdater(dir, std::move(dVolumeUpdater), volumes); } } diff --git a/Core/src/Visualization/GeometryView3D.cpp b/Core/src/Visualization/GeometryView3D.cpp index dfa82c2ca23..f83d4f1ea8e 100644 --- a/Core/src/Visualization/GeometryView3D.cpp +++ b/Core/src/Visualization/GeometryView3D.cpp @@ -207,7 +207,7 @@ void Acts::GeometryView3D::drawPortal(IVisualization3D& helper, // color the portal based on if it contains two links(green) // or one link(red) auto surface = &(portal.surface()); - auto links = &(portal.detectorVolumeUpdators()); + auto links = &(portal.detectorVolumeUpdaters()); if (links->size() == 2) { drawSurface(helper, *surface, gctx, transform, connected); } else { diff --git a/Examples/Detectors/MuonSpectrometerMockupDetector/src/MockupSectorBuilder.cpp b/Examples/Detectors/MuonSpectrometerMockupDetector/src/MockupSectorBuilder.cpp index 19ff73eff7e..4a62ce15acd 100644 --- a/Examples/Detectors/MuonSpectrometerMockupDetector/src/MockupSectorBuilder.cpp +++ b/Examples/Detectors/MuonSpectrometerMockupDetector/src/MockupSectorBuilder.cpp @@ -16,7 +16,7 @@ #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Geometry/VolumeBounds.hpp" #include "Acts/Navigation/DetectorVolumeFinders.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Plugins/Geant4/Geant4Converters.hpp" #include "Acts/Plugins/Geant4/Geant4DetectorElement.hpp" #include "Acts/Plugins/Geant4/Geant4DetectorSurfaceFactory.hpp" diff --git a/Examples/Run/Geant4/TestMockupBuilder.cpp b/Examples/Run/Geant4/TestMockupBuilder.cpp index 0d8d0db39d7..76e1f6f3c2d 100644 --- a/Examples/Run/Geant4/TestMockupBuilder.cpp +++ b/Examples/Run/Geant4/TestMockupBuilder.cpp @@ -14,7 +14,7 @@ #include "Acts/Navigation/DetectorNavigator.hpp" #include "Acts/Navigation/DetectorVolumeFinders.hpp" #include "Acts/Navigation/NavigationState.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Propagator/AbortList.hpp" #include "Acts/Propagator/EigenStepper.hpp" #include "Acts/Propagator/Propagator.hpp" diff --git a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/IndexedSurfacesSvgConverter.hpp b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/IndexedSurfacesSvgConverter.hpp index 650f0b07b32..c8c994898ea 100644 --- a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/IndexedSurfacesSvgConverter.hpp +++ b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/IndexedSurfacesSvgConverter.hpp @@ -14,7 +14,7 @@ #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Geometry/GeometryHierarchyMap.hpp" #include "Acts/Navigation/NavigationDelegates.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Plugins/ActSVG/GridSvgConverter.hpp" #include "Acts/Plugins/ActSVG/SurfaceSvgConverter.hpp" #include "Acts/Plugins/ActSVG/SvgUtils.hpp" @@ -164,7 +164,7 @@ ProtoIndexedSurfaceGrid convertImpl(const GeometryContext& gctx, template void convert(const GeometryContext& gctx, const surface_container& surfaces, const Options& cOptions, ProtoIndexedSurfaceGrid& sgi, - const Experimental::SurfaceCandidatesUpdator& delegate, + const Experimental::SurfaceCandidatesUpdater& delegate, [[maybe_unused]] const instance_type& refInstance) { using GridType = typename instance_type::template grid_type>; @@ -194,7 +194,7 @@ template void unrollConvert(const GeometryContext& gctx, const surface_container& surfaces, const Options& cOptions, ProtoIndexedSurfaceGrid& sgi, - const Experimental::SurfaceCandidatesUpdator& delegate, + const Experimental::SurfaceCandidatesUpdater& delegate, TypeList /*unused*/) { (convert(gctx, surfaces, cOptions, sgi, delegate, Args{}), ...); } @@ -213,7 +213,7 @@ void unrollConvert(const GeometryContext& gctx, template ProtoIndexedSurfaceGrid convert( const GeometryContext& gctx, const surface_container& surfaces, - const Experimental::SurfaceCandidatesUpdator& delegate, + const Experimental::SurfaceCandidatesUpdater& delegate, const Options& cOptions) { // Prep work what is to be filled std::vector pSurfaces; diff --git a/Plugins/ActSVG/src/DetectorVolumeSvgConverter.cpp b/Plugins/ActSVG/src/DetectorVolumeSvgConverter.cpp index f3ee500e703..359620715ee 100644 --- a/Plugins/ActSVG/src/DetectorVolumeSvgConverter.cpp +++ b/Plugins/ActSVG/src/DetectorVolumeSvgConverter.cpp @@ -66,7 +66,7 @@ Acts::Svg::DetectorVolumeConverter::convert( pVolume._v_surfaces = pSurfaces; // Make dedicated surface grid sheets - const auto& internalNavigationDelegate = dVolume.surfaceCandidatesUpdator(); + const auto& internalNavigationDelegate = dVolume.surfaceCandidatesUpdater(); IndexedSurfacesConverter::Options isOptions; // Use or transfer the surface style diff --git a/Plugins/ActSVG/src/PortalSvgConverter.cpp b/Plugins/ActSVG/src/PortalSvgConverter.cpp index 42da871f17b..cc6ec19de24 100644 --- a/Plugins/ActSVG/src/PortalSvgConverter.cpp +++ b/Plugins/ActSVG/src/PortalSvgConverter.cpp @@ -9,7 +9,7 @@ #include "Acts/Plugins/ActSVG/PortalSvgConverter.hpp" #include "Acts/Detector/Portal.hpp" -#include "Acts/Navigation/DetectorVolumeUpdators.hpp" +#include "Acts/Navigation/DetectorVolumeUpdaters.hpp" #include "Acts/Surfaces/RegularSurface.hpp" namespace { @@ -60,18 +60,18 @@ std::vector convertMultiLink( } // The return links std::vector pLinks; - const auto& volumes = multiLink.indexedUpdator.extractor.dVolumes; - const auto& casts = multiLink.indexedUpdator.casts; + const auto& volumes = multiLink.indexedUpdater.extractor.dVolumes; + const auto& casts = multiLink.indexedUpdater.casts; // Generate the proto-links of the multi-link for (auto [il, v] : Acts::enumerate(volumes)) { Acts::Vector3 position = refPosition; - if constexpr (decltype(multiLink.indexedUpdator)::grid_type::DIM == 1u) { + if constexpr (decltype(multiLink.indexedUpdater)::grid_type::DIM == 1u) { // Get the binning value Acts::BinningValue bValue = casts[0u]; // Get the boundaries - take care, they are in local coordinates const auto& boundaries = - multiLink.indexedUpdator.grid.axes()[0u]->getBinEdges(); + multiLink.indexedUpdater.grid.axes()[0u]->getBinEdges(); Acts::ActsScalar refC = 0.5 * (boundaries[il + 1u] + boundaries[il]); @@ -138,7 +138,7 @@ Acts::Svg::ProtoPortal Acts::Svg::PortalConverter::convert( rDir = surface.normal(gctx, rPos); // Now convert the link objects - const auto& updators = portal.detectorVolumeUpdators(); + const auto& updators = portal.detectorVolumeUpdaters(); int sign = -1; for (const auto& dvu : updators) { diff --git a/Plugins/Json/include/Acts/Plugins/Json/DetectorVolumeFinderJsonConverter.hpp b/Plugins/Json/include/Acts/Plugins/Json/DetectorVolumeFinderJsonConverter.hpp index a7ac122ab4c..1bc51a82696 100644 --- a/Plugins/Json/include/Acts/Plugins/Json/DetectorVolumeFinderJsonConverter.hpp +++ b/Plugins/Json/include/Acts/Plugins/Json/DetectorVolumeFinderJsonConverter.hpp @@ -9,7 +9,7 @@ #pragma once #include "Acts/Navigation/DetectorVolumeFinders.hpp" -#include "Acts/Navigation/DetectorVolumeUpdators.hpp" +#include "Acts/Navigation/DetectorVolumeUpdaters.hpp" #include "Acts/Plugins/Json/DetrayJsonHelper.hpp" #include "Acts/Plugins/Json/IndexedGridJsonHelper.hpp" #include "Acts/Utilities/Grid.hpp" @@ -31,11 +31,11 @@ namespace DetectorVolumeFinderJsonConverter { /// @param refInstance is a reference instance of potential type casting template void convert(nlohmann::json& jIndexedVolumes, - const Experimental::DetectorVolumeUpdator& delegate, bool detray, + const Experimental::DetectorVolumeUpdater& delegate, bool detray, [[maybe_unused]] const instance_type& refInstance) { using GridType = typename instance_type::template grid_type; // Defining a Delegate type - using DelegateType = Experimental::IndexedUpdatorImpl< + using DelegateType = Experimental::IndexedUpdaterImpl< GridType, Acts::Experimental::IndexedDetectorVolumeExtractor, Acts::Experimental::DetectorVolumeFiller>; // Get the instance @@ -64,7 +64,7 @@ void convert(nlohmann::json& jIndexedVolumes, /// @param detray indicate if this is a detray json to be written out template void unrollConvert(nlohmann::json& jIndexedVolumes, - const Experimental::DetectorVolumeUpdator& delegate, + const Experimental::DetectorVolumeUpdater& delegate, bool detray, TypeList /*unused*/) { (convert(jIndexedVolumes, delegate, detray, Args{}), ...); } @@ -81,7 +81,7 @@ void unrollConvert(nlohmann::json& jIndexedVolumes, /// /// @return a json object static inline nlohmann::json toJson( - const Experimental::DetectorVolumeUpdator& delegate, bool detray = false) { + const Experimental::DetectorVolumeUpdater& delegate, bool detray = false) { // Convert if dynamic cast happens to work nlohmann::json jIndexedVolumes; unrollConvert(jIndexedVolumes, delegate, detray, @@ -95,7 +95,7 @@ static inline nlohmann::json toJson( /// @param jVolumeFinder the json file to read from /// /// @return the connected navigation delegate -Experimental::DetectorVolumeUpdator fromJson( +Experimental::DetectorVolumeUpdater fromJson( const nlohmann::json& jVolumeFinder); } // namespace DetectorVolumeFinderJsonConverter diff --git a/Plugins/Json/include/Acts/Plugins/Json/IndexedGridJsonHelper.hpp b/Plugins/Json/include/Acts/Plugins/Json/IndexedGridJsonHelper.hpp index 6f5aed56096..5a396341e6f 100644 --- a/Plugins/Json/include/Acts/Plugins/Json/IndexedGridJsonHelper.hpp +++ b/Plugins/Json/include/Acts/Plugins/Json/IndexedGridJsonHelper.hpp @@ -54,12 +54,12 @@ nlohmann::json convertImpl(const index_grid& indexGrid, bool detray = false) { /// @tparam updator_type /// @tparam generator_type /// -/// @param jUpdator The corresponding json object +/// @param jUpdater The corresponding json object /// @param jIndicator the string indicator which one it is /// /// @return the updator type template -updator_type generateFromJson(const nlohmann::json& jUpdator, +updator_type generateFromJson(const nlohmann::json& jUpdater, const std::string& jIndicator) { generator_type generator; @@ -81,12 +81,12 @@ updator_type generateFromJson(const nlohmann::json& jUpdator, }; // Peek into the json object to understand what to do - if (jUpdator["type"] == jIndicator) { - if (jUpdator.find("grid") != jUpdator.end()) { + if (jUpdater["type"] == jIndicator) { + if (jUpdater.find("grid") != jUpdater.end()) { Transform3 transform = - Transform3JsonConverter::fromJson(jUpdator["transform"]); - auto jGrid = jUpdator["grid"]; - auto jCasts = jUpdator["casts"].get>(); + Transform3JsonConverter::fromJson(jUpdater["transform"]); + auto jGrid = jUpdater["grid"]; + auto jCasts = jUpdater["casts"].get>(); auto jAxes = jGrid["axes"]; // 1D cases @@ -104,13 +104,13 @@ updator_type generateFromJson(const nlohmann::json& jUpdator, EqClosed ecAG{range, bins}; auto grid = GridJsonConverter::fromJson(jGrid, ecAG); - return generator.createUpdator(std::move(grid), {bValue}, + return generator.createUpdater(std::move(grid), {bValue}, transform); } else { EqBound ebAG{range, bins}; auto grid = GridJsonConverter::fromJson(jGrid, ebAG); - return generator.createUpdator(std::move(grid), {bValue}, + return generator.createUpdater(std::move(grid), {bValue}, transform); } } else { @@ -119,13 +119,13 @@ updator_type generateFromJson(const nlohmann::json& jUpdator, VarClosed vcAG{vExtractor(jAxis)}; auto grid = GridJsonConverter::fromJson(jGrid, vcAG); - return generator.createUpdator(std::move(grid), {bValue}, + return generator.createUpdater(std::move(grid), {bValue}, transform); } else { VarBound vbAG{vExtractor(jAxis)}; auto grid = GridJsonConverter::fromJson(jGrid, vbAG); - return generator.createUpdator(std::move(grid), {bValue}, + return generator.createUpdater(std::move(grid), {bValue}, transform); } } @@ -152,14 +152,14 @@ updator_type generateFromJson(const nlohmann::json& jUpdator, auto grid = GridJsonConverter::fromJson( jGrid, ebebAG); - return generator.createUpdator(std::move(grid), + return generator.createUpdater(std::move(grid), {bValueA, bValueB}, transform); } else { EqBoundVarBound ebvbAG{rangeA, binsA, vExtractor(jAxisB)}; auto grid = GridJsonConverter::fromJson( jGrid, ebvbAG); - return generator.createUpdator(std::move(grid), + return generator.createUpdater(std::move(grid), {bValueA, bValueB}, transform); } } else { @@ -169,14 +169,14 @@ updator_type generateFromJson(const nlohmann::json& jUpdator, auto grid = GridJsonConverter::fromJson( jGrid, vbebAG); - return generator.createUpdator(std::move(grid), + return generator.createUpdater(std::move(grid), {bValueA, bValueB}, transform); } else { VarBoundVarBound vbvbAG{vExtractor(jAxisA), vExtractor(jAxisB)}; auto grid = GridJsonConverter::fromJson( jGrid, vbvbAG); - return generator.createUpdator(std::move(grid), + return generator.createUpdater(std::move(grid), {bValueA, bValueB}, transform); } } @@ -190,14 +190,14 @@ updator_type generateFromJson(const nlohmann::json& jUpdator, auto grid = GridJsonConverter::fromJson( jGrid, ebecAG); - return generator.createUpdator(std::move(grid), + return generator.createUpdater(std::move(grid), {bValueA, bValueB}, transform); } else { EqBoundVarClosed ebvcAG{rangeA, binsA, vExtractor(jAxisB)}; auto grid = GridJsonConverter::fromJson( jGrid, ebvcAG); - return generator.createUpdator(std::move(grid), + return generator.createUpdater(std::move(grid), {bValueA, bValueB}, transform); } } else { @@ -207,14 +207,14 @@ updator_type generateFromJson(const nlohmann::json& jUpdator, auto grid = GridJsonConverter::fromJson( jGrid, vbecAG); - return generator.createUpdator(std::move(grid), + return generator.createUpdater(std::move(grid), {bValueA, bValueB}, transform); } else { VarBoundVarClosed vbvcAG{vExtractor(jAxisA), vExtractor(jAxisB)}; auto grid = GridJsonConverter::fromJson( jGrid, vbvcAG); - return generator.createUpdator(std::move(grid), + return generator.createUpdater(std::move(grid), {bValueA, bValueB}, transform); } } diff --git a/Plugins/Json/include/Acts/Plugins/Json/IndexedSurfacesJsonConverter.hpp b/Plugins/Json/include/Acts/Plugins/Json/IndexedSurfacesJsonConverter.hpp index 64114532e0a..28917d830a7 100644 --- a/Plugins/Json/include/Acts/Plugins/Json/IndexedSurfacesJsonConverter.hpp +++ b/Plugins/Json/include/Acts/Plugins/Json/IndexedSurfacesJsonConverter.hpp @@ -13,7 +13,7 @@ #include "Acts/Geometry/Extent.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Navigation/NavigationDelegates.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Plugins/Json/AlgebraJsonConverter.hpp" #include "Acts/Plugins/Json/DetrayJsonHelper.hpp" #include "Acts/Plugins/Json/GridJsonConverter.hpp" @@ -43,7 +43,7 @@ namespace IndexedSurfacesJsonConverter { /// @param refInstance is a reference instance of potential type casting template void convert(nlohmann::json& jIndexedSurfaces, - const Experimental::SurfaceCandidatesUpdator& delegate, + const Experimental::SurfaceCandidatesUpdater& delegate, bool detray, [[maybe_unused]] const instance_type& refInstance) { using GridType = typename instance_type::template grid_type>; @@ -77,7 +77,7 @@ void convert(nlohmann::json& jIndexedSurfaces, /// @param detray if the detray json format is written template void unrollConvert(nlohmann::json& jIndexedSurfaces, - const Experimental::SurfaceCandidatesUpdator& delegate, + const Experimental::SurfaceCandidatesUpdater& delegate, bool detray, TypeList /*unused*/) { (convert(jIndexedSurfaces, delegate, detray, Args{}), ...); } @@ -92,7 +92,7 @@ void unrollConvert(nlohmann::json& jIndexedSurfaces, /// /// @return a json object representing the surface updator static inline nlohmann::json toJson( - const Experimental::SurfaceCandidatesUpdator& delegate, + const Experimental::SurfaceCandidatesUpdater& delegate, bool detray = false) { // Convert if dynamic cast happens to work nlohmann::json jIndexedSurfaces; @@ -110,7 +110,7 @@ static inline nlohmann::json toJson( /// @param jSurfaceNavigation the json file to read from /// /// @return the surface navigation delegate -Experimental::SurfaceCandidatesUpdator fromJson( +Experimental::SurfaceCandidatesUpdater fromJson( const nlohmann::json& jSurfaceNavigation); } // namespace IndexedSurfacesJsonConverter diff --git a/Plugins/Json/include/Acts/Plugins/Json/PortalJsonConverter.hpp b/Plugins/Json/include/Acts/Plugins/Json/PortalJsonConverter.hpp index 7caab3476e8..da4a5d32445 100644 --- a/Plugins/Json/include/Acts/Plugins/Json/PortalJsonConverter.hpp +++ b/Plugins/Json/include/Acts/Plugins/Json/PortalJsonConverter.hpp @@ -10,7 +10,7 @@ #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Geometry/VolumeBounds.hpp" -#include "Acts/Navigation/DetectorVolumeUpdators.hpp" +#include "Acts/Navigation/DetectorVolumeUpdaters.hpp" #include "Acts/Plugins/Json/ActsJson.hpp" #include "Acts/Plugins/Json/SurfaceJsonConverter.hpp" #include "Acts/Utilities/Logger.hpp" @@ -74,7 +74,7 @@ std::vector toJsonDetray( /// /// @return a json object nlohmann::json toJson( - const Experimental::DetectorVolumeUpdator& updator, + const Experimental::DetectorVolumeUpdater& updator, const std::vector& detectorVolumes); /// @brief convert from json format diff --git a/Plugins/Json/src/DetectorJsonConverter.cpp b/Plugins/Json/src/DetectorJsonConverter.cpp index a555a1df2eb..816723a1b0e 100644 --- a/Plugins/Json/src/DetectorJsonConverter.cpp +++ b/Plugins/Json/src/DetectorJsonConverter.cpp @@ -145,7 +145,7 @@ nlohmann::json Acts::DetectorJsonConverter::toJsonDetray( for (const auto [iv, volume] : enumerate(volumes)) { // And its surface navigation delegates nlohmann::json jSurfacesDelegate = IndexedSurfacesJsonConverter::toJson( - volume->surfaceCandidatesUpdator(), true); + volume->surfaceCandidatesUpdater(), true); if (jSurfacesDelegate.is_null()) { continue; } diff --git a/Plugins/Json/src/DetectorVolumeFinderJsonConverter.cpp b/Plugins/Json/src/DetectorVolumeFinderJsonConverter.cpp index a6174c40ff1..91386b1ae9e 100644 --- a/Plugins/Json/src/DetectorVolumeFinderJsonConverter.cpp +++ b/Plugins/Json/src/DetectorVolumeFinderJsonConverter.cpp @@ -10,7 +10,7 @@ #include "Acts/Detector/detail/GridAxisGenerators.hpp" #include "Acts/Navigation/DetectorVolumeFinders.hpp" -#include "Acts/Navigation/DetectorVolumeUpdators.hpp" +#include "Acts/Navigation/DetectorVolumeUpdaters.hpp" #include "Acts/Plugins/Json/GridJsonConverter.hpp" #include "Acts/Plugins/Json/UtilitiesJsonConverter.hpp" @@ -32,13 +32,13 @@ struct IndexedVolumesGenerator { /// @param bv the bin value array /// @param transform the transform for the indexed volumes inmplementaiton /// - /// @return a connected DetectorVolumeUpdator object + /// @return a connected DetectorVolumeUpdater object template - Acts::Experimental::DetectorVolumeUpdator createUpdator( + Acts::Experimental::DetectorVolumeUpdater createUpdater( grid_type&& grid, const std::array& bv, const Acts::Transform3& transform) { - using IndexedDetectorVolumesImpl = Acts::Experimental::IndexedUpdatorImpl< + using IndexedDetectorVolumesImpl = Acts::Experimental::IndexedUpdaterImpl< grid_type, Acts::Experimental::IndexedDetectorVolumeExtractor, Acts::Experimental::DetectorVolumeFiller>; @@ -47,7 +47,7 @@ struct IndexedVolumesGenerator { transform); // Create the delegate and connect it - Acts::Experimental::DetectorVolumeUpdator vFinder; + Acts::Experimental::DetectorVolumeUpdater vFinder; vFinder.connect<&IndexedDetectorVolumesImpl::update>( std::move(indexedDetectorVolumeImpl)); return vFinder; @@ -56,12 +56,12 @@ struct IndexedVolumesGenerator { } // namespace -Acts::Experimental::SurfaceCandidatesUpdator +Acts::Experimental::SurfaceCandidatesUpdater Acts::DetectorVolumeFinderJsonConverter::fromJson( const nlohmann::json& jVolumeFinder) { // The return object auto vFinder = IndexedGridJsonHelper::generateFromJson< - Experimental::DetectorVolumeUpdator, IndexedVolumesGenerator>( + Experimental::DetectorVolumeUpdater, IndexedVolumesGenerator>( jVolumeFinder, "IndexedVolumes"); if (vFinder.connected()) { return vFinder; diff --git a/Plugins/Json/src/DetectorVolumeJsonConverter.cpp b/Plugins/Json/src/DetectorVolumeJsonConverter.cpp index b7d5bdbfedd..8a5077768c8 100644 --- a/Plugins/Json/src/DetectorVolumeJsonConverter.cpp +++ b/Plugins/Json/src/DetectorVolumeJsonConverter.cpp @@ -12,7 +12,7 @@ #include "Acts/Detector/Portal.hpp" #include "Acts/Detector/PortalGenerators.hpp" #include "Acts/Navigation/DetectorVolumeFinders.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Plugins/Json/AlgebraJsonConverter.hpp" #include "Acts/Plugins/Json/DetrayJsonHelper.hpp" #include "Acts/Plugins/Json/IndexedSurfacesJsonConverter.hpp" @@ -62,7 +62,7 @@ nlohmann::json Acts::DetectorVolumeJsonConverter::toJson( jVolume["surfaces"] = jSurfaces; // And its surface navigation delegates nlohmann::json jSurfacesDelegate = - IndexedSurfacesJsonConverter::toJson(volume.surfaceCandidatesUpdator()); + IndexedSurfacesJsonConverter::toJson(volume.surfaceCandidatesUpdater()); jVolume["surface_navigation"] = jSurfacesDelegate; // Write the sub volumes diff --git a/Plugins/Json/src/IndexedSurfacesJsonConverter.cpp b/Plugins/Json/src/IndexedSurfacesJsonConverter.cpp index 23218c18815..ed3ff0abdba 100644 --- a/Plugins/Json/src/IndexedSurfacesJsonConverter.cpp +++ b/Plugins/Json/src/IndexedSurfacesJsonConverter.cpp @@ -9,7 +9,7 @@ #include "Acts/Plugins/Json/IndexedSurfacesJsonConverter.hpp" #include "Acts/Detector/detail/GridAxisGenerators.hpp" -#include "Acts/Navigation/NavigationStateUpdators.hpp" +#include "Acts/Navigation/NavigationStateUpdaters.hpp" #include "Acts/Plugins/Json/GridJsonConverter.hpp" #include "Acts/Plugins/Json/IndexedGridJsonHelper.hpp" #include "Acts/Plugins/Json/UtilitiesJsonConverter.hpp" @@ -33,9 +33,9 @@ struct IndexedSurfacesGenerator { /// @param bv the bin value array /// @param transform the transform for the indexed surfaces inmplementaiton /// - /// @return a connected SurfaceCandidatesUpdator object + /// @return a connected SurfaceCandidatesUpdater object template - Acts::Experimental::SurfaceCandidatesUpdator createUpdator( + Acts::Experimental::SurfaceCandidatesUpdater createUpdater( grid_type&& grid, const std::array& bv, const Acts::Transform3& transform) { @@ -52,23 +52,23 @@ struct IndexedSurfacesGenerator { std::tie(allPortals, indexedSurfaces)); // Create the delegate and connect it - Acts::Experimental::SurfaceCandidatesUpdator nStateUpdator; - nStateUpdator.connect<&DelegateType::update>( + Acts::Experimental::SurfaceCandidatesUpdater nStateUpdater; + nStateUpdater.connect<&DelegateType::update>( std::move(indexedSurfacesAllPortals)); - return nStateUpdator; + return nStateUpdater; } }; } // namespace -Acts::Experimental::SurfaceCandidatesUpdator +Acts::Experimental::SurfaceCandidatesUpdater Acts::IndexedSurfacesJsonConverter::fromJson( const nlohmann::json& jSurfaceNavigation) { if (!jSurfaceNavigation.is_null()) { // The return object auto sfCandidates = IndexedGridJsonHelper::generateFromJson< - Experimental::SurfaceCandidatesUpdator, IndexedSurfacesGenerator>( + Experimental::SurfaceCandidatesUpdater, IndexedSurfacesGenerator>( jSurfaceNavigation, "IndexedSurfaces"); if (sfCandidates.connected()) { return sfCandidates; diff --git a/Plugins/Json/src/PortalJsonConverter.cpp b/Plugins/Json/src/PortalJsonConverter.cpp index e959a32adc4..7051ae8e7e1 100644 --- a/Plugins/Json/src/PortalJsonConverter.cpp +++ b/Plugins/Json/src/PortalJsonConverter.cpp @@ -11,7 +11,7 @@ #include "Acts/Detector/DetectorVolume.hpp" #include "Acts/Detector/Portal.hpp" #include "Acts/Detector/detail/PortalHelper.hpp" -#include "Acts/Navigation/DetectorVolumeUpdators.hpp" +#include "Acts/Navigation/DetectorVolumeUpdaters.hpp" #include "Acts/Plugins/Json/DetrayJsonHelper.hpp" #include "Acts/Plugins/Json/SurfaceJsonConverter.hpp" #include "Acts/Plugins/Json/UtilitiesJsonConverter.hpp" @@ -57,7 +57,7 @@ nlohmann::json Acts::PortalJsonConverter::toJson( jPortal["surface"] = SurfaceJsonConverter::toJson(gctx, portal.surface(), options.surfaceOptions); // And the portal specific information - const auto& volumeLinks = portal.detectorVolumeUpdators(); + const auto& volumeLinks = portal.detectorVolumeUpdaters(); nlohmann::json jLinks; for (const auto& vLink : volumeLinks) { nlohmann::json jLink = toJson(vLink, detectorVolumes); @@ -77,7 +77,7 @@ std::vector Acts::PortalJsonConverter::toJsonDetray( // The overall return object std::vector jPortals = {}; const RegularSurface& surface = portal.surface(); - const auto& volumeLinks = portal.detectorVolumeUpdators(); + const auto& volumeLinks = portal.detectorVolumeUpdaters(); // First assumption for outside link (along direction) std::size_t outside = 1u; @@ -130,10 +130,10 @@ std::vector Acts::PortalJsonConverter::toJsonDetray( if (multiLink1D != nullptr) { // Resolve the multi link 1D auto boundaries = - multiLink1D->indexedUpdator.grid.axes()[0u]->getBinEdges(); - const auto& cast = multiLink1D->indexedUpdator.casts[0u]; - const auto& transform = multiLink1D->indexedUpdator.transform; - const auto& volumes = multiLink1D->indexedUpdator.extractor.dVolumes; + multiLink1D->indexedUpdater.grid.axes()[0u]->getBinEdges(); + const auto& cast = multiLink1D->indexedUpdater.casts[0u]; + const auto& transform = multiLink1D->indexedUpdater.transform; + const auto& volumes = multiLink1D->indexedUpdater.extractor.dVolumes; if (!transform.isApprox(Transform3::Identity())) { std::runtime_error( "PortalJsonConverter: transformed boundary link implementation not " @@ -253,7 +253,7 @@ std::vector Acts::PortalJsonConverter::toJsonDetray( } nlohmann::json Acts::PortalJsonConverter::toJson( - const Experimental::DetectorVolumeUpdator& updator, + const Experimental::DetectorVolumeUpdater& updator, const std::vector& detectorVolumes) { nlohmann::json jLink; if (updator.connected()) { @@ -275,16 +275,16 @@ nlohmann::json Acts::PortalJsonConverter::toJson( dynamic_cast(instance); if (multiLink1D != nullptr) { nlohmann::json jMultiLink; - const auto& volumes = multiLink1D->indexedUpdator.extractor.dVolumes; - const auto& casts = multiLink1D->indexedUpdator.casts; + const auto& volumes = multiLink1D->indexedUpdater.extractor.dVolumes; + const auto& casts = multiLink1D->indexedUpdater.casts; nlohmann::json jTransform = Transform3JsonConverter::toJson( - multiLink1D->indexedUpdator.transform); + multiLink1D->indexedUpdater.transform); std::vector vIndices = {}; for (const auto& v : volumes) { vIndices.push_back(findVolume(v, detectorVolumes)); } jMultiLink["boundaries"] = - multiLink1D->indexedUpdator.grid.axes()[0u]->getBinEdges(); + multiLink1D->indexedUpdater.grid.axes()[0u]->getBinEdges(); jMultiLink["binning"] = casts[0u]; jMultiLink["targets"] = vIndices; jMultiLink["transform"] = jTransform; @@ -314,7 +314,7 @@ std::shared_ptr Acts::PortalJsonConverter::fromJson( for (auto [ivl, vl] : enumerate(jLinks)) { if (vl.contains("single")) { const auto vIndex = vl["single"].get(); - Experimental::detail::PortalHelper::attachDetectorVolumeUpdator( + Experimental::detail::PortalHelper::attachDetectorVolumeUpdater( *portal, detectorVolumes[vIndex], normalDirs[ivl]); } else if (vl.contains("multi_1D")) { // Resolve the multi link 1D @@ -326,7 +326,7 @@ std::shared_ptr Acts::PortalJsonConverter::fromJson( for (const auto t : targets) { targetVolumes.push_back(detectorVolumes[t]); } - Experimental::detail::PortalHelper::attachDetectorVolumesUpdator( + Experimental::detail::PortalHelper::attachDetectorVolumesUpdater( gctx, *portal, targetVolumes, normalDirs[ivl], boundaries, binning); } } diff --git a/Tests/UnitTests/Core/Detector/CylindricalContainerBuilderTests.cpp b/Tests/UnitTests/Core/Detector/CylindricalContainerBuilderTests.cpp index d3c6c881bcc..7f4b3e9c763 100644 --- a/Tests/UnitTests/Core/Detector/CylindricalContainerBuilderTests.cpp +++ b/Tests/UnitTests/Core/Detector/CylindricalContainerBuilderTests.cpp @@ -19,7 +19,7 @@ #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Geometry/GeometryIdentifier.hpp" #include "Acts/Navigation/DetectorVolumeFinders.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Surfaces/CylinderBounds.hpp" #include "Acts/Surfaces/CylinderSurface.hpp" #include "Acts/Surfaces/DiscSurface.hpp" diff --git a/Tests/UnitTests/Core/Detector/CylindricalDetectorFromBlueprintTests.cpp b/Tests/UnitTests/Core/Detector/CylindricalDetectorFromBlueprintTests.cpp index ad8ab7f6d13..c3a7f12ba15 100644 --- a/Tests/UnitTests/Core/Detector/CylindricalDetectorFromBlueprintTests.cpp +++ b/Tests/UnitTests/Core/Detector/CylindricalDetectorFromBlueprintTests.cpp @@ -20,7 +20,7 @@ #include "Acts/Detector/interface/IInternalStructureBuilder.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Navigation/DetectorVolumeFinders.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Surfaces/CylinderSurface.hpp" #include "Acts/Surfaces/DiscSurface.hpp" #include "Acts/Utilities/BinningData.hpp" @@ -43,19 +43,19 @@ class SurfaceBuilder : public Acts::Experimental::IInternalStructureBuilder { // Trivialities first: internal volumes std::vector> internalVolumes = {}; - Acts::Experimental::DetectorVolumeUpdator internalVolumeUpdator = + Acts::Experimental::DetectorVolumeUpdater internalVolumeUpdater = Acts::Experimental::tryNoVolumes(); // Retrieve the layer surfaces - Acts::Experimental::SurfaceCandidatesUpdator internalCandidatesUpdator = + Acts::Experimental::SurfaceCandidatesUpdater internalCandidatesUpdater = Acts::Experimental::tryAllPortalsAndSurfaces(); // Return the internal structure return Acts::Experimental::InternalStructure{ {m_surface}, internalVolumes, - std::move(internalCandidatesUpdator), - std::move(internalVolumeUpdator)}; + std::move(internalCandidatesUpdater), + std::move(internalVolumeUpdater)}; } private: diff --git a/Tests/UnitTests/Core/Detector/CylindricalDetectorHelperTests.cpp b/Tests/UnitTests/Core/Detector/CylindricalDetectorHelperTests.cpp index 7cec05c220e..67e92fbb8b7 100644 --- a/Tests/UnitTests/Core/Detector/CylindricalDetectorHelperTests.cpp +++ b/Tests/UnitTests/Core/Detector/CylindricalDetectorHelperTests.cpp @@ -19,7 +19,7 @@ #include "Acts/Geometry/CylinderVolumeBounds.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Navigation/DetectorVolumeFinders.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Utilities/Enumerate.hpp" #include "Acts/Utilities/Logger.hpp" diff --git a/Tests/UnitTests/Core/Detector/DetectorBuilderTests.cpp b/Tests/UnitTests/Core/Detector/DetectorBuilderTests.cpp index 749dd524997..041aef288eb 100644 --- a/Tests/UnitTests/Core/Detector/DetectorBuilderTests.cpp +++ b/Tests/UnitTests/Core/Detector/DetectorBuilderTests.cpp @@ -20,7 +20,7 @@ #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Geometry/GeometryIdentifier.hpp" #include "Acts/Navigation/DetectorVolumeFinders.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Surfaces/PlaneSurface.hpp" #include "Acts/Surfaces/RectangleBounds.hpp" #include "Acts/Surfaces/Surface.hpp" diff --git a/Tests/UnitTests/Core/Detector/DetectorTests.cpp b/Tests/UnitTests/Core/Detector/DetectorTests.cpp index cbb821a9c71..840847958e6 100644 --- a/Tests/UnitTests/Core/Detector/DetectorTests.cpp +++ b/Tests/UnitTests/Core/Detector/DetectorTests.cpp @@ -19,7 +19,7 @@ #include "Acts/Navigation/DetectorVolumeFinders.hpp" #include "Acts/Navigation/NavigationDelegates.hpp" #include "Acts/Navigation/NavigationState.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Surfaces/CylinderBounds.hpp" #include "Acts/Tests/CommonHelpers/DetectorElementStub.hpp" @@ -127,7 +127,7 @@ BOOST_AUTO_TEST_CASE(DetectorConstruction) { BOOST_CHECK_EQUAL(findNull, nullptr); // Misconfigured - unkonnected finder - Acts::Experimental::DetectorVolumeUpdator unconnected; + Acts::Experimental::DetectorVolumeUpdater unconnected; BOOST_CHECK_THROW( Acts::Experimental::Detector::makeShared("Det012_unconnected", volumes012, std::move(unconnected)), diff --git a/Tests/UnitTests/Core/Detector/DetectorVolumeBuilderTests.cpp b/Tests/UnitTests/Core/Detector/DetectorVolumeBuilderTests.cpp index c82125b98b9..68b2e7a7328 100644 --- a/Tests/UnitTests/Core/Detector/DetectorVolumeBuilderTests.cpp +++ b/Tests/UnitTests/Core/Detector/DetectorVolumeBuilderTests.cpp @@ -20,7 +20,7 @@ #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Geometry/GeometryIdentifier.hpp" #include "Acts/Navigation/DetectorVolumeFinders.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Surfaces/CylinderBounds.hpp" #include "Acts/Surfaces/CylinderSurface.hpp" #include "Acts/Surfaces/Surface.hpp" diff --git a/Tests/UnitTests/Core/Detector/DetectorVolumeTests.cpp b/Tests/UnitTests/Core/Detector/DetectorVolumeTests.cpp index 4ce2f52e3f5..6c7b0ad91ce 100644 --- a/Tests/UnitTests/Core/Detector/DetectorVolumeTests.cpp +++ b/Tests/UnitTests/Core/Detector/DetectorVolumeTests.cpp @@ -18,7 +18,7 @@ #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Navigation/DetectorVolumeFinders.hpp" #include "Acts/Navigation/NavigationState.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Surfaces/CylinderBounds.hpp" #include "Acts/Surfaces/CylinderSurface.hpp" #include "Acts/Surfaces/Surface.hpp" diff --git a/Tests/UnitTests/Core/Detector/GeometryIdGeneratorTests.cpp b/Tests/UnitTests/Core/Detector/GeometryIdGeneratorTests.cpp index 89b2ea7d5e2..3f1ae0c59b1 100644 --- a/Tests/UnitTests/Core/Detector/GeometryIdGeneratorTests.cpp +++ b/Tests/UnitTests/Core/Detector/GeometryIdGeneratorTests.cpp @@ -16,7 +16,7 @@ #include "Acts/Geometry/CylinderVolumeBounds.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Navigation/DetectorVolumeFinders.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Surfaces/CylinderSurface.hpp" #include "Acts/Tests/CommonHelpers/DetectorElementStub.hpp" #include "Acts/Utilities/Enumerate.hpp" diff --git a/Tests/UnitTests/Core/Detector/IndexedRootVolumeFinderBuilderTests.cpp b/Tests/UnitTests/Core/Detector/IndexedRootVolumeFinderBuilderTests.cpp index 825b24b8d04..7aaeed47c7a 100644 --- a/Tests/UnitTests/Core/Detector/IndexedRootVolumeFinderBuilderTests.cpp +++ b/Tests/UnitTests/Core/Detector/IndexedRootVolumeFinderBuilderTests.cpp @@ -15,8 +15,8 @@ #include "Acts/Geometry/CylinderVolumeBounds.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Navigation/DetectorVolumeFinders.hpp" -#include "Acts/Navigation/DetectorVolumeUpdators.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/DetectorVolumeUpdaters.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Utilities/Logger.hpp" using namespace Acts; diff --git a/Tests/UnitTests/Core/Detector/IndexedSurfaceGridFillerTests.cpp b/Tests/UnitTests/Core/Detector/IndexedSurfaceGridFillerTests.cpp index bfaa54a6609..9aacad07fb4 100644 --- a/Tests/UnitTests/Core/Detector/IndexedSurfaceGridFillerTests.cpp +++ b/Tests/UnitTests/Core/Detector/IndexedSurfaceGridFillerTests.cpp @@ -12,8 +12,8 @@ #include "Acts/Detector/detail/IndexedGridFiller.hpp" #include "Acts/Detector/detail/ReferenceGenerators.hpp" #include "Acts/Geometry/GeometryContext.hpp" -#include "Acts/Navigation/NavigationStateUpdators.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/NavigationStateUpdaters.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Surfaces/CylinderBounds.hpp" #include "Acts/Surfaces/CylinderSurface.hpp" #include "Acts/Surfaces/PlaneSurface.hpp" diff --git a/Tests/UnitTests/Core/Detector/IndexedSurfacesGeneratorTests.cpp b/Tests/UnitTests/Core/Detector/IndexedSurfacesGeneratorTests.cpp index 7a7b570bd58..e1ed1e5f393 100644 --- a/Tests/UnitTests/Core/Detector/IndexedSurfacesGeneratorTests.cpp +++ b/Tests/UnitTests/Core/Detector/IndexedSurfacesGeneratorTests.cpp @@ -15,8 +15,8 @@ #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Geometry/LayerCreator.hpp" #include "Acts/Navigation/NavigationDelegates.hpp" -#include "Acts/Navigation/NavigationStateUpdators.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/NavigationStateUpdaters.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Surfaces/DiscSurface.hpp" #include "Acts/Surfaces/RadialBounds.hpp" #include "Acts/Surfaces/Surface.hpp" @@ -69,9 +69,9 @@ BOOST_AUTO_TEST_CASE(RingDisc1D) { BOOST_REQUIRE_NE(castedDelegate, nullptr); - const auto& chainedUpdators = castedDelegate->updators; + const auto& chainedUpdaters = castedDelegate->updators; const auto& indexedSurfaces = - std::get>(chainedUpdators); + std::get>(chainedUpdaters); const auto& grid = indexedSurfaces.grid; // Check that surfaces 10, 11, 12 build the bins at phi == 0 @@ -115,9 +115,9 @@ BOOST_AUTO_TEST_CASE(RingDisc1DWithSupport) { BOOST_REQUIRE_NE(castedDelegate, nullptr); - const auto& chainedUpdators = castedDelegate->updators; + const auto& chainedUpdaters = castedDelegate->updators; const auto& indexedSurfaces = - std::get>(chainedUpdators); + std::get>(chainedUpdaters); const auto& grid = indexedSurfaces.grid; // Check that surfaces 10, 11, 12 build the bins at phi == 0 @@ -163,9 +163,9 @@ BOOST_AUTO_TEST_CASE(RingDisc2D) { BOOST_REQUIRE_NE(castedDelegate, nullptr); - const auto& chainedUpdators = castedDelegate->updators; + const auto& chainedUpdaters = castedDelegate->updators; const auto& indexedSurfaces = - std::get>(chainedUpdators); + std::get>(chainedUpdaters); const auto& grid = indexedSurfaces.grid; // Check that now two rows of surfaces are given @@ -210,9 +210,9 @@ BOOST_AUTO_TEST_CASE(RingDisc2DFine) { BOOST_REQUIRE_NE(castedDelegate, nullptr); - const auto& chainedUpdators = castedDelegate->updators; + const auto& chainedUpdaters = castedDelegate->updators; const auto& indexedSurfaces = - std::get>(chainedUpdators); + std::get>(chainedUpdaters); const auto& grid = indexedSurfaces.grid; // Fine binning created fewer candidates @@ -255,9 +255,9 @@ BOOST_AUTO_TEST_CASE(RingDisc2DFineExpanded) { BOOST_REQUIRE_NE(castedDelegate, nullptr); - const auto& chainedUpdators = castedDelegate->updators; + const auto& chainedUpdaters = castedDelegate->updators; const auto& indexedSurfaces = - std::get>(chainedUpdators); + std::get>(chainedUpdaters); const auto& grid = indexedSurfaces.grid; // Bin expansion created again more elements @@ -289,9 +289,9 @@ BOOST_AUTO_TEST_CASE(Cylinder2D) { BOOST_REQUIRE_NE(castedDelegate, nullptr); - const auto& chainedUpdators = castedDelegate->updators; + const auto& chainedUpdaters = castedDelegate->updators; const auto& indexedSurfaces = - std::get>(chainedUpdators); + std::get>(chainedUpdaters); const auto& grid = indexedSurfaces.grid; // Bin expansion created again more elements diff --git a/Tests/UnitTests/Core/Detector/LayerStructureBuilderTests.cpp b/Tests/UnitTests/Core/Detector/LayerStructureBuilderTests.cpp index 73aca4d07b6..9cb0f4d3444 100644 --- a/Tests/UnitTests/Core/Detector/LayerStructureBuilderTests.cpp +++ b/Tests/UnitTests/Core/Detector/LayerStructureBuilderTests.cpp @@ -73,13 +73,13 @@ BOOST_AUTO_TEST_CASE(LayerStructureBuilder_creationRing) { auto endcapBuilder = Acts::Experimental::LayerStructureBuilder( lsConfig, Acts::getDefaultLogger("EndcapBuilder", Logging::VERBOSE)); - auto [surfaces0, volumes0, surfacesUpdator0, volumeUpdator0] = + auto [surfaces0, volumes0, surfacesUpdater0, volumeUpdater0] = endcapBuilder.construct(tContext); BOOST_CHECK_EQUAL(surfaces0.size(), 22u); - BOOST_CHECK(surfacesUpdator0.connected()); + BOOST_CHECK(surfacesUpdater0.connected()); BOOST_CHECK(volumes0.empty()); - BOOST_CHECK(volumeUpdator0.connected()); + BOOST_CHECK(volumeUpdater0.connected()); using LayerSupport = Acts::Experimental::ProtoSupport; @@ -89,14 +89,14 @@ BOOST_AUTO_TEST_CASE(LayerStructureBuilder_creationRing) { endcapBuilder = Acts::Experimental::LayerStructureBuilder( lsConfig, Acts::getDefaultLogger("EndcapBuilder", Logging::VERBOSE)); - auto [surfaces1, volumes1, surfacesUpdator1, volumeUpdator1] = + auto [surfaces1, volumes1, surfacesUpdater1, volumeUpdater1] = endcapBuilder.construct(tContext); BOOST_CHECK_EQUAL(surfaces1.size(), 22u + 1u); BOOST_CHECK_EQUAL(surfaces1.back()->type(), Acts::Surface::SurfaceType::Disc); - BOOST_CHECK(surfacesUpdator1.connected()); + BOOST_CHECK(surfacesUpdater1.connected()); BOOST_CHECK(volumes1.empty()); - BOOST_CHECK(volumeUpdator1.connected()); + BOOST_CHECK(volumeUpdater1.connected()); lsConfig.auxiliary = "*** Endcap with 22 surfaces + 1 support -> split into 11 planes ***"; @@ -107,15 +107,15 @@ BOOST_AUTO_TEST_CASE(LayerStructureBuilder_creationRing) { endcapBuilder = Acts::Experimental::LayerStructureBuilder( lsConfig, Acts::getDefaultLogger("EndcapBuilder", Logging::VERBOSE)); - auto [surfaces2, volumes2, surfacesUpdator2, volumeUpdator2] = + auto [surfaces2, volumes2, surfacesUpdater2, volumeUpdater2] = endcapBuilder.construct(tContext); BOOST_CHECK_EQUAL(surfaces2.size(), 22u + 11u); BOOST_CHECK_EQUAL(surfaces2.back()->type(), Acts::Surface::SurfaceType::Plane); - BOOST_CHECK(surfacesUpdator2.connected()); + BOOST_CHECK(surfacesUpdater2.connected()); BOOST_CHECK(volumes2.empty()); - BOOST_CHECK(volumeUpdator2.connected()); + BOOST_CHECK(volumeUpdater2.connected()); } // Test the creation of a cylindrical structure @@ -141,13 +141,13 @@ BOOST_AUTO_TEST_CASE(LayerStructureBuilder_creationCylinder) { auto barrelBuilder = Acts::Experimental::LayerStructureBuilder( lsConfig, Acts::getDefaultLogger("BarrelBuilder", Logging::VERBOSE)); - auto [surfaces0, volumes0, surfacesUpdator0, volumeUpdator0] = + auto [surfaces0, volumes0, surfacesUpdater0, volumeUpdater0] = barrelBuilder.construct(tContext); BOOST_CHECK_EQUAL(surfaces0.size(), 448u); - BOOST_CHECK(surfacesUpdator0.connected()); + BOOST_CHECK(surfacesUpdater0.connected()); BOOST_CHECK(volumes0.empty()); - BOOST_CHECK(volumeUpdator0.connected()); + BOOST_CHECK(volumeUpdater0.connected()); using LayerSupport = Acts::Experimental::ProtoSupport; @@ -159,13 +159,13 @@ BOOST_AUTO_TEST_CASE(LayerStructureBuilder_creationCylinder) { barrelBuilder = Acts::Experimental::LayerStructureBuilder( lsConfig, Acts::getDefaultLogger("BarrelBuilder", Logging::VERBOSE)); - auto [surfaces1, volumes1, surfacesUpdator1, volumeUpdator1] = + auto [surfaces1, volumes1, surfacesUpdater1, volumeUpdater1] = barrelBuilder.construct(tContext); BOOST_CHECK_EQUAL(surfaces1.size(), 448u + 1u); - BOOST_CHECK(surfacesUpdator1.connected()); + BOOST_CHECK(surfacesUpdater1.connected()); BOOST_CHECK(volumes1.empty()); - BOOST_CHECK(volumeUpdator1.connected()); + BOOST_CHECK(volumeUpdater1.connected()); lsConfig.auxiliary = "*** Barrel with 448 surfaces + 1 support -> split into 32 planes ***"; @@ -177,13 +177,13 @@ BOOST_AUTO_TEST_CASE(LayerStructureBuilder_creationCylinder) { barrelBuilder = Acts::Experimental::LayerStructureBuilder( lsConfig, Acts::getDefaultLogger("BarrelBuilder", Logging::VERBOSE)); - auto [surfaces2, volumes2, surfacesUpdator2, volumeUpdator2] = + auto [surfaces2, volumes2, surfacesUpdater2, volumeUpdater2] = barrelBuilder.construct(tContext); BOOST_CHECK_EQUAL(surfaces2.size(), 448u + 32u); - BOOST_CHECK(surfacesUpdator2.connected()); + BOOST_CHECK(surfacesUpdater2.connected()); BOOST_CHECK(volumes2.empty()); - BOOST_CHECK(volumeUpdator2.connected()); + BOOST_CHECK(volumeUpdater2.connected()); } BOOST_AUTO_TEST_SUITE_END() diff --git a/Tests/UnitTests/Core/Detector/MultiWireStructureBuilderTests.cpp b/Tests/UnitTests/Core/Detector/MultiWireStructureBuilderTests.cpp index b6d9d2a44d1..e784703a77c 100644 --- a/Tests/UnitTests/Core/Detector/MultiWireStructureBuilderTests.cpp +++ b/Tests/UnitTests/Core/Detector/MultiWireStructureBuilderTests.cpp @@ -83,7 +83,7 @@ BOOST_AUTO_TEST_CASE(Multi_Wire_Structure_Builder_StrawSurfacesCreation) { BOOST_CHECK_EQUAL(volumes.front()->surfaces().size(), nSurfacesX * nSurfacesY); BOOST_CHECK(volumes.front()->volumes().empty()); - BOOST_CHECK(volumes.front()->surfaceCandidatesUpdator().connected()); + BOOST_CHECK(volumes.front()->surfaceCandidatesUpdater().connected()); } BOOST_AUTO_TEST_SUITE_END() diff --git a/Tests/UnitTests/Core/Detector/PortalGeneratorsTests.cpp b/Tests/UnitTests/Core/Detector/PortalGeneratorsTests.cpp index 718ef275d75..4f4403de8b5 100644 --- a/Tests/UnitTests/Core/Detector/PortalGeneratorsTests.cpp +++ b/Tests/UnitTests/Core/Detector/PortalGeneratorsTests.cpp @@ -16,7 +16,7 @@ #include "Acts/Geometry/CylinderVolumeBounds.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Navigation/NavigationState.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include #include diff --git a/Tests/UnitTests/Core/Detector/PortalTests.cpp b/Tests/UnitTests/Core/Detector/PortalTests.cpp index c7ad9ba2362..265ca1a6421 100644 --- a/Tests/UnitTests/Core/Detector/PortalTests.cpp +++ b/Tests/UnitTests/Core/Detector/PortalTests.cpp @@ -20,7 +20,7 @@ #include "Acts/Material/MaterialSlab.hpp" #include "Acts/Navigation/NavigationDelegates.hpp" #include "Acts/Navigation/NavigationState.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Surfaces/PlaneSurface.hpp" #include "Acts/Surfaces/RectangleBounds.hpp" #include "Acts/Surfaces/Surface.hpp" @@ -103,9 +103,9 @@ BOOST_AUTO_TEST_CASE(PortalTest) { // Create a links to volumes auto linkToAImpl = std::make_unique(volumeA); - DetectorVolumeUpdator linkToA; + DetectorVolumeUpdater linkToA; linkToA.connect<&LinkToVolumeImpl::link>(std::move(linkToAImpl)); - portalA->assignDetectorVolumeUpdator(Acts::Direction::Positive, + portalA->assignDetectorVolumeUpdater(Acts::Direction::Positive, std::move(linkToA), {volumeA}); auto attachedDetectorVolumes = portalA->attachedDetectorVolumes(); @@ -125,10 +125,10 @@ BOOST_AUTO_TEST_CASE(PortalTest) { BOOST_CHECK_EQUAL(nState.currentVolume, nullptr); auto portalB = Portal::makeShared(surface); - DetectorVolumeUpdator linkToB; + DetectorVolumeUpdater linkToB; auto linkToBImpl = std::make_unique(volumeB); linkToB.connect<&LinkToVolumeImpl::link>(std::move(linkToBImpl)); - portalB->assignDetectorVolumeUpdator(Acts::Direction::Negative, + portalB->assignDetectorVolumeUpdater(Acts::Direction::Negative, std::move(linkToB), {volumeB}); // Reverse: positive volume nullptr, negative volume volumeB @@ -156,15 +156,15 @@ BOOST_AUTO_TEST_CASE(PortalTest) { auto linkToBIImpl = std::make_unique(volumeB); auto portalAI = Portal::makeShared(surface); - DetectorVolumeUpdator linkToAI; + DetectorVolumeUpdater linkToAI; linkToAI.connect<&LinkToVolumeImpl::link>(std::move(linkToAIImpl)); - portalAI->assignDetectorVolumeUpdator(Acts::Direction::Positive, + portalAI->assignDetectorVolumeUpdater(Acts::Direction::Positive, std::move(linkToAI), {volumeA}); auto portalBI = Portal::makeShared(surface); - DetectorVolumeUpdator linkToBI; + DetectorVolumeUpdater linkToBI; linkToBI.connect<&LinkToVolumeImpl::link>(std::move(linkToBIImpl)); - portalBI->assignDetectorVolumeUpdator(Acts::Direction::Positive, + portalBI->assignDetectorVolumeUpdater(Acts::Direction::Positive, std::move(linkToBI), {volumeB}); BOOST_CHECK_THROW(portalAI->fuse(portalBI), std::runtime_error); @@ -199,19 +199,19 @@ BOOST_AUTO_TEST_CASE(PortalMaterialTest) { surfaceA->assignSurfaceMaterial(materialA); auto portalA = Acts::Experimental::Portal::makeShared(surfaceA); - DetectorVolumeUpdator linkToA; + DetectorVolumeUpdater linkToA; auto linkToAImpl = std::make_unique(volumeA); linkToA.connect<&LinkToVolumeImpl::link>(std::move(linkToAImpl)); - portalA->assignDetectorVolumeUpdator(Acts::Direction::Positive, + portalA->assignDetectorVolumeUpdater(Acts::Direction::Positive, std::move(linkToA), {volumeA}); auto surfaceB = Acts::Surface::makeShared( Acts::Transform3::Identity(), rectangle); auto portalB = Acts::Experimental::Portal::makeShared(surfaceB); - DetectorVolumeUpdator linkToB; + DetectorVolumeUpdater linkToB; auto linkToBImpl = std::make_unique(volumeB); linkToB.connect<&LinkToVolumeImpl::link>(std::move(linkToBImpl)); - portalB->assignDetectorVolumeUpdator(Acts::Direction::Negative, + portalB->assignDetectorVolumeUpdater(Acts::Direction::Negative, std::move(linkToB), {volumeB}); // Portal A fuses with B @@ -222,10 +222,10 @@ BOOST_AUTO_TEST_CASE(PortalMaterialTest) { // Remake portal B portalB = Acts::Experimental::Portal::makeShared(surfaceB); - DetectorVolumeUpdator linkToB2; + DetectorVolumeUpdater linkToB2; auto linkToB2Impl = std::make_unique(volumeB); linkToB2.connect<&LinkToVolumeImpl::link>(std::move(linkToB2Impl)); - portalB->assignDetectorVolumeUpdator(Acts::Direction::Negative, + portalB->assignDetectorVolumeUpdater(Acts::Direction::Negative, std::move(linkToB2), {volumeB}); // Portal B fuses with A @@ -237,18 +237,18 @@ BOOST_AUTO_TEST_CASE(PortalMaterialTest) { // Remake portal A and B, this time both with material portalA = Acts::Experimental::Portal::makeShared(surfaceA); - DetectorVolumeUpdator linkToA2; + DetectorVolumeUpdater linkToA2; auto linkToA2Impl = std::make_unique(volumeA); linkToA2.connect<&LinkToVolumeImpl::link>(std::move(linkToA2Impl)); - portalA->assignDetectorVolumeUpdator(Acts::Direction::Positive, + portalA->assignDetectorVolumeUpdater(Acts::Direction::Positive, std::move(linkToA2), {volumeA}); surfaceB->assignSurfaceMaterial(materialB); portalB = Acts::Experimental::Portal::makeShared(surfaceB); - DetectorVolumeUpdator linkToB3; + DetectorVolumeUpdater linkToB3; auto linkToB3Impl = std::make_unique(volumeB); linkToB3.connect<&LinkToVolumeImpl::link>(std::move(linkToB3Impl)); - portalB->assignDetectorVolumeUpdator(Acts::Direction::Negative, + portalB->assignDetectorVolumeUpdater(Acts::Direction::Negative, std::move(linkToB3), {volumeB}); // Portal A fuses with B - both have material, throw exception diff --git a/Tests/UnitTests/Core/Navigation/CMakeLists.txt b/Tests/UnitTests/Core/Navigation/CMakeLists.txt index c75f1b40298..7c045ff1d06 100644 --- a/Tests/UnitTests/Core/Navigation/CMakeLists.txt +++ b/Tests/UnitTests/Core/Navigation/CMakeLists.txt @@ -1,7 +1,7 @@ -add_unittest(DetectorVolumeUpdators DetectorVolumeUpdatorsTests.cpp) +add_unittest(DetectorVolumeUpdaters DetectorVolumeUpdatersTests.cpp) add_unittest(DetectorVolumeFinders DetectorVolumeFindersTests.cpp) add_unittest(NavigationState NavigationStateTests.cpp) -add_unittest(NavigationStateUpdators NavigationStateUpdatorsTests.cpp) +add_unittest(NavigationStateUpdaters NavigationStateUpdatersTests.cpp) add_unittest(DetectorNavigator DetectorNavigatorTests.cpp) add_unittest(MultiWireNavigation MultiWireNavigationTests.cpp) diff --git a/Tests/UnitTests/Core/Navigation/DetectorNavigatorTests.cpp b/Tests/UnitTests/Core/Navigation/DetectorNavigatorTests.cpp index 45b5b2d710d..3f51555959e 100644 --- a/Tests/UnitTests/Core/Navigation/DetectorNavigatorTests.cpp +++ b/Tests/UnitTests/Core/Navigation/DetectorNavigatorTests.cpp @@ -21,7 +21,7 @@ #include "Acts/MagneticField/MagneticFieldContext.hpp" #include "Acts/Navigation/DetectorNavigator.hpp" #include "Acts/Navigation/DetectorVolumeFinders.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Propagator/AbortList.hpp" #include "Acts/Propagator/ActionList.hpp" #include "Acts/Propagator/EigenStepper.hpp" diff --git a/Tests/UnitTests/Core/Navigation/DetectorVolumeFindersTests.cpp b/Tests/UnitTests/Core/Navigation/DetectorVolumeFindersTests.cpp index 9277fcd92e3..b2a8b563849 100644 --- a/Tests/UnitTests/Core/Navigation/DetectorVolumeFindersTests.cpp +++ b/Tests/UnitTests/Core/Navigation/DetectorVolumeFindersTests.cpp @@ -16,7 +16,7 @@ #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Navigation/DetectorVolumeFinders.hpp" #include "Acts/Navigation/NavigationState.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Utilities/BinningType.hpp" #include "Acts/Utilities/Grid.hpp" #include "Acts/Utilities/detail/Axis.hpp" diff --git a/Tests/UnitTests/Core/Navigation/DetectorVolumeUpdatorsTests.cpp b/Tests/UnitTests/Core/Navigation/DetectorVolumeUpdatersTests.cpp similarity index 95% rename from Tests/UnitTests/Core/Navigation/DetectorVolumeUpdatorsTests.cpp rename to Tests/UnitTests/Core/Navigation/DetectorVolumeUpdatersTests.cpp index b2e7a7af8b2..c6e8963333b 100644 --- a/Tests/UnitTests/Core/Navigation/DetectorVolumeUpdatorsTests.cpp +++ b/Tests/UnitTests/Core/Navigation/DetectorVolumeUpdatersTests.cpp @@ -10,7 +10,7 @@ #include "Acts/Definitions/Algebra.hpp" #include "Acts/Geometry/GeometryContext.hpp" -#include "Acts/Navigation/DetectorVolumeUpdators.hpp" +#include "Acts/Navigation/DetectorVolumeUpdaters.hpp" #include "Acts/Navigation/NavigationDelegates.hpp" #include "Acts/Navigation/NavigationState.hpp" #include "Acts/Utilities/BinningType.hpp" @@ -42,8 +42,8 @@ BOOST_AUTO_TEST_SUITE(Experimental) // NavigaitonState according to some given information. // BOOST_AUTO_TEST_CASE(UnconnectedUpdate) { - Acts::Experimental::DetectorVolumeUpdator ucUpdator; - BOOST_CHECK(!ucUpdator.connected()); + Acts::Experimental::DetectorVolumeUpdater ucUpdater; + BOOST_CHECK(!ucUpdater.connected()); } // The end of world is reached diff --git a/Tests/UnitTests/Core/Navigation/MultiWireNavigationTests.cpp b/Tests/UnitTests/Core/Navigation/MultiWireNavigationTests.cpp index e5a59480158..9b2b8e048ef 100644 --- a/Tests/UnitTests/Core/Navigation/MultiWireNavigationTests.cpp +++ b/Tests/UnitTests/Core/Navigation/MultiWireNavigationTests.cpp @@ -15,8 +15,8 @@ #include "Acts/Navigation/DetectorVolumeFinders.hpp" #include "Acts/Navigation/NavigationState.hpp" #include "Acts/Navigation/NavigationStateFillers.hpp" -#include "Acts/Navigation/NavigationStateUpdators.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/NavigationStateUpdaters.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Surfaces/RectangleBounds.hpp" #include "Acts/Surfaces/StrawSurface.hpp" #include "Acts/Surfaces/Surface.hpp" diff --git a/Tests/UnitTests/Core/Navigation/NavigationStateUpdatorsTests.cpp b/Tests/UnitTests/Core/Navigation/NavigationStateUpdatersTests.cpp similarity index 94% rename from Tests/UnitTests/Core/Navigation/NavigationStateUpdatorsTests.cpp rename to Tests/UnitTests/Core/Navigation/NavigationStateUpdatersTests.cpp index 0f9dd5e922e..9a55a0364c8 100644 --- a/Tests/UnitTests/Core/Navigation/NavigationStateUpdatorsTests.cpp +++ b/Tests/UnitTests/Core/Navigation/NavigationStateUpdatersTests.cpp @@ -12,7 +12,7 @@ #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Navigation/NavigationState.hpp" #include "Acts/Navigation/NavigationStateFillers.hpp" -#include "Acts/Navigation/NavigationStateUpdators.hpp" +#include "Acts/Navigation/NavigationStateUpdaters.hpp" #include "Acts/Utilities/BinningType.hpp" #include "Acts/Utilities/IAxis.hpp" #include "Acts/Utilities/detail/AxisFwd.hpp" @@ -159,15 +159,15 @@ class MultiGrid2D { }; } // namespace Acts -using SingleVolumeUpdator = Acts::Experimental::SingleObjectImpl< +using SingleVolumeUpdater = Acts::Experimental::SingleObjectImpl< Acts::Experimental::DetectorVolume, Acts::Experimental::DetectorVolumeFiller>; -using AllSurfacesProvider = Acts::Experimental::StaticUpdatorImpl< +using AllSurfacesProvider = Acts::Experimental::StaticUpdaterImpl< Acts::Experimental::AllSurfacesExtractor, Acts::Experimental::SurfacesFiller>; -using AllPortalsProvider = Acts::Experimental::StaticUpdatorImpl< +using AllPortalsProvider = Acts::Experimental::StaticUpdaterImpl< Acts::Experimental::AllPortalsExtractor, Acts::Experimental::PortalsFiller>; auto surfaceA = Acts::Surface::makeShared(); @@ -181,15 +181,15 @@ auto portalB = Acts::Experimental::Portal::makeShared(pSurfaceB); BOOST_AUTO_TEST_SUITE(Experimental) -BOOST_AUTO_TEST_CASE(SingleDetectorVolumeUpdator) { +BOOST_AUTO_TEST_CASE(SingleDetectorVolumeUpdater) { Acts::Experimental::NavigationState nState; // Create a single object and a single object updator auto sVolume = std::make_shared(); - SingleVolumeUpdator sVolumeUpdator(sVolume.get()); + SingleVolumeUpdater sVolumeUpdater(sVolume.get()); // Update the volume and check that it is indeed updated - sVolumeUpdator.update(tContext, nState); + sVolumeUpdater.update(tContext, nState); BOOST_CHECK_EQUAL(nState.currentVolume, sVolume.get()); } @@ -234,7 +234,7 @@ BOOST_AUTO_TEST_CASE(AllPortalsAllSurfaces) { AllPortalsProvider allPortals; AllSurfacesProvider allSurfaces; auto allPortalsAllSurfaces = - Acts::Experimental::ChainedUpdatorImpl( std::tie(allPortals, allSurfaces)); @@ -254,13 +254,13 @@ BOOST_AUTO_TEST_CASE(AllPortalsGrid1DSurfaces) { AllPortalsProvider allPortals; Acts::MultiGrid1D grid; - using Grid1DSurfacesProvider = Acts::Experimental::IndexedUpdatorImpl< + using Grid1DSurfacesProvider = Acts::Experimental::IndexedUpdaterImpl< decltype(grid), Acts::Experimental::IndexedSurfacesExtractor, Acts::Experimental::SurfacesFiller>; auto grid1DSurfaces = Grid1DSurfacesProvider(std::move(grid), {Acts::binR}); auto allPortalsGrid1DSurfaces = - Acts::Experimental::ChainedUpdatorImpl( std::tie(allPortals, grid1DSurfaces)); @@ -280,14 +280,14 @@ BOOST_AUTO_TEST_CASE(AllPortalsGrid2DSurfaces) { AllPortalsProvider allPortals; Acts::MultiGrid2D grid; - using Grid2DSurfacesProvider = Acts::Experimental::IndexedUpdatorImpl< + using Grid2DSurfacesProvider = Acts::Experimental::IndexedUpdaterImpl< decltype(grid), Acts::Experimental::IndexedSurfacesExtractor, Acts::Experimental::SurfacesFiller>; auto grid2DSurfaces = Grid2DSurfacesProvider(std::move(grid), {Acts::binR, Acts::binZ}); auto allPortalsGrid2DSurfaces = - Acts::Experimental::ChainedUpdatorImpl( std::tie(allPortals, grid2DSurfaces)); diff --git a/Tests/UnitTests/Plugins/ActSVG/DetectorSvgConverterTests.cpp b/Tests/UnitTests/Plugins/ActSVG/DetectorSvgConverterTests.cpp index 3ff15e98348..ba3c463823d 100644 --- a/Tests/UnitTests/Plugins/ActSVG/DetectorSvgConverterTests.cpp +++ b/Tests/UnitTests/Plugins/ActSVG/DetectorSvgConverterTests.cpp @@ -20,7 +20,7 @@ #include "Acts/Geometry/CylinderVolumeBounds.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Navigation/DetectorVolumeFinders.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Plugins/ActSVG/DetectorSvgConverter.hpp" #include "Acts/Surfaces/CylinderBounds.hpp" #include "Acts/Surfaces/CylinderSurface.hpp" diff --git a/Tests/UnitTests/Plugins/ActSVG/DetectorVolumeSvgConverterTests.cpp b/Tests/UnitTests/Plugins/ActSVG/DetectorVolumeSvgConverterTests.cpp index ff819005397..b268f8e2883 100644 --- a/Tests/UnitTests/Plugins/ActSVG/DetectorVolumeSvgConverterTests.cpp +++ b/Tests/UnitTests/Plugins/ActSVG/DetectorVolumeSvgConverterTests.cpp @@ -15,8 +15,8 @@ #include "Acts/Detector/VolumeStructureBuilder.hpp" #include "Acts/Geometry/CylinderVolumeBounds.hpp" #include "Acts/Geometry/GeometryContext.hpp" -#include "Acts/Navigation/NavigationStateUpdators.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/NavigationStateUpdaters.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Plugins/ActSVG/DetectorVolumeSvgConverter.hpp" #include "Acts/Plugins/ActSVG/IndexedSurfacesSvgConverter.hpp" #include "Acts/Tests/CommonHelpers/CylindricalTrackingGeometry.hpp" diff --git a/Tests/UnitTests/Plugins/ActSVG/PortalSvgConverterTests.cpp b/Tests/UnitTests/Plugins/ActSVG/PortalSvgConverterTests.cpp index 3bd86c3caa8..97110ef0026 100644 --- a/Tests/UnitTests/Plugins/ActSVG/PortalSvgConverterTests.cpp +++ b/Tests/UnitTests/Plugins/ActSVG/PortalSvgConverterTests.cpp @@ -13,7 +13,7 @@ #include "Acts/Detector/PortalGenerators.hpp" #include "Acts/Detector/detail/CylindricalDetectorHelper.hpp" #include "Acts/Geometry/CylinderVolumeBounds.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Plugins/ActSVG/PortalSvgConverter.hpp" #include "Acts/Plugins/ActSVG/SvgUtils.hpp" #include "Acts/Utilities/Enumerate.hpp" diff --git a/Tests/UnitTests/Plugins/DD4hep/DD4hepCylinderLayerStructureTests.cpp b/Tests/UnitTests/Plugins/DD4hep/DD4hepCylinderLayerStructureTests.cpp index 9913af47600..df75ef15e28 100644 --- a/Tests/UnitTests/Plugins/DD4hep/DD4hepCylinderLayerStructureTests.cpp +++ b/Tests/UnitTests/Plugins/DD4hep/DD4hepCylinderLayerStructureTests.cpp @@ -110,7 +110,7 @@ BOOST_AUTO_TEST_CASE(DD4hepPluginBeampipeStructure) { BOOST_CHECK(beamPipeExt == std::nullopt); // Build the internal volume structure - auto [surfaces, volumes, surfacesUpdator, volumeUpdator] = + auto [surfaces, volumes, surfacesUpdater, volumeUpdater] = beamPipeInternalsBuilder->construct(tContext); // All surfaces are filled @@ -118,16 +118,16 @@ BOOST_AUTO_TEST_CASE(DD4hepPluginBeampipeStructure) { // No volumes are added BOOST_CHECK(volumes.empty()); // The surface updator is connected - BOOST_CHECK(surfacesUpdator.connected()); + BOOST_CHECK(surfacesUpdater.connected()); // The volume updator is connected - BOOST_CHECK(volumeUpdator.connected()); + BOOST_CHECK(volumeUpdater.connected()); // Kill that instance before going into the next test lcdd->destroyInstance(); } // This test creates DD4hep xml compact files for cylindrical -// layer structures and then converts them into IndexedSurfacesUpdator +// layer structures and then converts them into IndexedSurfacesUpdater // and other additional components needed for Internal DetectorVolume // structure. // @@ -228,7 +228,7 @@ BOOST_AUTO_TEST_CASE(DD4hepPluginCylinderLayerStructure) { barrelStructure.builder(dd4hepStore, tContext, world, lsOptions); // Build the internal volume structure - auto [surfaces, volumes, surfacesUpdator, volumeUpdator] = + auto [surfaces, volumes, surfacesUpdater, volumeUpdater] = barrelInternalsBuilder->construct(tContext); // All surfaces are filled @@ -236,9 +236,9 @@ BOOST_AUTO_TEST_CASE(DD4hepPluginCylinderLayerStructure) { // No volumes are added BOOST_CHECK(volumes.empty()); // The surface updator is connected - BOOST_CHECK(surfacesUpdator.connected()); + BOOST_CHECK(surfacesUpdater.connected()); // The volume updator is connected - BOOST_CHECK(volumeUpdator.connected()); + BOOST_CHECK(volumeUpdater.connected()); // Kill that instance before going into the next test lcdd->destroyInstance(); diff --git a/Tests/UnitTests/Plugins/DD4hep/DD4hepDiscLayerStructureTests.cpp b/Tests/UnitTests/Plugins/DD4hep/DD4hepDiscLayerStructureTests.cpp index 8cd05cbf9f4..504691d496f 100644 --- a/Tests/UnitTests/Plugins/DD4hep/DD4hepDiscLayerStructureTests.cpp +++ b/Tests/UnitTests/Plugins/DD4hep/DD4hepDiscLayerStructureTests.cpp @@ -159,7 +159,7 @@ BOOST_AUTO_TEST_CASE(DD4hepDiscLayerStructure) { discStructure.builder(dd4hepStore, tContext, world, lsOptions); // Build the internal volume structure - auto [surfaces, volumes, surfacesUpdator, volumeUpdator] = + auto [surfaces, volumes, surfacesUpdater, volumeUpdater] = discInternalsBuilder->construct(tContext); // All surfaces are filled @@ -167,9 +167,9 @@ BOOST_AUTO_TEST_CASE(DD4hepDiscLayerStructure) { // No volumes are added BOOST_CHECK(volumes.empty()); // The surface updator is connected - BOOST_CHECK(surfacesUpdator.connected()); + BOOST_CHECK(surfacesUpdater.connected()); // The volume updator is connected - BOOST_CHECK(volumeUpdator.connected()); + BOOST_CHECK(volumeUpdater.connected()); // Kill that instance before going into the next test lcdd->destroyInstance(); diff --git a/Tests/UnitTests/Plugins/Json/DetectorJsonConverterTests.cpp b/Tests/UnitTests/Plugins/Json/DetectorJsonConverterTests.cpp index 4b642651fd1..fa90624dc35 100644 --- a/Tests/UnitTests/Plugins/Json/DetectorJsonConverterTests.cpp +++ b/Tests/UnitTests/Plugins/Json/DetectorJsonConverterTests.cpp @@ -21,7 +21,7 @@ #include "Acts/Geometry/CylinderVolumeBounds.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Navigation/DetectorVolumeFinders.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Plugins/Json/DetectorJsonConverter.hpp" #include "Acts/Surfaces/CylinderBounds.hpp" #include "Acts/Surfaces/CylinderSurface.hpp" diff --git a/Tests/UnitTests/Plugins/Json/DetectorVolumeFinderJsonConverterTests.cpp b/Tests/UnitTests/Plugins/Json/DetectorVolumeFinderJsonConverterTests.cpp index a7045eec67c..708a3e851b5 100644 --- a/Tests/UnitTests/Plugins/Json/DetectorVolumeFinderJsonConverterTests.cpp +++ b/Tests/UnitTests/Plugins/Json/DetectorVolumeFinderJsonConverterTests.cpp @@ -10,7 +10,7 @@ #include "Acts/Detector/detail/GridAxisGenerators.hpp" #include "Acts/Navigation/DetectorVolumeFinders.hpp" -#include "Acts/Navigation/DetectorVolumeUpdators.hpp" +#include "Acts/Navigation/DetectorVolumeUpdaters.hpp" #include "Acts/Plugins/Json/DetectorVolumeFinderJsonConverter.hpp" #include @@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE(RzVolumes) { auto casts = std::array{Acts::binZ, Acts::binR}; - using IndexedDetectorVolumesImpl = Acts::Experimental::IndexedUpdatorImpl< + using IndexedDetectorVolumesImpl = Acts::Experimental::IndexedUpdaterImpl< GridType, Acts::Experimental::IndexedDetectorVolumeExtractor, Acts::Experimental::DetectorVolumeFiller>; @@ -63,7 +63,7 @@ BOOST_AUTO_TEST_CASE(RzVolumes) { casts); // Return the root volume finder - Acts::Experimental::DetectorVolumeUpdator rootVolumeFinder; + Acts::Experimental::DetectorVolumeUpdater rootVolumeFinder; rootVolumeFinder.connect<&IndexedDetectorVolumesImpl::update>( std::move(indexedDetectorVolumesImpl)); diff --git a/Tests/UnitTests/Plugins/Json/DetectorVolumeJsonConverterTests.cpp b/Tests/UnitTests/Plugins/Json/DetectorVolumeJsonConverterTests.cpp index 86c7724c13b..2cf710fc7e8 100644 --- a/Tests/UnitTests/Plugins/Json/DetectorVolumeJsonConverterTests.cpp +++ b/Tests/UnitTests/Plugins/Json/DetectorVolumeJsonConverterTests.cpp @@ -17,7 +17,7 @@ #include "Acts/Geometry/CylinderVolumeBounds.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Navigation/DetectorVolumeFinders.hpp" -#include "Acts/Navigation/SurfaceCandidatesUpdators.hpp" +#include "Acts/Navigation/SurfaceCandidatesUpdaters.hpp" #include "Acts/Plugins/Json/DetectorVolumeJsonConverter.hpp" #include "Acts/Surfaces/CylinderBounds.hpp" #include "Acts/Surfaces/CylinderSurface.hpp" diff --git a/Tests/UnitTests/Plugins/Json/PortalJsonConverterTests.cpp b/Tests/UnitTests/Plugins/Json/PortalJsonConverterTests.cpp index affe95c7690..04f592ea4e6 100644 --- a/Tests/UnitTests/Plugins/Json/PortalJsonConverterTests.cpp +++ b/Tests/UnitTests/Plugins/Json/PortalJsonConverterTests.cpp @@ -73,9 +73,9 @@ BOOST_AUTO_TEST_CASE(PortalSingleConnected) { auto portal = Acts::Experimental::Portal::makeShared(std::move(surface)); BOOST_CHECK_NE(portal, nullptr); // Attaching the portals - Acts::Experimental::detail::PortalHelper::attachDetectorVolumeUpdator( + Acts::Experimental::detail::PortalHelper::attachDetectorVolumeUpdater( *portal, forwardVolume, Acts::Direction::Forward); - Acts::Experimental::detail::PortalHelper::attachDetectorVolumeUpdator( + Acts::Experimental::detail::PortalHelper::attachDetectorVolumeUpdater( *portal, backwardVolume, Acts::Direction::Backward); std::vector detectorVolumes = { @@ -119,10 +119,10 @@ BOOST_AUTO_TEST_CASE(PortalMultiConnected) { BOOST_CHECK_NE(portal, nullptr); // Attaching the portals - Acts::Experimental::detail::PortalHelper::attachDetectorVolumeUpdator( + Acts::Experimental::detail::PortalHelper::attachDetectorVolumeUpdater( *portal, backwardVolume, Acts::Direction::Backward); - Acts::Experimental::detail::PortalHelper::attachDetectorVolumesUpdator( + Acts::Experimental::detail::PortalHelper::attachDetectorVolumesUpdater( tContext, *portal, {forwardVolumeA, forwardVolumeB, forwardVolumeC}, Acts::Direction::Forward, {-100, 10, 20, 200}, Acts::binX); diff --git a/docs/core/geometry/layerless/layerless.md b/docs/core/geometry/layerless/layerless.md index 50ea307ce83..0debd65e2a7 100644 --- a/docs/core/geometry/layerless/layerless.md +++ b/docs/core/geometry/layerless/layerless.md @@ -70,14 +70,14 @@ Illustration of a shared direct portal between two volumes, the arrows indicate Illustration of a shared extended portal between several volumes, the arrows indicate the direction of attachment. ::: -The implementation of a unique, binned or any other volume link can be adapted to the detector geometry by providing a suitable `Acts::Experimental::DetectorVolumeUpdator` delegate. +The implementation of a unique, binned or any other volume link can be adapted to the detector geometry by providing a suitable `Acts::Experimental::DetectorVolumeUpdater` delegate. ### The Detector volume object A detector volume has to contain: - a list of bounding portal objects (that can be shared with other volumes) -- a navigation state updator as a `Acts::Experimental::SurfaceCandidatesUpdator` delegate, that at minimum is able to provide the portal surfaces for leaving the volume again. +- a navigation state updator as a `Acts::Experimental::SurfaceCandidatesUpdater` delegate, that at minimum is able to provide the portal surfaces for leaving the volume again. - a unique name string :::{note}