Merge branch 'main' into feat/is-on-surface-tolerance

acts-project · Aug 23, 2024 · 27f1094 · 27f1094
2 parents 594503c + fb8c3bc
commit 27f1094
Show file tree

Hide file tree

Showing 20 changed files with 37 additions and 40 deletions.
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelDetectorElement.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelDetectorElement.hpp
@@ -50,7 +50,7 @@ class GeoModelDetectorElement : public DetectorElementBase {
   /// @return a shared pointer to an instance of the detector element
   template <typename SurfaceType, typename BoundsType>
   static std::shared_ptr<GeoModelDetectorElement> createDetectorElement(
-      PVConstLink geoPhysVol, const std::shared_ptr<BoundsType> bounds,
+      const PVConstLink& geoPhysVol, const std::shared_ptr<BoundsType> bounds,
       const Transform3& sfTransform, ActsScalar thickness) {
     // First create the detector element with a nullptr
     auto detElement = std::make_shared<GeoModelDetectorElement>(

diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelDetectorObjectFactory.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelDetectorObjectFactory.hpp
@@ -61,15 +61,16 @@ class GeoModelDetectorObjectFactory {
   void construct(Cache& cache, const GeometryContext& gctx,
                  const GeoModelTree& geoModelTree, const Options& options);
 
-  void convertSensitive(PVConstLink geoPV, const Acts::Transform3& transform,
+  void convertSensitive(const PVConstLink& geoPV,
+                        const Acts::Transform3& transform,
                         std::vector<GeoModelSensitiveSurface>& sensitives);
 
-  std::vector<GeoChildNodeWithTrf> findAllSubVolumes(PVConstLink geoPV);
+  std::vector<GeoChildNodeWithTrf> findAllSubVolumes(const PVConstLink& vol);
 
   bool convertBox(std::string name);
-  bool matches(const std::string& name, PVConstLink physvol);
+  bool matches(const std::string& name, const PVConstLink& physvol);
 
-  void convertFpv(std::string name, GeoFullPhysVol* fpv, Cache& cache,
+  void convertFpv(const std::string& name, GeoFullPhysVol* fpv, Cache& cache,
                   const GeometryContext& gctx);
 
  private:

diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelMaterialConverter.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelMaterialConverter.hpp
@@ -11,15 +11,13 @@
 
 class GeoMaterial;
 
-namespace Acts {
+namespace Acts::GeoModel {
 
-namespace GeoModel {
 /// @brief Convert GeoMaterial to Acts::Material
 ///
 /// @param gm The GeoMaterial to be converted
 /// @return the Acts::Material
 Material geoMaterialConverter(const GeoMaterial& gm,
                               bool useMolarDensity = true);
 
-}  // namespace GeoModel
-}  // namespace Acts
+}  // namespace Acts::GeoModel
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelToDetectorVolume.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelToDetectorVolume.hpp
@@ -13,17 +13,16 @@
 #include "GeoModelKernel/GeoDefinitions.h"
 class GeoShape;
 
-namespace Acts {
+namespace Acts::GeoModel {
 
-namespace GeoModel {
 /// @brief Convert a GeoModel shape to a DetectorVolume
 ///
 /// @param shape the GeoModel shape
 /// @param transform the transform to be applied
 /// @return the DetectorVolume
 std::shared_ptr<Experimental::DetectorVolume> convertVolume(
     const GeometryContext& context, const GeoShape& shape,
-    const std::string& name, const GeoTrf::Transform3D transform,
+    const std::string& name, const GeoTrf::Transform3D& transform,
     const std::vector<GeoModelSensitiveSurface>& sensitives);
-}  // namespace GeoModel
-}  // namespace Acts
+
+}  // namespace Acts::GeoModel
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoBoxConverter.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoBoxConverter.hpp
@@ -28,7 +28,7 @@ struct GeoBoxConverter {
   /// @param bool sensitive
   ///
   /// @return The detector element and surface
-  Result<GeoModelSensitiveSurface> operator()(PVConstLink geoPV,
+  Result<GeoModelSensitiveSurface> operator()(const PVConstLink& geoPV,
                                               const GeoBox& geoBox,
                                               const Transform3& absTransform,
                                               bool sensitive) const;

diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoIntersectionAnnulusConverter.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoIntersectionAnnulusConverter.hpp
@@ -29,7 +29,7 @@ struct GeoIntersectionAnnulusConverter {
   ///
   /// @return The detector element and surface
   Result<GeoModelSensitiveSurface> operator()(
-      PVConstLink geoPV, const GeoShapeIntersection& geoIntersection,
+      const PVConstLink& geoPV, const GeoShapeIntersection& geoIntersection,
       const Transform3& absTransform, bool sensitive) const;
 };
 

diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoShiftConverter.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoShiftConverter.hpp
@@ -27,7 +27,7 @@ struct GeoShiftConverter {
   /// @param bool sensitive
   ///
   /// @return The detector element and surface
-  Result<GeoModelSensitiveSurface> operator()(PVConstLink geoPV,
+  Result<GeoModelSensitiveSurface> operator()(const PVConstLink& geoPV,
                                               const GeoShapeShift& geoShift,
                                               const Transform3& absTransform,
                                               bool sensitive) const;

diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoTrdConverter.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoTrdConverter.hpp
@@ -34,7 +34,7 @@ struct GeoTrdConverter {
   /// @param bool sensitive
   ///
   /// @return The detector element and surface
-  Result<GeoModelSensitiveSurface> operator()(PVConstLink geoPV,
+  Result<GeoModelSensitiveSurface> operator()(const PVConstLink& geoPV,
                                               const GeoTrd& geoTrd,
                                               const Transform3& absTransform,
                                               bool sensitive) const;

diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoTubeConverter.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoTubeConverter.hpp
@@ -29,7 +29,7 @@ struct GeoTubeConverter {
   /// @param bool sensitive
   ///
   /// @return The detector element and surface
-  Result<GeoModelSensitiveSurface> operator()(PVConstLink geoPV,
+  Result<GeoModelSensitiveSurface> operator()(const PVConstLink& geoPV,
                                               const GeoTube& geoTube,
                                               const Transform3& absTransform,
                                               bool sensitive) const;

diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoUnionDoubleTrdConverter.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoUnionDoubleTrdConverter.hpp
@@ -35,8 +35,7 @@ struct GeoUnionDoubleTrdConverter {
   /// @param bool sensitive
   ///
   /// @return The detector element and surface
-
-  Result<GeoModelSensitiveSurface> operator()(PVConstLink geoFPV,
+  Result<GeoModelSensitiveSurface> operator()(const PVConstLink& geoPV,
                                               const GeoShapeUnion& geoUnion,
                                               const Transform3& absTransform,
                                               bool sensitive) const;

diff --git a/Plugins/GeoModel/src/GeoModelDetectorElement.cpp b/Plugins/GeoModel/src/GeoModelDetectorElement.cpp
@@ -15,7 +15,7 @@
 Acts::GeoModelDetectorElement::GeoModelDetectorElement(
     PVConstLink geoPhysVol, std::shared_ptr<Surface> surface,
     const Transform3& sfTransform, ActsScalar thickness)
-    : m_geoPhysVol(geoPhysVol),
+    : m_geoPhysVol(std::move(geoPhysVol)),
       m_surface(std::move(surface)),
       m_surfaceTransform(sfTransform),
       m_thickness(thickness) {}

diff --git a/Plugins/GeoModel/src/GeoModelDetectorObjectFactory.cpp b/Plugins/GeoModel/src/GeoModelDetectorObjectFactory.cpp
@@ -86,7 +86,7 @@ void Acts::GeoModelDetectorObjectFactory::construct(
 }
 
 void Acts::GeoModelDetectorObjectFactory::convertSensitive(
-    PVConstLink geoPV, const Acts::Transform3 &transform,
+    const PVConstLink &geoPV, const Acts::Transform3 &transform,
     std::vector<GeoModelSensitiveSurface> &sensitives) {
   const GeoLogVol *logVol = geoPV->getLogVol();
   const GeoShape *shape = logVol->getShape();
@@ -120,7 +120,7 @@ void Acts::GeoModelDetectorObjectFactory::convertSensitive(
 }
 
 std::vector<GeoChildNodeWithTrf>
-Acts::GeoModelDetectorObjectFactory::findAllSubVolumes(PVConstLink vol) {
+Acts::GeoModelDetectorObjectFactory::findAllSubVolumes(const PVConstLink &vol) {
   std::vector<GeoChildNodeWithTrf> subvolumes = getChildrenWithRef(vol, false);
   std::vector<GeoChildNodeWithTrf> sensitives;
   for (auto subvolume : subvolumes) {
@@ -147,19 +147,19 @@ bool Acts::GeoModelDetectorObjectFactory::convertBox(std::string name) {
   return convB;
 }
 void Acts::GeoModelDetectorObjectFactory::convertFpv(
-    std::string name, GeoFullPhysVol *fpv, Cache &cache,
+    const std::string &name, GeoFullPhysVol *fpv, Cache &cache,
     const GeometryContext &gctx) {
   PVConstLink physVol{fpv};
 
   // get children
   std::vector<GeoChildNodeWithTrf> subvolumes =
       getChildrenWithRef(physVol, false);
-  if (subvolumes.size() > 0) {
+  if (!subvolumes.empty()) {
     // vector containing all subvolumes to be converted to surfaces
     std::vector<GeoChildNodeWithTrf> surfaces = findAllSubVolumes(physVol);
     std::vector<GeoModelSensitiveSurface> sensitives;
 
-    for (auto surface : surfaces) {
+    for (const auto &surface : surfaces) {
       const Transform3 &transform =
           fpv->getAbsoluteTransform() * surface.transform;
       convertSensitive(surface.volume, transform, sensitives);
@@ -186,7 +186,7 @@ void Acts::GeoModelDetectorObjectFactory::convertFpv(
 }
 // lambda to determine if object fits query
 bool Acts::GeoModelDetectorObjectFactory::matches(const std::string &name,
-                                                  PVConstLink physvol) {
+                                                  const PVConstLink &physvol) {
   if (m_cfg.nameList.empty() && m_cfg.materialList.empty()) {
     return true;
   }

diff --git a/Plugins/GeoModel/src/GeoModelToDetectorVolume.cpp b/Plugins/GeoModel/src/GeoModelToDetectorVolume.cpp
@@ -28,11 +28,11 @@
 #include <GeoModelKernel/GeoTube.h>
 #include <GeoModelKernel/GeoTubs.h>
 
-namespace Acts {
-namespace GeoModel {
+namespace Acts::GeoModel {
+
 std::shared_ptr<Experimental::DetectorVolume> convertVolume(
     const GeometryContext& context, const GeoShape& shape,
-    const std::string& name, const GeoTrf::Transform3D transform,
+    const std::string& name, const GeoTrf::Transform3D& transform,
     const std::vector<GeoModelSensitiveSurface>& sensitives) {
   // dummy volume for conversion with surfaces
   std::vector<std::shared_ptr<Acts::Experimental::DetectorVolume>> a;
@@ -184,5 +184,5 @@ std::shared_ptr<Experimental::DetectorVolume> convertVolume(
   }
   throw std::runtime_error("FATAL: Unsupported GeoModel shape");
 }
-}  // namespace GeoModel
-}  // namespace Acts
+
+}  // namespace Acts::GeoModel
diff --git a/Plugins/GeoModel/src/detail/GeoBoxConverter.cpp b/Plugins/GeoModel/src/detail/GeoBoxConverter.cpp
@@ -22,7 +22,7 @@
 #include <GeoModelKernel/Units.h>
 
 Acts::Result<Acts::GeoModelSensitiveSurface>
-Acts::detail::GeoBoxConverter::operator()(PVConstLink geoPV,
+Acts::detail::GeoBoxConverter::operator()(const PVConstLink& geoPV,
                                           const GeoBox& geoBox,
                                           const Transform3& absTransform,
                                           bool sensitive) const {

diff --git a/Plugins/GeoModel/src/detail/GeoIntersectionAnnulusConverter.cpp b/Plugins/GeoModel/src/detail/GeoIntersectionAnnulusConverter.cpp
@@ -26,7 +26,7 @@
 
 Acts::Result<Acts::GeoModelSensitiveSurface>
 Acts::detail::GeoIntersectionAnnulusConverter::operator()(
-    PVConstLink geoPV, const GeoShapeIntersection& geoIntersection,
+    const PVConstLink& geoPV, const GeoShapeIntersection& geoIntersection,
     const Transform3& absTransform, bool sensitive) const {
   /// auto-calculate the unit length conversion
   static constexpr ActsScalar unitLength =

diff --git a/Plugins/GeoModel/src/detail/GeoShiftConverter.cpp b/Plugins/GeoModel/src/detail/GeoShiftConverter.cpp
@@ -66,7 +66,7 @@ Result<GeoModelSensitiveSurface> impl(PVConstLink geoPV,
 }  // namespace
 
 Result<GeoModelSensitiveSurface> GeoShiftConverter::operator()(
-    PVConstLink geoPV, const GeoShapeShift& geoShift,
+    const PVConstLink& geoPV, const GeoShapeShift& geoShift,
     const Transform3& absTransform, bool sensitive) const {
   auto r = impl<GeoTrd, detail::GeoTrdConverter, PlaneSurface, TrapezoidBounds>(
       geoPV, geoShift, absTransform, sensitive);

diff --git a/Plugins/GeoModel/src/detail/GeoTrdConverter.cpp b/Plugins/GeoModel/src/detail/GeoTrdConverter.cpp
@@ -24,7 +24,7 @@
 #include <GeoModelKernel/Units.h>
 
 Acts::Result<Acts::GeoModelSensitiveSurface>
-Acts::detail::GeoTrdConverter::operator()(PVConstLink geoPV,
+Acts::detail::GeoTrdConverter::operator()(const PVConstLink& geoPV,
                                           const GeoTrd& geoTrd,
                                           const Transform3& absTransform,
                                           bool sensitive) const {

diff --git a/Plugins/GeoModel/src/detail/GeoTubeConverter.cpp b/Plugins/GeoModel/src/detail/GeoTubeConverter.cpp
@@ -25,7 +25,7 @@
 #include <GeoModelKernel/Units.h>
 
 Acts::Result<Acts::GeoModelSensitiveSurface>
-Acts::detail::GeoTubeConverter::operator()(PVConstLink geoPV,
+Acts::detail::GeoTubeConverter::operator()(const PVConstLink& geoPV,
                                            const GeoTube& geoTube,
                                            const Transform3& absTransform,
                                            bool sensitive) const {

diff --git a/Plugins/GeoModel/src/detail/GeoUnionDoubleTrdConverter.cpp b/Plugins/GeoModel/src/detail/GeoUnionDoubleTrdConverter.cpp
@@ -47,7 +47,7 @@ bool trapezoidsAreMergeable(const std::vector<Acts::Vector3> &vtxsa,
 namespace Acts::detail {
 
 Result<GeoModelSensitiveSurface> GeoUnionDoubleTrdConverter::operator()(
-    PVConstLink geoPV, const GeoShapeUnion &geoUnion,
+    const PVConstLink &geoPV, const GeoShapeUnion &geoUnion,
     const Transform3 &absTransform, bool sensitive) const {
   const auto shiftA = dynamic_cast<const GeoShapeShift *>(geoUnion.getOpA());
   const auto shiftB = dynamic_cast<const GeoShapeShift *>(geoUnion.getOpB());

diff --git a/Tests/UnitTests/Plugins/GeoModel/GeoDetectorObjectTest.cpp b/Tests/UnitTests/Plugins/GeoModel/GeoDetectorObjectTest.cpp
@@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE(GeoModelDetectorObjectFactory) {
   factory.convertFpv("LogVolumeXY", fphysXY, gmCache, gContext);
 
   // checking the dimension of the converted bounding boxes
-  for (auto box : gmCache.boundingBoxes) {
+  for (const auto& box : gmCache.boundingBoxes) {
     const Acts::VolumeBounds& bounds = box->volumeBounds();
     BOOST_CHECK(gmhlx == bounds.values()[0]);
     BOOST_CHECK(gmhly == bounds.values()[1]);