Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Remove separate default DetectorElementBase file #2617

Merged
merged 5 commits into from
Nov 4, 2023
Merged

refactor: Remove separate default DetectorElementBase file #2617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb9d18e
refactor: Remove separate default `DetectorElementBase` file
paulgessinger Nov 2, 2023
d86b8ef
format fix
paulgessinger Nov 2, 2023
a2edbe6
Merge branch 'main' into det-elem-base
paulgessinger Nov 3, 2023
ac9c29e
Merge branch 'main' into det-elem-base
kodiakhq[bot] Nov 3, 2023
6b5c01f
Merge branch 'main' into det-elem-base
kodiakhq[bot] Nov 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 34 additions & 1 deletion Core/include/Acts/Geometry/DetectorElementBase.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
49 changes: 0 additions & 49 deletions Core/include/Acts/Geometry/detail/DefaultDetectorElementBase.hpp
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Core/src/Geometry/ProtoLayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion Core/src/Surfaces/Surface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion Examples/Algorithms/Digitization/src/PlanarSteppingAlgorithm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion ...ors/TelescopeDetector/include/ActsExamples/TelescopeDetector/TelescopeDetectorElement.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion Examples/Io/Csv/src/CsvTrackingGeometryWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion Examples/Io/Root/src/RootPlanarClusterWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4DetectorElement.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion Tests/CommonHelpers/Acts/Tests/CommonHelpers/CubicTrackingGeometry.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion Tests/UnitTests/Core/Geometry/AlignmentContextTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading