refactor: Remove separate default DetectorElementBase file (#2617)

`DetectorElementBase.hpp` has an `ifdef` that either includes the preprocessor define or previously included the default base class header. We included that header in a numbr of locations by accident, breaking the pattern. This removes the separate header (and erroneous inlcudes) and puts the default interface into `DetectorElementBase.hpp` inside the `ifdef`.
acts-project · Nov 4, 2023 · eb12644 · eb12644
1 parent f908ed6
commit eb12644
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 59 deletions.
diff --git a/Core/include/Acts/Geometry/DetectorElementBase.hpp b/Core/include/Acts/Geometry/DetectorElementBase.hpp
@@ -8,6 +8,12 @@
 
 #pragma once
 
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Geometry/GeometryContext.hpp"
+
+#include <memory>
+#include <vector>
+
 /// This is the plugin mechanism to exchange the entire DetectorElementBase
 ///
 /// By defining ACTS_DETECTOR_ELEMENT_BASE_REPLACEMENT pre-compile time the
@@ -18,5 +24,32 @@
 #ifdef ACTS_DETECTOR_ELEMENT_BASE_REPLACEMENT
 #include ACTS_DETECTOR_ELEMENT_BASE_REPLACEMENT
 #else
-#include "detail/DefaultDetectorElementBase.hpp"
+
+namespace Acts {
+
+class Surface;
+
+class DetectorElementBase {
+ public:
+  DetectorElementBase() = default;
+  virtual ~DetectorElementBase() = default;
+
+  /// Return the transform for the Element proxy mechanism
+  ///
+  /// @param gctx The current geometry context object, e.g. alignment
+  virtual const Transform3& transform(const GeometryContext& gctx) const = 0;
+
+  /// Return surface representation - const return pattern
+  virtual const Surface& surface() const = 0;
+
+  /// Non-const return pattern
+  virtual Surface& surface() = 0;
+
+  /// Returns the thickness of the module
+  /// @return double that indicates the thickness of the module
+  virtual double thickness() const = 0;
+};
+
+}  // namespace Acts
+
 #endif
diff --git a/Core/include/Acts/Geometry/detail/DefaultDetectorElementBase.hpp b/Core/include/Acts/Geometry/detail/DefaultDetectorElementBase.hpp
diff --git a/Core/src/Geometry/ProtoLayer.cpp b/Core/src/Geometry/ProtoLayer.cpp
@@ -10,7 +10,6 @@
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Geometry/Polyhedron.hpp"
-#include "Acts/Geometry/detail/DefaultDetectorElementBase.hpp"
 #include "Acts/Utilities/Helpers.hpp"
 
 #include <algorithm>

diff --git a/Core/src/Surfaces/Surface.cpp b/Core/src/Surfaces/Surface.cpp
@@ -10,7 +10,6 @@
 
 #include "Acts/Definitions/Common.hpp"
 #include "Acts/EventData/detail/TransformationBoundToFree.hpp"
-#include "Acts/Geometry/detail/DefaultDetectorElementBase.hpp"
 #include "Acts/Surfaces/SurfaceBounds.hpp"
 #include "Acts/Surfaces/detail/AlignmentHelper.hpp"
 #include "Acts/Utilities/VectorHelpers.hpp"

diff --git a/Examples/Algorithms/Digitization/src/PlanarSteppingAlgorithm.cpp b/Examples/Algorithms/Digitization/src/PlanarSteppingAlgorithm.cpp
@@ -20,7 +20,6 @@
 #include "Acts/EventData/SourceLink.hpp"
 #include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "Acts/Geometry/TrackingGeometry.hpp"
-#include "Acts/Geometry/detail/DefaultDetectorElementBase.hpp"
 #include "Acts/Plugins/Identification/IdentifiedDetectorElement.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Surfaces/SurfaceArray.hpp"

diff --git a/...ors/TelescopeDetector/include/ActsExamples/TelescopeDetector/TelescopeDetectorElement.hpp b/...ors/TelescopeDetector/include/ActsExamples/TelescopeDetector/TelescopeDetectorElement.hpp
@@ -11,7 +11,6 @@
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Geometry/DetectorElementBase.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
-#include "Acts/Geometry/detail/DefaultDetectorElementBase.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 
 #include <memory>

diff --git a/Examples/Io/Csv/src/CsvTrackingGeometryWriter.cpp b/Examples/Io/Csv/src/CsvTrackingGeometryWriter.cpp
@@ -21,7 +21,6 @@
 #include "Acts/Geometry/TrackingGeometry.hpp"
 #include "Acts/Geometry/TrackingVolume.hpp"
 #include "Acts/Geometry/VolumeBounds.hpp"
-#include "Acts/Geometry/detail/DefaultDetectorElementBase.hpp"
 #include "Acts/Plugins/Identification/IdentifiedDetectorElement.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Surfaces/SurfaceArray.hpp"

diff --git a/Examples/Io/Root/src/RootPlanarClusterWriter.cpp b/Examples/Io/Root/src/RootPlanarClusterWriter.cpp
@@ -19,7 +19,6 @@
 #include "Acts/EventData/SourceLink.hpp"
 #include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "Acts/Geometry/TrackingGeometry.hpp"
-#include "Acts/Geometry/detail/DefaultDetectorElementBase.hpp"
 #include "Acts/Plugins/Identification/IdentifiedDetectorElement.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Utilities/Result.hpp"

diff --git a/Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4DetectorElement.hpp b/Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4DetectorElement.hpp
@@ -11,7 +11,6 @@
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Geometry/DetectorElementBase.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
-#include "Acts/Geometry/detail/DefaultDetectorElementBase.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 
 #include <memory>

diff --git a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/CubicTrackingGeometry.hpp b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/CubicTrackingGeometry.hpp
@@ -21,7 +21,6 @@
 #include "Acts/Geometry/PlaneLayer.hpp"
 #include "Acts/Geometry/TrackingGeometry.hpp"
 #include "Acts/Geometry/TrackingVolume.hpp"
-#include "Acts/Geometry/detail/DefaultDetectorElementBase.hpp"
 #include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
 #include "Acts/Surfaces/PlaneSurface.hpp"
 #include "Acts/Surfaces/RectangleBounds.hpp"

diff --git a/Tests/UnitTests/Core/Geometry/AlignmentContextTests.cpp b/Tests/UnitTests/Core/Geometry/AlignmentContextTests.cpp
@@ -11,7 +11,6 @@
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/Units.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
-#include "Acts/Geometry/detail/DefaultDetectorElementBase.hpp"
 #include "Acts/Surfaces/PlaneSurface.hpp"
 #include "Acts/Surfaces/RectangleBounds.hpp"
 #include "Acts/Surfaces/Surface.hpp"