Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 0 additions & 26 deletions Core/include/Acts/Definitions/Algebra.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,32 +66,6 @@ using DynamicVector = Eigen::Matrix<double, Eigen::Dynamic, 1>;
/// @brief Dynamic-sized matrix type
using DynamicMatrix = Eigen::Matrix<double, Eigen::Dynamic, Eigen::Dynamic>;

/// @brief Fixed-size vector type for N-dimensional vectors
/// @tparam kSize The dimension of the vector
/// @deprecated Use Vector instead
template <unsigned int kSize>
using ActsVector [[deprecated("Use Vector instead")]] = Vector<kSize>;
/// @brief Fixed-size matrix type for NxM matrices
/// @tparam kRows Number of rows
/// @tparam kCols Number of columns
/// @deprecated Use Matrix instead
template <unsigned int kRows, unsigned int kCols>
using ActsMatrix [[deprecated("Use Matrix instead")]] = Matrix<kRows, kCols>;
/// @brief Fixed-size square matrix type for NxN matrices
/// @tparam kSize The dimension of the square matrix
/// @deprecated Use SquareMatrix instead
template <unsigned int kSize>
using ActsSquareMatrix [[deprecated("Use SquareMatrix instead")]] =
SquareMatrix<kSize>;
/// @brief Dynamic-sized vector type
/// @deprecated Use DynamicVector instead
using ActsDynamicVector [[deprecated("Use DynamicVector instead")]] =
DynamicVector;
/// @brief Dynamic-sized matrix type
/// @deprecated Use DynamicMatrix instead
using ActsDynamicMatrix [[deprecated("Use DynamicMatrix instead")]] =
DynamicMatrix;

/// @brief 2-dimensional vector type for 2D coordinates
using Vector2 = Vector<2>;
/// @brief 3-dimensional vector type for e.g. spatial coordinates and momenta
Expand Down
6 changes: 0 additions & 6 deletions Core/include/Acts/Definitions/TrackParametrization.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,6 @@ static_assert(eFreeDir2 == eFreeDir0 + 2u, "Direction must be continuous");
using BoundVector = Vector<eBoundSize>;
/// @brief Matrix type for bound track parameter transformations
using BoundMatrix = Matrix<eBoundSize, eBoundSize>;
/// @brief Square matrix type for bound track parameter covariance
using BoundSquareMatrix [[deprecated("Use BoundMatrix instead")]] =
SquareMatrix<eBoundSize>;
/// @brief Matrix type for mapping from bound to free track parameters
using BoundToFreeMatrix = Matrix<eFreeSize, eBoundSize>;

