Skip to content

Commit

Permalink
first brush
Browse files Browse the repository at this point in the history
  • Loading branch information
AJPfleger committed Oct 5, 2023
1 parent f2c21c2 commit 6f3b50e
Show file tree
Hide file tree
Showing 59 changed files with 143 additions and 145 deletions.
4 changes: 2 additions & 2 deletions Core/include/Acts/Clusterization/Clusterization.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ namespace Acts::Ccl {
using Label = int;
constexpr Label NO_LABEL = 0;

// When looking for a cell connected to a reference cluster, the the
// code always loops backward, starting from the reference cell. Since
// When looking for a cell connected to a reference cluster, the code
// always loops backward, starting from the reference cell. Since
// the cells are globally sorted column-wise, the connection function
// can therefore tell when the search should be stopped.
enum class ConnectResult {
Expand Down
4 changes: 2 additions & 2 deletions Core/include/Acts/Digitization/DigitizationCell.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ struct DigitizationCell final {
size_t channel1 = 1;
float data = 0.;

// connstruct them
// construct them
DigitizationCell(size_t ch0, size_t ch1, float d = 0.)
: channel0(ch0), channel1(ch1), data(d) {}

/// To merge cells in case they are at the same position
/// @param dc the cell to be added to the current cell
/// @param analogueReadout flag indicating if we have analgue readout
/// @param analogueReadout flag indicating if we have analogue readout
/// @note this function is needed because possible derived classes may
/// calculate the energy deposit differently. Furthermore this allows to apply
/// an energy cut, because the energy deposit can also be stored for digital
Expand Down
2 changes: 1 addition & 1 deletion Core/include/Acts/EventData/Measurement.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ namespace Acts {
/// This means either, that there needs to be an additional variable type or
/// that a pointer to a base object is stored (requiring a `dynamic_cast` later
/// on). Both variants add additional complications. Since the geometry object
/// is not required anyways (as discussed above), not storing it removes all
/// is not required anyway (as discussed above), not storing it removes all
/// these complications altogether.
template <typename indices_t, size_t kSize>
class Measurement {
Expand Down
4 changes: 2 additions & 2 deletions Core/include/Acts/EventData/TrackProxy.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ class TrackProxy {

/// Return a mutable reference to the number of degrees of freedom for the
/// track. Mutable version
/// @return The the number of degrees of freedom
/// @return The number of degrees of freedom
template <bool RO = ReadOnly, typename = std::enable_if_t<!RO>>
unsigned int& nDoF() {
return component<unsigned int>(hashString("ndf"));
Expand Down Expand Up @@ -627,7 +627,7 @@ class TrackProxy {

/// Copy the content of another track proxy into this one
/// @tparam track_proxy_t the other track proxy's type
/// @param other The the track proxy
/// @param other The track proxy
/// @param copyTrackStates Copy the track state sequence from @p other
template <typename track_proxy_t, bool RO = ReadOnly,
typename = std::enable_if_t<!RO>>
Expand Down
2 changes: 1 addition & 1 deletion Core/include/Acts/Geometry/CylinderVolumeBuilder.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ class CylinderVolumeBuilder : public ITrackingVolumeBuilder {
struct Config {
/// The tracking volume helper for construction
std::shared_ptr<const ITrackingVolumeHelper> trackingVolumeHelper = nullptr;
/// The string based indenfication
/// The string based identification
std::string volumeName = "";
/// The world material
std::shared_ptr<const IVolumeMaterial> volumeMaterial = nullptr;
Expand Down
2 changes: 1 addition & 1 deletion Core/include/Acts/Geometry/ITrackingVolumeArrayCreator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class ITrackingVolumeArrayCreator {
/// @param vols are the TrackingVolumes ordered in a tracker
/// @param bVal is the binning value for the volume binning
///
/// @return sahred pointer to a new TrackingVolumeArray
/// @return shared pointer to a new TrackingVolumeArray
virtual std::shared_ptr<const TrackingVolumeArray> trackingVolumeArray(
const GeometryContext& gctx, const TrackingVolumeVector& vols,
BinningValue bVal) const = 0;
Expand Down
8 changes: 4 additions & 4 deletions Core/include/Acts/Geometry/LayerCreator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ using MutableLayerPtr = std::shared_ptr<Layer>;

/// @class LayerCreator
///
/// The LayerCreator is able to build cylinde,r disc layers or plane layers from
/// The LayerCreator is able to build cylinder disc layers or plane layers from
/// detector elements
///
class LayerCreator {
Expand All @@ -46,9 +46,9 @@ class LayerCreator {
struct Config {
/// surface array helper
std::shared_ptr<const SurfaceArrayCreator> surfaceArrayCreator = nullptr;
/// cylinder module z tolerance : it counts at same z, if ...
/// cylinder module z tolerance: it counts as same z, if ...
double cylinderZtolerance{10.};
/// cylinder module phi tolerance : it counts at same phi, if ...
/// cylinder module phi tolerance: it counts as same phi, if ...
double cylinderPhiTolerance{0.1};
/// standard constructor
Config() = default;
Expand Down Expand Up @@ -203,7 +203,7 @@ class LayerCreator {
/// @param newLogger the logger instance
void setLogger(std::unique_ptr<const Logger> newLogger);

// associate surfaces contained by this layer to this layer
/// associate surfaces contained by this layer to this layer
void associateSurfacesToLayer(Layer& layer) const;

private:
Expand Down
4 changes: 2 additions & 2 deletions Core/include/Acts/Navigation/DetectorNavigator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ class DetectorNavigator {

/// Initialize call - start of propagation
///
/// @tparam propagator_state_t The state type of the propagagor
/// @tparam propagator_state_t The state type of the propagator
/// @tparam stepper_t The type of stepper used for the propagation
///
/// @param [in,out] state is the propagation state object
Expand Down Expand Up @@ -379,7 +379,7 @@ class DetectorNavigator {
/// - attempted volume switch
/// Target finding by association will not be done again
///
/// @tparam propagator_state_t The state type of the propagagor
/// @tparam propagator_state_t The state type of the propagator
/// @tparam stepper_t The type of stepper used for the propagation
///
/// @param [in,out] state is the propagation state object
Expand Down
2 changes: 1 addition & 1 deletion Core/include/Acts/Propagator/AtlasStepper.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <cmath>
#include <functional>

// This is based original stepper code from the ATLAS RungeKuttePropagagor
// This is based original stepper code from the ATLAS RungeKuttePropagator
namespace Acts {

/// @brief the AtlasStepper implementation for the
Expand Down
2 changes: 1 addition & 1 deletion Core/include/Acts/Propagator/DirectNavigator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ class DirectNavigator {

/// @brief Initialize call - start of propagation
///
/// @tparam propagator_state_t The state type of the propagagor
/// @tparam propagator_state_t The state type of the propagator
/// @tparam stepper_t The type of stepper used for the propagation
///
/// @param [in,out] state is the propagation state object
Expand Down
2 changes: 1 addition & 1 deletion Core/include/Acts/Propagator/MaterialInteractor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ struct MaterialInteractor {
/// multiple scattering and energy loss is applied according to the
/// configuration.
///
/// @tparam propagator_state_t is the type of Propagagor state
/// @tparam propagator_state_t is the type of Propagator state
/// @tparam stepper_t Type of the stepper of the propagation
/// @tparam navigator_t Type of the navigator of the propagation
///
Expand Down
22 changes: 11 additions & 11 deletions Core/include/Acts/Propagator/Navigator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ class Navigator {

/// @brief Initialize call - start of propagation
///
/// @tparam propagator_state_t The state type of the propagagor
/// @tparam propagator_state_t The state type of the propagator
/// @tparam stepper_t The type of stepper used for the propagation
///
/// @param [in,out] state is the propagation state object
Expand Down Expand Up @@ -575,9 +575,9 @@ class Navigator {
/// If there are surfaces to be handled, check if the current
/// state is on the surface
///
/// @tparam propagator_state_t The state type of the propagagor
/// @tparam propagator_state_t The state type of the propagator
/// @tparam stepper_t The type of stepper used for the propagation
/// @tparam navigation_surfaces_t Type of the propagagor
/// @tparam navigation_surfaces_t Type of the propagator
///
/// @param [in,out] state is the propagation state object
/// @param [in] stepper Stepper in use
Expand Down Expand Up @@ -622,7 +622,7 @@ class Navigator {
/// then return with updated step size
/// - if an intersect is not valid, switch to next
///
/// @tparam propagator_state_t The state type of the propagagor
/// @tparam propagator_state_t The state type of the propagator
/// @tparam stepper_t The type of stepper used for the propagation
///
/// @param [in,out] state is the propagation state object
Expand Down Expand Up @@ -739,7 +739,7 @@ class Navigator {
/// If we unpack a surface, the step size is set to the path length
/// to the first surface, as determined by straight line intersect.
///
/// @tparam propagator_state_t The state type of the propagagor
/// @tparam propagator_state_t The state type of the propagator
/// @tparam stepper_t The type of stepper used for the propagation
///
/// @param [in,out] state is the propagation state object
Expand Down Expand Up @@ -912,7 +912,7 @@ class Navigator {
/// line intersect is found, the boundary surface is skipped.
/// If we are out of boundary surfaces, the navigation is terminated.
///
/// @tparam propagator_state_t The state type of the propagagor
/// @tparam propagator_state_t The state type of the propagator
/// @tparam stepper_t The type of stepper used for the propagation
///
/// @param [in,out] state is the propagation state object
Expand Down Expand Up @@ -1046,7 +1046,7 @@ class Navigator {
/// - attempted volume switch
/// Target finding by association will not be done again
///
/// @tparam propagator_state_t The state type of the propagagor
/// @tparam propagator_state_t The state type of the propagator
/// @tparam stepper_t The type of stepper used for the propagation
///
/// @param [in,out] state is the propagation state object
Expand Down Expand Up @@ -1117,7 +1117,7 @@ class Navigator {

/// @brief Resolve the surfaces of this layer
///
/// @tparam propagator_state_t The state type of the propagagor
/// @tparam propagator_state_t The state type of the propagator
/// @tparam stepper_t The type of stepper used for the propagation
///
/// @param [in,out] state is the propagation state object
Expand Down Expand Up @@ -1200,7 +1200,7 @@ class Navigator {
/// This initializes the layer candidates when starting
/// or when entering a new volume
///
/// @tparam propagator_state_t The state type of the propagagor
/// @tparam propagator_state_t The state type of the propagator
/// @tparam stepper_t The type of stepper used for the propagation
///
/// @param [in,out] state is the propagation state object
Expand Down Expand Up @@ -1279,7 +1279,7 @@ class Navigator {
/// This checks if a navigation break had been triggered or navigator
/// is misconfigured
///
/// @tparam propagator_state_t The state type of the propagagor
/// @tparam propagator_state_t The state type of the propagator
/// @tparam stepper_t The type of stepper used for the propagation
///
/// @param [in,out] state is the propagation state object
Expand All @@ -1292,7 +1292,7 @@ class Navigator {
if (!m_cfg.trackingGeometry) {
return true;
}
// turn the navigator into void when you are intructed to do nothing
// turn the navigator into void when you are instructed to do nothing
if (!m_cfg.resolveSensitive && !m_cfg.resolveMaterial &&
!m_cfg.resolvePassive) {
return true;
Expand Down
26 changes: 13 additions & 13 deletions Core/include/Acts/TrackFinding/CombinatorialKalmanFilter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,11 @@ struct CombinatorialKalmanFilterResult {
std::vector<typename traj_t::TrackStateProxy> trackStateCandidates;

// This is the indices of the 'tip' of the tracks stored in multitrajectory.
// This correspond to the last measurement state in the multitrajectory.
// This corresponds to the last measurement state in the multitrajectory.
std::vector<MultiTrajectoryTraits::IndexType> lastMeasurementIndices;

// This is the indices of the 'tip' of the tracks stored in multitrajectory.
// This correspond to the last state in the multitrajectory.
// This corresponds to the last state in the multitrajectory.
std::vector<MultiTrajectoryTraits::IndexType> lastTrackIndices;

// The Parameters at the provided surface for separate tracks
Expand Down Expand Up @@ -347,7 +347,7 @@ class CombinatorialKalmanFilter {

/// @brief CombinatorialKalmanFilter actor operation
///
/// @tparam propagator_state_t Type of the Propagagor state
/// @tparam propagator_state_t Type of the Propagator state
/// @tparam stepper_t Type of the stepper
///
/// @param state is the mutable propagator state object
Expand Down Expand Up @@ -577,9 +577,9 @@ class CombinatorialKalmanFilter {
} // if filtering is done
}

/// @brief Kalman actor operation : reset propagation
/// @brief Kalman actor operation: reset propagation
///
/// @tparam propagator_state_t Type of Propagagor state
/// @tparam propagator_state_t Type of Propagator state
/// @tparam stepper_t Type of the stepper
/// @tparam navigator_t Type of the navigator
///
Expand Down Expand Up @@ -618,12 +618,12 @@ class CombinatorialKalmanFilter {
logger());
}

/// @brief CombinatorialKalmanFilter actor operation :
/// @brief CombinatorialKalmanFilter actor operation:
/// - filtering for all measurement(s) on surface
/// - store selected track states in multiTrajectory
/// - update propagator state to the (last) selected track state
///
/// @tparam propagator_state_t Type of the Propagagor state
/// @tparam propagator_state_t Type of the Propagator state
/// @tparam stepper_t Type of the stepper
/// @tparam navigator_t Type of the navigator
///
Expand Down Expand Up @@ -1017,7 +1017,7 @@ class CombinatorialKalmanFilter {
return Result<void>::success();
}

/// @brief CombinatorialKalmanFilter actor operation : add hole or material track state
/// @brief CombinatorialKalmanFilter actor operation: add a hole or material track state
///
/// @param stateMask The bitmask that instructs which components to allocate
/// @param boundState The bound state on current surface
Expand Down Expand Up @@ -1074,17 +1074,17 @@ class CombinatorialKalmanFilter {
return currentTip;
}

/// @brief CombinatorialKalmanFilter actor operation : material interaction
/// @brief CombinatorialKalmanFilter actor operation: material interaction
///
/// @tparam propagator_state_t is the type of Propagagor state
/// @tparam propagator_state_t is the type of Propagator state
/// @tparam stepper_t Type of the stepper
/// @tparam navigator_t Type of the navigator
///
/// @param surface The surface where the material interaction happens
/// @param state The mutable propagator state object
/// @param stepper The stepper in use
/// @param navigator The navigator in use
/// @param updateStage The materal update stage
/// @param updateStage The material update stage
///
template <typename propagator_state_t, typename stepper_t,
typename navigator_t>
Expand Down Expand Up @@ -1136,9 +1136,9 @@ class CombinatorialKalmanFilter {
}
}

/// @brief Kalman actor operation : finalize
/// @brief Kalman actor operation: finalize
///
/// @tparam propagator_state_t is the type of Propagagor state
/// @tparam propagator_state_t is the type of Propagator state
/// @tparam stepper_t Type of the stepper
/// @tparam navigator_t Type of the navigator
///
Expand Down
2 changes: 1 addition & 1 deletion Core/include/Acts/TrackFitting/BetheHeitlerApprox.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ class AtlasBetheHeitlerApprox {
}

if (PolyDegree != degree) {
throw std::invalid_argument("Wrong wrong polynom order in '" +
throw std::invalid_argument("Wrong polynom order in '" +
filepath + "'");
}

Expand Down
10 changes: 5 additions & 5 deletions Core/include/Acts/TrackFitting/GaussianSumFitter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ struct GaussianSumFitter {

/// The generic implementation of the fit function.
/// TODO check what this function does with the referenceSurface is e.g. the
/// first measuerementSurface
/// first measurementSurface
template <typename source_link_it_t, typename start_parameters_t,
typename fwd_prop_initializer_t, typename bwd_prop_initializer_t,
typename track_container_t, template <typename> class holder_t>
Expand Down Expand Up @@ -223,7 +223,7 @@ struct GaussianSumFitter {
}

// To be able to find measurements later, we put them into a map
// We need to copy input SourceLinks anyways, so the map can own them.
// We need to copy input SourceLinks anyway, so the map can own them.
ACTS_VERBOSE("Preparing " << std::distance(begin, end)
<< " input measurements");
std::map<GeometryIdentifier, SourceLink> inputMeasurements;
Expand All @@ -234,7 +234,7 @@ struct GaussianSumFitter {
}

ACTS_VERBOSE(
"Gsf: Final measuerement map size: " << inputMeasurements.size());
"Gsf: Final measurement map size: " << inputMeasurements.size());

if (sParameters.covariance() == std::nullopt) {
return GsfError::StartParametersHaveNoCovariance;
Expand Down Expand Up @@ -306,7 +306,7 @@ struct GaussianSumFitter {
ACTS_VERBOSE("Finished forward propagation");
ACTS_VERBOSE("- visited surfaces: " << fwdGsfResult.visitedSurfaces.size());
ACTS_VERBOSE("- processed states: " << fwdGsfResult.processedStates);
ACTS_VERBOSE("- measuerement states: " << fwdGsfResult.measurementStates);
ACTS_VERBOSE("- measurement states: " << fwdGsfResult.measurementStates);

std::size_t nInvalidBetheHeitler = fwdGsfResult.nInvalidBetheHeitler;

Expand Down Expand Up @@ -416,7 +416,7 @@ struct GaussianSumFitter {

// TODO should this be warning level? it happens quite often... Investigate!
if (bwdGsfResult.measurementStates != fwdGsfResult.measurementStates) {
ACTS_DEBUG("Fwd and bwd measuerement states do not match");
ACTS_DEBUG("Fwd and bwd measurement states do not match");
}

// Go through the states and assign outliers / unset smoothed if surface not
Expand Down
Loading

0 comments on commit 6f3b50e

Please sign in to comment.