Skip to content

Commit

Permalink
refactor!: shorten alignment parameter enum and related type names (#…
Browse files Browse the repository at this point in the history
…422_

This performs the following renames
```
AlignmentParametersIndices -> AlignmentIndices
AlignmentParametersScalar -> AlignmentScalar
eAlignmentParametersSize -> eAlignmentSize
```
for consistency with the similar parameter enums modified in #420.
  • Loading branch information
msmk0 authored Sep 3, 2020
1 parent 8e05d4a commit f7648cf
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 18 deletions.
25 changes: 10 additions & 15 deletions Core/include/Acts/Utilities/AlignmentDefinitions.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@

#pragma once

#include "Acts/Utilities/ParameterDefinitions.hpp"

#include <cmath>
#include <type_traits>
#include "Acts/Utilities/Definitions.hpp"

namespace Acts {

Expand All @@ -21,7 +18,7 @@ namespace Acts {
/// This must be a regular `enum` and not a scoped `enum class` to allow
/// implicit conversion to an integer. The enum value are thus visible directly
/// in `namespace Acts` and are prefixed to avoid naming collisions.
enum AlignmentParametersIndices : unsigned int {
enum AlignmentIndices : unsigned int {
// Center of geometry object in global 3D cartesian coordinates
eAlignmentCenter0 = 0u,
eAlignmentCenter1 = eAlignmentCenter0 + 1u,
Expand All @@ -31,22 +28,20 @@ enum AlignmentParametersIndices : unsigned int {
eAlignmentRotation1 = eAlignmentRotation0 + 1u,
eAlignmentRotation2 = eAlignmentRotation0 + 2u,
// Last uninitialized value contains the total number of components
eAlignmentParametersSize,
eAlignmentSize,
};

/// Underlying fundamental scalar type for alignment parameters.
using AlignmentParametersScalar = double;
using AlignmentScalar = double;

// Matrix and vector types related to alignment parameters.
using AlignmentVector =
ActsVector<AlignmentParametersScalar, eAlignmentParametersSize>;
using AlignmentRowVector =
ActsRowVector<AlignmentParametersScalar, eAlignmentParametersSize>;
using AlignmentVector = ActsVector<AlignmentScalar, eAlignmentSize>;
using AlignmentRowVector = ActsRowVector<AlignmentScalar, eAlignmentSize>;
using AlingmentMatrix =
ActsMatrix<AlignmentParametersScalar, eAlignmentParametersSize,
eAlignmentParametersSize>;
ActsMatrix<AlignmentScalar, eAlignmentSize, eAlignmentSize>;
using AlignmentToLocalCartesianMatrix =
ActsMatrix<AlignmentParametersScalar, 3, eAlignmentParametersSize>;
ActsMatrix<AlignmentScalar, 3, eAlignmentSize>;
using AlignmentToBoundMatrix =
ActsMatrix<BoundScalar, eBoundSize, eAlignmentParametersSize>;
ActsMatrix<BoundScalar, eBoundSize, eAlignmentSize>;

} // namespace Acts
6 changes: 3 additions & 3 deletions Core/src/Surfaces/Surface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,14 @@ Acts::AlignmentToBoundMatrix Acts::Surface::alignmentToBoundDerivative(
// -> For bound track parameters eLOC_0, eLOC_1, it's
// loc3DToLocBound*alignToLoc3D +
// jacToLocal*derivatives*alignToPath
alignToBound.block<2, eAlignmentParametersSize>(eLOC_0, eAlignmentCenter0) =
alignToBound.block<2, eAlignmentSize>(eLOC_0, eAlignmentCenter0) =
loc3DToLocBound * alignToLoc3D +
jacToLocal.block<2, eFreeSize>(eLOC_0, eFreePos0) * derivatives *
alignToPath;
// -> For bound track parameters ePHI, eTHETA, eQOP, eT, it's
// jacToLocal*derivatives*alignToPath
alignToBound.block<4, eAlignmentParametersSize>(ePHI, eAlignmentCenter0) =
jacToLocal.block<4, eFreeSize>(ePHI, eFreePos0) * derivatives *
alignToBound.block<4, eAlignmentSize>(eBoundPhi, eAlignmentCenter0) =
jacToLocal.block<4, eFreeSize>(eBoundPhi, eFreePos0) * derivatives *
alignToPath;

return alignToBound;
Expand Down

0 comments on commit f7648cf

Please sign in to comment.