Expand All @@ -129,9 +126,6 @@ using BoundToFreeMatrix = Matrix<eFreeSize, eBoundSize>;
using FreeVector = Vector<eFreeSize>;
/// @brief Matrix type for free track parameter transformations
using FreeMatrix = Matrix<eFreeSize, eFreeSize>;
/// @brief Square matrix type for free track parameter covariance
using FreeSquareMatrix [[deprecated("Use FreeMatrix instead")]] =
SquareMatrix<eFreeSize>;
/// @brief Matrix type for mapping from free to bound track parameters
using FreeToBoundMatrix = Matrix<eBoundSize, eFreeSize>;
/// @brief Matrix type for mapping from free parameters to path length
Expand Down
9 changes: 0 additions & 9 deletions Core/include/Acts/EventData/BoundTrackParameters.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
static Result<BoundTrackParameters> create(
const GeometryContext& geoCtx, std::shared_ptr<const Surface> surface,
const Vector4& pos4, const Vector3& dir, double qOverP,
std::optional<BoundMatrix> cov, ParticleHypothesis particleHypothesis,

Check warning on line 61 in Core/include/Acts/EventData/BoundTrackParameters.hpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Pass large object "particleHypothesis" by reference to const.

See more on https://sonarcloud.io/project/issues?id=acts-project_acts&issues=AZ64WjaqgzWP0u6F0_mX&open=AZ64WjaqgzWP0u6F0_mX&pullRequest=5496
double tolerance = s_onSurfaceTolerance) {
Result<BoundVector> bound =
transformFreeToBoundParameters(pos4.segment<3>(ePos0), pos4[eTime], dir,
Expand All @@ -82,7 +82,7 @@
/// @return Curvilinear bound track parameters
static BoundTrackParameters createCurvilinear(
const Vector4& pos4, const Vector3& dir, double qOverP,
std::optional<BoundMatrix> cov, ParticleHypothesis particleHypothesis) {

Check warning on line 85 in Core/include/Acts/EventData/BoundTrackParameters.hpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Pass large object "particleHypothesis" by reference to const.

See more on https://sonarcloud.io/project/issues?id=acts-project_acts&issues=AZ64WjaqgzWP0u6F0_mY&open=AZ64WjaqgzWP0u6F0_mY&pullRequest=5496
return BoundTrackParameters(
CurvilinearSurface(pos4.segment<3>(ePos0), dir).surface(),
transformFreeToCurvilinearParameters(pos4[eTime], dir, qOverP),
Expand All @@ -100,7 +100,7 @@
/// @return Curvilinear bound track parameters
static BoundTrackParameters createCurvilinear(
const Vector4& pos4, double phi, double theta, double qOverP,
std::optional<BoundMatrix> cov, ParticleHypothesis particleHypothesis) {

Check warning on line 103 in Core/include/Acts/EventData/BoundTrackParameters.hpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Pass large object "particleHypothesis" by reference to const.

See more on https://sonarcloud.io/project/issues?id=acts-project_acts&issues=AZ64WjaqgzWP0u6F0_mZ&open=AZ64WjaqgzWP0u6F0_mZ&pullRequest=5496
return BoundTrackParameters(
CurvilinearSurface(pos4.segment<3>(ePos0),
makeDirectionFromPhiTheta(phi, theta))
Expand All @@ -124,7 +124,7 @@
BoundTrackParameters(std::shared_ptr<const Surface> surface,
const BoundVector& params,
std::optional<BoundMatrix> cov,
ParticleHypothesis particleHypothesis)

Check warning on line 127 in Core/include/Acts/EventData/BoundTrackParameters.hpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Pass large object "particleHypothesis" by reference to const.

See more on https://sonarcloud.io/project/issues?id=acts-project_acts&issues=AZ64WjaqgzWP0u6F0_ma&open=AZ64WjaqgzWP0u6F0_ma&pullRequest=5496
: m_params(params),
m_cov(std::move(cov)),
m_surface(std::move(surface)),
Expand All @@ -136,15 +136,6 @@
normalizePhiTheta();
}

/// Convert this track parameter object to the general type-erased one
/// @return Type-erased bound track parameters
[[deprecated(
"You already have a universal bound track parameter at hand. You can "
"drop `toBound()`.")]]
BoundTrackParameters toBound() const {
return BoundTrackParameters{*this};
}

/// Parameters vector.
/// @return Mutable reference to the parameters vector
BoundVector& parameters() { return m_params; }
Expand Down
20 changes: 0 additions & 20 deletions Core/include/Acts/EventData/Charge.hpp

This file was deleted.

20 changes: 0 additions & 20 deletions Core/include/Acts/EventData/ChargeConcept.hpp

This file was deleted.

23 changes: 0 additions & 23 deletions Core/include/Acts/EventData/GenericBoundTrackParameters.hpp

This file was deleted.

23 changes: 0 additions & 23 deletions Core/include/Acts/EventData/GenericFreeTrackParameters.hpp

This file was deleted.

23 changes: 0 additions & 23 deletions Core/include/Acts/EventData/GenericParticleHypothesis.hpp

This file was deleted.

9 changes: 0 additions & 9 deletions Core/include/Acts/EventData/MultiComponentTrackParameters.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
static MultiComponentBoundTrackParameters createCurvilinear(
const GeometryContext& geoCtx,
const std::vector<ConstructionTuple>& curvi,
ParticleHypothesis particleHypothesis) {

Check warning on line 69 in Core/include/Acts/EventData/MultiComponentTrackParameters.hpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Pass large object "particleHypothesis" by reference to const.

See more on https://sonarcloud.io/project/issues?id=acts-project_acts&issues=AZ64WjfTgzWP0u6F0_mb&open=AZ64WjfTgzWP0u6F0_mb&pullRequest=5496
// Construct and average surface
Vector3 avgPos = Vector3::Zero();
Vector3 avgDir = Vector3::Zero();
Expand Down Expand Up @@ -114,7 +114,7 @@
/// @param particleHypothesis Particle hypothesis for the parameters
MultiComponentBoundTrackParameters(std::shared_ptr<const Surface> surface,
bool hasCovariance,
ParticleHypothesis particleHypothesis)

Check warning on line 117 in Core/include/Acts/EventData/MultiComponentTrackParameters.hpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Pass large object "particleHypothesis" by reference to const.

See more on https://sonarcloud.io/project/issues?id=acts-project_acts&issues=AZ64WjfTgzWP0u6F0_mc&open=AZ64WjfTgzWP0u6F0_mc&pullRequest=5496
: m_surface(std::move(surface)),
m_particleHypothesis(particleHypothesis),
m_hasCovariance(hasCovariance) {}
Expand All @@ -127,7 +127,7 @@
MultiComponentBoundTrackParameters(std::shared_ptr<const Surface> surface,
const BoundVector& params,
std::optional<BoundMatrix> cov,
ParticleHypothesis particleHypothesis)

Check warning on line 130 in Core/include/Acts/EventData/MultiComponentTrackParameters.hpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Pass large object "particleHypothesis" by reference to const.

See more on https://sonarcloud.io/project/issues?id=acts-project_acts&issues=AZ64WjfTgzWP0u6F0_md&open=AZ64WjfTgzWP0u6F0_md&pullRequest=5496
: m_surface(std::move(surface)),
m_particleHypothesis(particleHypothesis) {
m_weights.push_back(1.);
Expand All @@ -147,7 +147,7 @@
MultiComponentBoundTrackParameters(std::shared_ptr<const Surface> surface,
const component_range_t& cmps,
const projector_t& proj,
ParticleHypothesis particleHypothesis)

Check warning on line 150 in Core/include/Acts/EventData/MultiComponentTrackParameters.hpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Pass large object "particleHypothesis" by reference to const.

See more on https://sonarcloud.io/project/issues?id=acts-project_acts&issues=AZ64WjfTgzWP0u6F0_me&open=AZ64WjfTgzWP0u6F0_me&pullRequest=5496
requires detail::ComponentRangeAndProjectorWithoutCovarianceConcept<
component_range_t, projector_t>
: m_surface(std::move(surface)),
Expand All @@ -174,7 +174,7 @@
MultiComponentBoundTrackParameters(std::shared_ptr<const Surface> surface,
const component_range_t& cmps,
const projector_t& proj,
ParticleHypothesis particleHypothesis)

Check warning on line 177 in Core/include/Acts/EventData/MultiComponentTrackParameters.hpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Pass large object "particleHypothesis" by reference to const.

See more on https://sonarcloud.io/project/issues?id=acts-project_acts&issues=AZ64WjfTgzWP0u6F0_mf&open=AZ64WjfTgzWP0u6F0_mf&pullRequest=5496
requires detail::ComponentRangeAndProjectorWithCovarianceConcept<
component_range_t, projector_t>
: m_surface(std::move(surface)),
Expand Down Expand Up @@ -213,15 +213,6 @@
MultiComponentBoundTrackParameters& operator=(
MultiComponentBoundTrackParameters&&) = default;

/// Comply with bound convertible, in this case return a copy
/// @return Copy of this multi-component track parameters
[[deprecated(
"You already have a universal bound track parameter at hand. You can "
"drop `toBound()`.")]]
MultiComponentBoundTrackParameters toBound() const {
return *this;
}

/// Size of the multi-component parameters
/// @return Number of components in the multi-component parameters
std::size_t size() const { return m_weights.size(); }
Expand Down
23 changes: 0 additions & 23 deletions Core/include/Acts/EventData/MultiTrajectory.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -126,29 +126,6 @@ concept VisitorConcept = requires(T& t, TS& ts) {

} // namespace detail_lt

/// This namespace contains typedefs and constant values that are used by
/// other parts of the @c MultiTrajectory implementation. It extracts these
/// from @c TrackStateTraits using the default maximum measurement dimension.
/// @deprecated Use aliased types and constants directly
namespace MultiTrajectoryTraits {

/// Maximum number of measurement dimensions supported by trajectory
/// @deprecated Use @ref Acts::kMeasurementSizeMax instead.
[[deprecated("Use Acts::kMeasurementSizeMax instead.")]]
constexpr unsigned int MeasurementSizeMax = kMeasurementSizeMax;

/// Type alias for trajectory index type
/// @deprecated Use @ref Acts::TrackIndexType instead.
using IndexType [[deprecated("Use Acts::TrackIndexType instead.")]] =
TrackIndexType;

/// Invalid track state index constant
/// @deprecated Use @ref Acts::kTrackIndexInvalid instead.
[[deprecated("Use Acts::kTrackIndexInvalid instead.")]]
constexpr IndexType kInvalid = kTrackIndexInvalid;

} // namespace MultiTrajectoryTraits

template <typename T>
struct IsReadOnlyMultiTrajectory;

Expand Down
6 changes: 0 additions & 6 deletions Core/include/Acts/EventData/SpacePointColumns.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,6 @@ enum class SpacePointColumns : std::uint32_t {
TopStripVector | BottomStripVector | StripCenterDistance |
TopStripCenter | CopyFromIndex | PackedXY | PackedZR | PackedXYZ |
PackedXYZR | PackedVarianceZR,

XY [[deprecated("Use PackedXY instead")]] = 1 << 15,
ZR [[deprecated("Use PackedZR instead")]] = 1 << 16,
XYZ [[deprecated("Use PackedXYZ instead")]] = 1 << 17,
XYZR [[deprecated("Use PackedXYZR instead")]] = 1 << 18,
VarianceZR [[deprecated("Use PackedVarianceZR instead")]] = 1 << 19,
};

/// Enable bitwise operators for SpacePointColumns enum
Expand Down
22 changes: 0 additions & 22 deletions Core/include/Acts/EventData/TrackParameters.hpp

This file was deleted.

21 changes: 0 additions & 21 deletions Core/include/Acts/EventData/TrackStateType.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,27 +28,6 @@ namespace Acts {
/// recommended to start from bit position 16 or in reverse from 63 to avoid
/// conflicts with future additions.
enum class TrackStateFlag {
MeasurementFlag [[deprecated("Replaced by HasMeasurement; consider to use "
"isMeasurement()/setIsMeasurement() instead")]] =
0,
ParameterFlag [[deprecated("Replaced by HasParameters; consider to use "
"hasParameters()/setHasParameters() instead")]] =
1,
OutlierFlag [[deprecated("Replaced by IsOutlier; consider to use "
"isOutlier()/setIsOutlier() instead")]] = 2,
HoleFlag [[deprecated("Replaced by IsHole; consider to use "
"isHole()/setIsHole() instead")]] = 3,
MaterialFlag [[deprecated("Replaced by HasMaterial; consider to use "
"hasMaterial()/setHasMaterial() instead")]] = 4,
SharedHitFlag [[deprecated("Replaced by IsSharedHit; consider to use "
"isSharedHit()/setIsSharedHit() instead")]] = 5,
SplitHitFlag [[deprecated("Replaced by IsSplitHit; consider to use "
"isSplitHit()/setIsSplitHit() instead")]] = 6,
NoExpectedHitFlag
[[deprecated("Replaced by HasNoExpectedHit; consider to use "
"hasNoExpectedHit()/setHasNoExpectedHit() instead")]] = 7,
NumTrackStateFlags [[deprecated("Replaced by NumFlags")]] = 8,

/// Indicates that the track state has an associated measurement.
/// Note that an outlier also has a measurement.
HasMeasurement = 0,
Expand Down
9 changes: 3 additions & 6 deletions Core/include/Acts/Geometry/GeometryContext.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,6 @@ class GeometryContext : public ContextType {
ACTS_POP_IGNORE_DEPRECATED()
}

/// Default constructor
/// @deprecated Use GeometryContext::dangerouslyDefaultConstruct() instead
/// to make empty context construction explicit
[[deprecated("Use GeometryContext::dangerouslyDefaultConstruct() instead")]]
GeometryContext() = default;

/// Move construct from arbitrary type (inherited from ContextType)
/// @tparam T The type of the value to construct from
/// @param value The value to construct from
Expand All @@ -79,6 +73,9 @@ class GeometryContext : public ContextType {

/// Inherit assignment operators
using ContextType::operator=;

private:
GeometryContext() = default;
};

/// Helper struct that stores an object and a context, and will print it to
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,6 @@ namespace ActsExamples {
/// Algorithm implementations only need to implement the `execute` method.
class IAlgorithm : public SequenceElement {
public:
/// Constructor
///
/// @name The algorithm name
/// @level The logging level for this algorithm
/// @deprecated Use the constructor with a logger instead
[[deprecated("Use the constructor with a logger instead")]]
explicit IAlgorithm(const std::string& name, Acts::Logging::Level level);

/// Constructor
///
/// @name The algorithm name
Expand Down
3 changes: 0 additions & 3 deletions Examples/Framework/src/Framework/IAlgorithm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@

namespace ActsExamples {

IAlgorithm::IAlgorithm(const std::string& name, Acts::Logging::Level level)
: IAlgorithm(name, Acts::getDefaultLogger(name, level)) {}

IAlgorithm::IAlgorithm(const std::string& name,
std::unique_ptr<const Acts::Logger> logger)
: m_name(name),
Expand Down
3 changes: 0 additions & 3 deletions Plugins/Gnn/include/ActsPlugins/Gnn/ModuleMapCuda.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ class ModuleMapCuda : public GraphConstructionBase {
/// Pseudorapidity scaling factor
float etaScale = 1.0;

/// @deprecated Has no effect and will be removed in a future release.
[[deprecated("moreParallel has no effect and will be removed")]]
bool moreParallel = true;
/// CUDA device ID
int gpuDevice = 0;
/// Number of GPU blocks
Expand Down
Loading