From 03635c1b5b39ceafbe8260585445588295b39014 Mon Sep 17 00:00:00 2001
From: ATS Jenkins <ats.jenkins@cern.ch>
Date: Tue, 18 Oct 2016 09:00:53 +0000
Subject: [PATCH] clang-format: enforce code style [ci-skip]
---
.../ACTS/Detector/DetachedTrackingVolume.hpp | 12 ++--
.../ACTS/Detector/DetectorElementBase.hpp | 17 ++---
.../ACTS/Detector/GlueVolumesDescriptor.hpp | 8 +--
.../ACTS/Detector/TrackingGeometry.hpp | 20 +++---
Core/include/ACTS/Detector/TrackingVolume.hpp | 24 +++----
.../ACTS/Extrapolation/ExtrapolationCell.hpp | 68 +++++++++----------
.../Extrapolation/ExtrapolationEngine.hpp | 8 +--
.../Extrapolation/IExtrapolationEngine.hpp | 3 +-
.../Extrapolation/IMaterialEffectsEngine.hpp | 5 +-
.../IMultipleScatteringUpdator.hpp | 1 -
.../ACTS/Extrapolation/INavigationEngine.hpp | 7 +-
.../ACTS/Extrapolation/IPropagationEngine.hpp | 1 -
.../Extrapolation/MaterialEffectsEngine.hpp | 4 +-
.../ACTS/Extrapolation/RungeKuttaEngine.hpp | 24 +++----
.../ACTS/Extrapolation/StaticEngine.hpp | 10 +--
.../Extrapolation/StaticNavigationEngine.hpp | 14 ++--
Core/include/ACTS/Layers/CylinderLayer.hpp | 1 -
Core/include/ACTS/Layers/DiscLayer.hpp | 1 -
.../ACTS/Layers/GenericApproachDescriptor.hpp | 3 +-
Core/include/ACTS/Layers/Layer.hpp | 30 ++++----
Core/include/ACTS/Layers/NavigationLayer.hpp | 2 +-
Core/include/ACTS/Layers/PlaneLayer.hpp | 1 -
Core/include/ACTS/Surfaces/ConeBounds.hpp | 6 +-
Core/include/ACTS/Surfaces/ConeSurface.hpp | 19 +++---
Core/include/ACTS/Surfaces/CylinderBounds.hpp | 3 +-
.../include/ACTS/Surfaces/CylinderSurface.hpp | 29 ++++----
Core/include/ACTS/Surfaces/DiscBounds.hpp | 2 -
Core/include/ACTS/Surfaces/DiscSurface.hpp | 27 ++++----
Core/include/ACTS/Surfaces/EllipseBounds.hpp | 8 +--
Core/include/ACTS/Surfaces/InfiniteBounds.hpp | 6 +-
Core/include/ACTS/Surfaces/LineBounds.hpp | 1 -
Core/include/ACTS/Surfaces/LineSurface.hpp | 24 ++++---
Core/include/ACTS/Surfaces/PlanarBounds.hpp | 2 -
Core/include/ACTS/Surfaces/PlaneSurface.hpp | 9 ++-
Core/include/ACTS/Surfaces/RadialBounds.hpp | 3 +-
.../ACTS/Surfaces/RealQuadraticEquation.hpp | 2 +-
.../include/ACTS/Surfaces/RectangleBounds.hpp | 1 -
Core/include/ACTS/Surfaces/StrawSurface.hpp | 8 +--
Core/include/ACTS/Surfaces/Surface.hpp | 16 ++---
Core/include/ACTS/Surfaces/SurfaceBounds.hpp | 7 +-
.../include/ACTS/Surfaces/TrapezoidBounds.hpp | 7 +-
Core/include/ACTS/Surfaces/TriangleBounds.hpp | 3 +-
.../ACTS/Tools/CylinderVolumeBuilder.hpp | 8 +--
.../ACTS/Tools/CylinderVolumeHelper.hpp | 45 ++++++------
Core/include/ACTS/Tools/ILayerBuilder.hpp | 1 -
Core/include/ACTS/Tools/ILayerCreator.hpp | 3 +-
.../ACTS/Tools/ISurfaceArrayCreator.hpp | 1 -
.../ACTS/Tools/ITrackingGeometryBuilder.hpp | 1 -
.../Tools/ITrackingVolumeArrayCreator.hpp | 4 +-
.../ACTS/Tools/ITrackingVolumeBuilder.hpp | 2 +-
.../ACTS/Tools/ITrackingVolumeHelper.hpp | 2 +-
Core/include/ACTS/Tools/LayerArrayCreator.hpp | 7 +-
Core/include/ACTS/Tools/LayerCreator.hpp | 16 ++---
.../ACTS/Tools/SurfaceArrayCreator.hpp | 6 +-
.../ACTS/Tools/TrackingGeometryBuilder.hpp | 2 +-
.../ACTS/Tools/TrackingVolumeArrayCreator.hpp | 4 +-
.../ACTS/Utilities/ApproachDescriptor.hpp | 2 -
Core/include/ACTS/Utilities/BinUtility.hpp | 27 ++++----
Core/include/ACTS/Utilities/BinnedArray.hpp | 10 ++-
Core/include/ACTS/Utilities/BinnedArrayXD.hpp | 3 +-
Core/include/ACTS/Utilities/BinningData.hpp | 9 ++-
Core/include/ACTS/Utilities/GeometryID.hpp | 6 +-
.../include/ACTS/Utilities/GeometryObject.hpp | 4 +-
.../ACTS/Utilities/GeometryObjectSorter.hpp | 3 +-
Core/include/ACTS/Utilities/Identifier.hpp | 4 +-
Core/include/ACTS/Utilities/Intersection.hpp | 11 +--
.../include/ACTS/Volumes/BoundarySurfaceT.hpp | 3 +-
.../ACTS/Volumes/CuboidVolumeBounds.hpp | 2 +-
.../ACTS/Volumes/CylinderVolumeBounds.hpp | 8 +--
.../Volumes/DoubleTrapezoidVolumeBounds.hpp | 2 +-
.../ACTS/Volumes/TrapezoidVolumeBounds.hpp | 4 +-
Core/include/ACTS/Volumes/Volume.hpp | 4 +-
Core/include/ACTS/Volumes/VolumeBounds.hpp | 2 -
Core/src/Detector/DetachedTrackingVolume.cpp | 2 +-
Core/src/Layers/Layer.cpp | 9 ++-
Core/src/Utilities/Units.cpp | 2 +-
Examples/src/BuildGenericDetector.cpp | 4 +-
77 files changed, 316 insertions(+), 354 deletions(-)
diff --git a/Core/include/ACTS/Detector/DetachedTrackingVolume.hpp b/Core/include/ACTS/Detector/DetachedTrackingVolume.hpp
index c5dd03fc4..079601537 100644
--- a/Core/include/ACTS/Detector/DetachedTrackingVolume.hpp
+++ b/Core/include/ACTS/Detector/DetachedTrackingVolume.hpp
@@ -87,20 +87,20 @@ public:
clone(std::string name, Transform3D& shift) const;
/// Returns a layer representation
- ///
+ ///
/// @return pointer to a representation as a layer
const Layer*
layerRepresentation() const;
/// Returns (multi)layer representation
- ///
+ ///
/// @return vector to representations as layers
const LayerVector
multilayerRepresentation() const;
/// Sign the volume - the geometry builder has to do that
- ///
- /// @param signat is the volume signature
+ ///
+ /// @param signat is the volume signature
/// @param geotype is the volume navigation type
void
sign(GeometrySignature signat, GeometryType geotype) const;
@@ -117,13 +117,13 @@ public:
/// Set the simplified calculable components
/// @todo check with Sharka
- ///
+ ///
/// @param sonsts are the consituents to be saved
void
saveConstituents(std::vector<std::pair<const Volume*, float>>* consts) const;
/// Get the simplified calculable components
- ///
+ ///
/// @return the consituents
std::vector<std::pair<const Acts::Volume*, float>>*
constituents() const;
diff --git a/Core/include/ACTS/Detector/DetectorElementBase.hpp b/Core/include/ACTS/Detector/DetectorElementBase.hpp
index 655c258d7..785a4a502 100644
--- a/Core/include/ACTS/Detector/DetectorElementBase.hpp
+++ b/Core/include/ACTS/Detector/DetectorElementBase.hpp
@@ -44,19 +44,17 @@ class DetectorElementBase
public:
/// Constructor
DetectorElementBase() {}
-
/// virtual Destructor
virtual ~DetectorElementBase() {}
-
/// Identifier
virtual Identifier
identify() const = 0;
/// Return local to global transform
/// (optionally associated with an identifier)
- ///
+ ///
/// @param identifier is an identifier in case more transform hare held
- ///
+ ///
/// @return is the requested transform of the DetectorElementBase
virtual const Transform3D&
transform(const Identifier& identifier = Identifier()) const = 0;
@@ -64,7 +62,7 @@ public:
/// Return surface association
/// (optionally associated with an identifier)
///
- /// @param identifeir is an identifier in case more surfaces hare held
+ /// @param identifeir is an identifier in case more surfaces hare held
///
/// @return the surface associated with this detector element (and id)
virtual const Surface&
@@ -92,12 +90,14 @@ public:
/// Bin members are elements that are in the same geometric binning cell,
/// such, e.g. backside modules in a doublet/triplet detector
///
- /// @param binmembers are DetectorElementBase objects that are in the same cell
+ /// @param binmembers are DetectorElementBase objects that are in the same
+ /// cell
void
registerBinmembers(std::vector<const DetectorElementBase*>& binmembers) const;
/// Fast access to neighbours
- /// Neighbours are elements that are in an neighbouring geometric binning cell,
+ /// Neighbours are elements that are in an neighbouring geometric binning
+ /// cell,
/// such, e.g. next in phi, next in eta modules
///
/// @return vector of DetectorElementBase pointers
@@ -105,7 +105,8 @@ public:
neighbours() const;
/// Reigster the neighbours
- /// Neighbours are elements that are in an neighbouring geometric binning cell,
+ /// Neighbours are elements that are in an neighbouring geometric binning
+ /// cell,
/// such, e.g. next in phi, next in eta modules
///
/// @param neighbours are DetectorElementBase objects that are neighbours
diff --git a/Core/include/ACTS/Detector/GlueVolumesDescriptor.hpp b/Core/include/ACTS/Detector/GlueVolumesDescriptor.hpp
index 3e92c02bd..5e26c3298 100644
--- a/Core/include/ACTS/Detector/GlueVolumesDescriptor.hpp
+++ b/Core/include/ACTS/Detector/GlueVolumesDescriptor.hpp
@@ -37,7 +37,6 @@ class GlueVolumesDescriptor
public:
/// Constructor
GlueVolumesDescriptor() {}
-
/// Constructor - with arguments
///
/// @param gvs are the glue volume arrays mapped to the volume faces
@@ -47,9 +46,8 @@ public:
/// Desctructor
~GlueVolumesDescriptor() {}
-
/// Register the volumes
- ///
+ ///
/// @param bsf is the boundary surface face where the volume array is attached
/// @param gvs is the array of volumes to be attached
void
@@ -57,11 +55,11 @@ public:
std::shared_ptr<const TrackingVolumeArray> gvs) const;
/// Retrieve the glue volumes
- ///
+ ///
/// @param bsf is the boundary surface face for which you want to get the
/// array
///
- /// @return the shared pointer to the TrackingVolume array
+ /// @return the shared pointer to the TrackingVolume array
std::shared_ptr<const TrackingVolumeArray>
glueVolumes(BoundarySurfaceFace bsf) const;
diff --git a/Core/include/ACTS/Detector/TrackingGeometry.hpp b/Core/include/ACTS/Detector/TrackingGeometry.hpp
index 3e2081107..9e1a73cc2 100644
--- a/Core/include/ACTS/Detector/TrackingGeometry.hpp
+++ b/Core/include/ACTS/Detector/TrackingGeometry.hpp
@@ -95,7 +95,7 @@ public:
/// Forward the associated Layer information
///
/// @param gpos is the global position fo the call
- ///
+ ///
/// @return plain pointer to assocaiated layer
const Layer*
associatedLayer(const Vector3D& gpos) const;
@@ -107,7 +107,7 @@ public:
/// @param tol is the tolerance parameter
///
/// @todo check if this concept is still used
- ///
+ ///
/// @return boolean indicating if this is at a volume boundary
bool
atVolumeBoundary(const Vector3D& gpos,
@@ -115,17 +115,17 @@ public:
double tol) const;
/// Check position at volume boundary + navigation link
- ///
+ ///
/// @param gpos is the global position fo the call
/// @param mom is the momentum fo the call
/// @param vol is the volume to be cheked
/// @param nextVol is the next tracking volume (filled)
- /// @param dir is the propagation direction
+ /// @param dir is the propagation direction
/// @param tol is the tolerance parameter
///
/// @todo check if this concept is still used
- ///
- /// @return boolean indicating if this is at a volume boundary
+ ///
+ /// @return boolean indicating if this is at a volume boundary
bool
atVolumeBoundary(const Vector3D& gpos,
const Vector3D& mom,
@@ -135,8 +135,8 @@ public:
double tol) const;
/// Register the beam tube
- ///
- /// @param beam is the beam line surface
+ ///
+ /// @param beam is the beam line surface
void
registerBeamTube(std::unique_ptr<const PerigeeSurface> beam) const;
@@ -151,8 +151,8 @@ public:
private:
/// Geometry Builder busineess: the geometry builder has to sign
- ///
- /// @param signat is the volume signature
+ ///
+ /// @param signat is the volume signature
/// @param geotype is the volume navigation type
void
sign(GeometrySignature geosit, GeometryType geotype = Static) const;
diff --git a/Core/include/ACTS/Detector/TrackingVolume.hpp b/Core/include/ACTS/Detector/TrackingVolume.hpp
index ba6b7ba9c..d92ed4859 100644
--- a/Core/include/ACTS/Detector/TrackingVolume.hpp
+++ b/Core/include/ACTS/Detector/TrackingVolume.hpp
@@ -186,7 +186,7 @@ public:
///
/// @param gpos is the global position associated with that search
///
- /// @return plain pointer to associated with the position
+ /// @return plain pointer to associated with the position
const TrackingVolume*
trackingVolume(const Vector3D& gpos) const;
@@ -205,7 +205,7 @@ public:
/// Return the dynamically created vector of detached sub volumes
///
/// @param gpos is the glboal position associated with that search
- ///
+ ///
/// @return the list of associated detached tracking volumes, nullptr if it
/// does not exist
const DetachedVolumeVector*
@@ -261,7 +261,7 @@ public:
///
/// @tparam pars is the type of track parameters
///
- /// @return boolean indicator if the parameters are on boundary
+ /// @return boolean indicator if the parameters are on boundary
template <class T>
bool
onVolumeBoundary(const T& pars) const;
@@ -269,7 +269,7 @@ public:
/// Glue another tracking volume to this one
/// - if common face is set the glued volumes are sharing the boundary, down
/// to the last navigation volume
- ///
+ ///
/// @param bsfMine is the boundary face indicater where to glue
/// @param heighbor is the TrackingVolume to be glued
/// @param bsfNeighbor is the boudnary surface of the neighbor
@@ -282,7 +282,7 @@ public:
/// - if common face is set the glued volumes are sharing the boundary, down
/// to the last navigation volume
///
- ///
+ ///
/// @param bsfMine is the boundary face indicater where to glue
/// @param heighbors are the TrackingVolumes to be glued
/// @param bsfNeighbors are the boudnary surface of the neighbors
@@ -293,9 +293,9 @@ public:
/// Provide a new BoundarySurface from the glueing
///
- ///
+ ///
/// @param bsfMine is the boundary face indicater where to glue
- /// @param bsSurface is the new boudnary surface
+ /// @param bsSurface is the new boudnary surface
void
updateBoundarySurface(
BoundarySurfaceFace bsfMine,
@@ -307,7 +307,7 @@ public:
/// - (faces YZ, ZY, radial faces)
/// - positiveFaceXY
///
- /// @param gvd register a new GlueVolumeDescriptor
+ /// @param gvd register a new GlueVolumeDescriptor
/// @todo update to shared/unique ptr
void
registerGlueVolumeDescriptor(GlueVolumesDescriptor* gvd) const;
@@ -321,8 +321,8 @@ public:
glueVolumesDescriptor() const;
/// Sign the volume - the geometry builder has to do that
- ///
- /// @param signat is the volume signature
+ ///
+ /// @param signat is the volume signature
/// @param geotype is the volume navigation type
void
sign(GeometrySignature signat, GeometryType geotype = Static) const;
@@ -390,7 +390,7 @@ protected:
/// @param cVolumeVector is the confined arbitrary volume vector
/// @param dVolumeVector is the confined arbeitrary detached volume vector
/// @param volumeName is a string identifier
- TrackingVolume(std::shared_ptr<Transform3D> htrans,
+ TrackingVolume(std::shared_ptr<Transform3D> htrans,
VolumeBoundsPtr volbounds,
std::shared_ptr<Material> matprop,
std::unique_ptr<const LayerArray> cLayerArray = nullptr,
@@ -419,7 +419,7 @@ private:
/// method to synchronize the layers with potentially updated volume bounds:
/// - adapts the layer dimensions to the new volumebounds + envelope
- ///
+ ///
/// @param envelope is the clearance between volume boundary and layer
void
synchronizeLayers(double envelope = 1.) const;
diff --git a/Core/include/ACTS/Extrapolation/ExtrapolationCell.hpp b/Core/include/ACTS/Extrapolation/ExtrapolationCell.hpp
index 476671d71..e88ec04a1 100644
--- a/Core/include/ACTS/Extrapolation/ExtrapolationCell.hpp
+++ b/Core/include/ACTS/Extrapolation/ExtrapolationCell.hpp
@@ -64,12 +64,9 @@ class ExtrapolationConfig
{
public:
/// Constructor
- ///
+ ///
/// @param eval is the vonfiguration value
- ExtrapolationConfig(unsigned int evalue = 0) : value(evalue)
- {
- }
-
+ ExtrapolationConfig(unsigned int evalue = 0) : value(evalue) {}
/// Copy Constructor
///
/// @param eConfig is the source object for the copy
@@ -89,11 +86,11 @@ public:
}
/// Check the configuration mode
- /// - this checks the bit corresponding to the configuration mode
+ /// - this checks the bit corresponding to the configuration mode
///
/// @param the mode that is to be checks
///
- /// @return boolean indicator if the mode was set
+ /// @return boolean indicator if the mode was set
bool
checkMode(ExtrapolationMode::eMode em) const
{
@@ -121,21 +118,20 @@ public:
SuccessMaterialLimit = 5, // successful : material limit reached
Recovered = 6, // successful : recovered
FailureDestination = 7, // failure : could not reach destination
- FailureLoop = 8, // failure : loop or oscillation between volumes
- FailureNavigation = 9, // failure : general navigation failure
- FailureUpdateKill = 10, // failure : updated track under threshold
- FailureConfiguration = 11, // failure : general configuration failure
- LeftKnownWorld = 12 // successful ? failure ? if we just knew ...
+ FailureLoop = 8, // failure : loop or oscillation between volumes
+ FailureNavigation = 9, // failure : general navigation failure
+ FailureUpdateKill = 10, // failure : updated track under threshold
+ FailureConfiguration = 11, // failure : general configuration failure
+ LeftKnownWorld = 12 // successful ? failure ? if we just knew ...
};
/// the actual code
eCode code;
/// create a simple extrapolation code
- ///
+ ///
/// @param c is the code enum
ExtrapolationCode(eCode c) : code(c) {}
-
/// Assigment operator
///
/// @param ec is the source eCode for the assignment
@@ -180,7 +176,7 @@ public:
return (code > InProgress && code < Recovered);
}
- /// Check return Sucess before destination
+ /// Check return Sucess before destination
/// @return boolean if the extrapolation is successfu
bool
isSuccessBeforeDestination() const
@@ -188,7 +184,7 @@ public:
return (code > SuccessDestination && code < Recovered);
}
- /// Check return Sucess or Recovered
+ /// Check return Sucess or Recovered
/// @return boolean if the extrapolation is successful/recovered
bool
isSuccessOrRecovered() const
@@ -224,11 +220,11 @@ private:
};
/// @class ExtrapolationStep
-///
+///
/// templated class to record the different possible entities during
-/// extrapolation, the newly created objects are unique pointers and
+/// extrapolation, the newly created objects are unique pointers and
/// have to be checked out via std::move() by the client caller
-///
+///
template <class T>
class ExtrapolationStep
{
@@ -256,7 +252,7 @@ public:
float time;
/// Constructor for an extrapolation step
- ///
+ ///
/// @param pars are the parameters of the step
/// @param sf the surface the step is associated to
/// @param eConfig the extrapolation configuration
@@ -283,10 +279,10 @@ public:
};
/// @class ExtrapolationCell
-///
+///
/// templated class as an input-output object of the extrapolation,
/// only public members, since it is a container class
-///
+///
template <class T>
class ExtrapolationCell
{
@@ -426,7 +422,7 @@ public:
}
/// Add a configuration mode
- ///
+ ///
/// @param em is the extrapolation mode to be added
void
addConfigurationMode(ExtrapolationMode::eMode em)
@@ -436,7 +432,7 @@ public:
}
/// Check a configuration mode
- ///
+ ///
/// @param em is the extrapolation mode to be checked
bool
checkConfigurationMode(ExtrapolationMode::eMode em) const
@@ -457,7 +453,7 @@ public:
void
checkoutLastStep();
- /// Fill or attach the parameters from a step
+ /// Fill or attach the parameters from a step
/// - if the surface of the step does not yet exists a new new step
/// is created
/// - if the surface is already in the step vector, the new parameters
@@ -474,7 +470,7 @@ public:
/// - jacobians need to be cleared
/// @param sf the end surface of the step
/// @param pathLength is the path length of this step
- /// @param tjac is the transport jacobian of the step
+ /// @param tjac is the transport jacobian of the step
void
stepTransport(const Surface& sf,
double pathLength = 0.,
@@ -485,27 +481,27 @@ public:
/// is created
/// - if the surface is already in the step vector, the new parameters
/// are atached
- /// - material is just a pointer copy
+ /// - material is just a pointer copy
///
- /// @param sfactor is the scale factor
- /// @param mprot is the material properties associated with the step
+ /// @param sfactor is the scale factor
+ /// @param mprot is the material properties associated with the step
void
addMaterial(double sfactor, const MaterialProperties* mprop = nullptr);
- /// Fill the material
+ /// Fill the material
/// - if the surface of the step does not yet exists a new new step
/// is created
/// - if the surface is already in the step vector, the new parameters
/// are atached
- /// - material is just a pointer copy
+ /// - material is just a pointer copy
///
/// @param step is the step length
- /// @param mat is the material passed
+ /// @param mat is the material passed
void
addMaterial(double step, const Material* mat = nullptr);
/// fill or attach material, jacobian, step length
- /// - material is just a pointer copy
+ /// - material is just a pointer copy
///
/// @param sf is the surface of the step
/// @param lay is the layer associated to this step
@@ -570,8 +566,8 @@ public:
void
restartAtDestination();
- /// Set ParticleType
- ///
+ /// Set ParticleType
+ ///
/// @param hypo is the particle type
void
setParticleType(const ParticleType& hypo)
@@ -579,7 +575,7 @@ public:
particleType = hypo;
}
- /// Estimate the radial direction of the extrapolation cell
+ /// Estimate the radial direction of the extrapolation cell
void
setRadialDirection()
{
diff --git a/Core/include/ACTS/Extrapolation/ExtrapolationEngine.hpp b/Core/include/ACTS/Extrapolation/ExtrapolationEngine.hpp
index 6b5be52ca..953f869a8 100644
--- a/Core/include/ACTS/Extrapolation/ExtrapolationEngine.hpp
+++ b/Core/include/ACTS/Extrapolation/ExtrapolationEngine.hpp
@@ -83,7 +83,7 @@ public:
using IExtrapolationEngine::extrapolate;
/// Charged extrapolation - public interface
- ///
+ ///
/// @param ecCharged is the charged extrapolation cell that holds the cache
/// @param sf is the (optional) destinaton surface
/// @param bchk is the boudnary check directive @todo shift to cell after
@@ -110,13 +110,13 @@ public:
/// define for which geometry type this extrapolator is valid
/// - this is GLOBAL
- /// @return the Geometry type for navigation
+ /// @return the Geometry type for navigation
GeometryType
geometryType() const final;
/// Set configuration method
///
- /// @param eeConfig is the configuration struct
+ /// @param eeConfig is the configuration struct
void
setConfiguration(const Config& eeConfig);
@@ -126,7 +126,7 @@ public:
/// Set logging instance
///
- /// @param logger is the logging instance
+ /// @param logger is the logging instance
void
setLogger(std::unique_ptr<Logger> logger);
diff --git a/Core/include/ACTS/Extrapolation/IExtrapolationEngine.hpp b/Core/include/ACTS/Extrapolation/IExtrapolationEngine.hpp
index 62050e8c9..98d2eb08c 100644
--- a/Core/include/ACTS/Extrapolation/IExtrapolationEngine.hpp
+++ b/Core/include/ACTS/Extrapolation/IExtrapolationEngine.hpp
@@ -40,7 +40,6 @@ class IExtrapolationEngine
public:
/// Virtual destructor
virtual ~IExtrapolationEngine() {}
-
/// Main extrapolation method, templated to chared/neutral
///
/// @tparam eCell ist he extrapolaiton cell
@@ -56,7 +55,7 @@ public:
const BoundaryCheck& bcheck = true) const = 0;
/// Main extrapolation method, templated to chared/neutral
- ///
+ ///
/// @tparam eCell ist he extrapolaiton cell
/// @param sf is the (optional) destinaton surface
/// @param dir is the additional direction prescription
diff --git a/Core/include/ACTS/Extrapolation/IMaterialEffectsEngine.hpp b/Core/include/ACTS/Extrapolation/IMaterialEffectsEngine.hpp
index 95ebe37fe..7909c209d 100644
--- a/Core/include/ACTS/Extrapolation/IMaterialEffectsEngine.hpp
+++ b/Core/include/ACTS/Extrapolation/IMaterialEffectsEngine.hpp
@@ -37,9 +37,8 @@ class IMaterialEffectsEngine
public:
/// Virtual destructor
virtual ~IMaterialEffectsEngine() {}
-
/// Public charged material effects interface
- ///
+ ///
/// @param ecCharged is the charged extrapolaiton cell
/// @param dir is the additional direction prescription
/// @param matupstage is the update stage (pre/full/post)
@@ -51,7 +50,7 @@ public:
MaterialUpdateStage matupstage = fullUpdate) const = 0;
/// Public neutral material effects interface
- ///
+ ///
/// @param ecCharged is the neutral extrapolaiton cell
/// @param dir is the additional direction prescription
/// @param matupstage is the update stage (pre/full/post)
diff --git a/Core/include/ACTS/Extrapolation/IMultipleScatteringUpdator.hpp b/Core/include/ACTS/Extrapolation/IMultipleScatteringUpdator.hpp
index 5679c391f..d8d5f857e 100644
--- a/Core/include/ACTS/Extrapolation/IMultipleScatteringUpdator.hpp
+++ b/Core/include/ACTS/Extrapolation/IMultipleScatteringUpdator.hpp
@@ -26,7 +26,6 @@ class IMultipleScatteringUpdator
public:
/// Virtual destructor
virtual ~IMultipleScatteringUpdator() {}
-
/// Calculate the sigma on theta introduced by multiple scattering
///
/// @param mat are the material properties for this update
diff --git a/Core/include/ACTS/Extrapolation/INavigationEngine.hpp b/Core/include/ACTS/Extrapolation/INavigationEngine.hpp
index be6795ee3..679c72a84 100644
--- a/Core/include/ACTS/Extrapolation/INavigationEngine.hpp
+++ b/Core/include/ACTS/Extrapolation/INavigationEngine.hpp
@@ -35,7 +35,6 @@ class INavigationEngine
public:
/// Virtual destructor
virtual ~INavigationEngine() {}
-
/// Resolve the boundary situation - for charged particles
///
/// @param ecCell is the charged extrapolation cell
@@ -50,7 +49,7 @@ public:
///
/// @param ecCell is the neutral extrapolation cell
/// @param dir is the additional direction prescription
- ///
+ ///
/// @return is a extrapolation code indication
virtual ExtrapolationCode
resolveBoundary(ExCellNeutral& enCell,
@@ -62,7 +61,7 @@ public:
/// @param dir is the additional direction prescription
///
/// @todo check with sharka where this is used
- ///
+ ///
/// @return is a extrapolation code indication
virtual ExtrapolationCode
resolvePosition(ExCellCharged& ecCell,
@@ -75,7 +74,7 @@ public:
/// @param dir is the additional direction prescription
///
/// @todo check with sharka where this is used
- ///
+ ///
/// @return is a extrapolation code indication
virtual ExtrapolationCode
resolvePosition(ExCellNeutral& enCell,
diff --git a/Core/include/ACTS/Extrapolation/IPropagationEngine.hpp b/Core/include/ACTS/Extrapolation/IPropagationEngine.hpp
index 0c68b6769..3adf2ba96 100644
--- a/Core/include/ACTS/Extrapolation/IPropagationEngine.hpp
+++ b/Core/include/ACTS/Extrapolation/IPropagationEngine.hpp
@@ -39,7 +39,6 @@ class IPropagationEngine
public:
/// Virtual destructor
virtual ~IPropagationEngine() {}
-
/// Main Charged extrapolation method
///
/// @param ecCell is the charged extrapolation cell
diff --git a/Core/include/ACTS/Extrapolation/MaterialEffectsEngine.hpp b/Core/include/ACTS/Extrapolation/MaterialEffectsEngine.hpp
index 3dc3eb6a8..e8052b804 100644
--- a/Core/include/ACTS/Extrapolation/MaterialEffectsEngine.hpp
+++ b/Core/include/ACTS/Extrapolation/MaterialEffectsEngine.hpp
@@ -80,7 +80,7 @@ public:
MaterialUpdateStage matupstage = fullUpdate) const final;
/// Public neutral material effects interface
- ///
+ ///
/// @param ecCharged is the neutral extrapolaiton cell
/// @param dir is the additional direction prescription
/// @param matupstage is the update stage (pre/full/post)
@@ -93,7 +93,7 @@ public:
/// Set configuration method
///
- /// @param meConfig is the configuraiton to be set
+ /// @param meConfig is the configuraiton to be set
void
setConfiguration(const Config& meConfig);
diff --git a/Core/include/ACTS/Extrapolation/RungeKuttaEngine.hpp b/Core/include/ACTS/Extrapolation/RungeKuttaEngine.hpp
index 39d1e999e..8a48e964a 100644
--- a/Core/include/ACTS/Extrapolation/RungeKuttaEngine.hpp
+++ b/Core/include/ACTS/Extrapolation/RungeKuttaEngine.hpp
@@ -217,7 +217,7 @@ public:
bool returnCurvilinear = true) const final;
/// Main Neutral extrapolation method
- ///
+ ///
/// @param ecCell is the neutral extrapolation cell
/// @param sf is the destination surface
/// @param dir is the additional direction prescription
@@ -241,7 +241,7 @@ public:
/// Set configuration method
///
- /// @param rkConfig the runge kutta configuration object to be set
+ /// @param rkConfig the runge kutta configuration object to be set
void
setConfiguration(const Config& rkConfig);
@@ -270,10 +270,10 @@ private:
std::unique_ptr<Logger> m_logger;
/// Templated RungeKutta propagation method - charged/neutral
- ///
+ ///
/// @param eCell the extrapolation cell that holds the configuration
- /// @param pCache the progation chache
- /// @tparam tParameters the parameters
+ /// @param pCache the progation chache
+ /// @tparam tParameters the parameters
/// @param sf the destination surace
template <class T>
bool
@@ -283,11 +283,11 @@ private:
const Surface& sf) const;
/// Internal RungeKutta propagation method for propation with jacobian
- ///
+ ///
/// @param navigationStep the step parameter for screen output
- /// @param pCache the progation chache
+ /// @param pCache the progation chache
/// @param surfaceType an integer to indicate which surface type is presen
- /// @param sVector a double array holding propagation information
+ /// @param sVector a double array holding propagation information
bool
propagateWithJacobian(int navigationStep,
PropagationCache& pCache,
@@ -297,7 +297,7 @@ private:
/// Propagation methods runge kutta step - returns the step length
///
/// @param navigationStep the step parameter for screen output
- /// @param pCache the progation chache
+ /// @param pCache the progation chache
double
rungeKuttaStep(int navigationStep,
PropagationCache& pCache,
@@ -307,7 +307,7 @@ private:
/// Propagation methods runge kutta step - returns the step length
///
/// @param navigationStep the step parameter for screen output
- /// @param pCache the progation chache
+ /// @param pCache the progation chache
double
rungeKuttaStepWithGradient(int navigationStep,
PropagationCache& pCache,
@@ -317,13 +317,13 @@ private:
/// Propagation methods straight line step
///
/// @param navigationStep the step parameter for screen output
- /// @param pCache the progation chache
+ /// @param pCache the progation chache
double
straightLineStep(int navigationStep, PropagationCache& pCache, double) const;
/// Step estimator with directions correction
///
- /// @param pCache the progation chache
+ /// @param pCache the progation chache
double
stepEstimatorWithCurvature(PropagationCache& pCache,
int,
diff --git a/Core/include/ACTS/Extrapolation/StaticEngine.hpp b/Core/include/ACTS/Extrapolation/StaticEngine.hpp
index 4b1b9e505..c87921091 100644
--- a/Core/include/ACTS/Extrapolation/StaticEngine.hpp
+++ b/Core/include/ACTS/Extrapolation/StaticEngine.hpp
@@ -211,10 +211,10 @@ private:
/// splitting
/// @param hasSubStructure is an indicator whether the layer has sub structure
/// which needs to be resolved
- /// @param isStartLayer is and indicator whether the layer
- /// is the start layer
- /// @param isDestinationLayer is and indicator whether the layer
- /// is the destination layer
+ /// @param isStartLayer is and indicator whether the layer
+ /// is the start layer
+ /// @param isDestinationLayer is and indicator whether the layer
+ /// is the destination layer
///
/// @return is a extrapolation code indication
template <class T>
@@ -229,7 +229,7 @@ private:
/// Handle the failure - as configured
///
- /// @param eCode is the extrapolation code at entry
+ /// @param eCode is the extrapolation code at entry
/// @tparam eCell ist he extrapolaiton cell
/// @param sf is the (optional) destinaton surface
/// @param dir is the additional direction prescription
diff --git a/Core/include/ACTS/Extrapolation/StaticNavigationEngine.hpp b/Core/include/ACTS/Extrapolation/StaticNavigationEngine.hpp
index 376aaec31..caa3c25c0 100644
--- a/Core/include/ACTS/Extrapolation/StaticNavigationEngine.hpp
+++ b/Core/include/ACTS/Extrapolation/StaticNavigationEngine.hpp
@@ -112,7 +112,7 @@ public:
/// Set configuration method
///
- /// @param snConfig the configuration object to be set
+ /// @param snConfig the configuration object to be set
void
setConfiguration(const Config& snConfig);
@@ -142,7 +142,7 @@ private:
/// Resolve the boundary situation
///
- /// @param eCell the extrapolation
+ /// @param eCell the extrapolation
/// @param dir the propagation direction
///
/// @return is a extrapolation code indication
@@ -153,9 +153,9 @@ private:
/// Resolve position
///
- /// @param eCell the extrapolation
+ /// @param eCell the extrapolation
/// @param dir the propagation direction
- /// @param noLoop @todo check with sharka
+ /// @param noLoop @todo check with sharka
///
/// @return is a extrapolation code indication
template <class T>
@@ -166,10 +166,10 @@ private:
/// Deal with the boundary Surface - called by resolveBoundary
///
- /// @param eCell the extrapolation
- /// @paramn bSurfaceTV the boundary surface
+ /// @param eCell the extrapolation
+ /// @paramn bSurfaceTV the boundary surface
/// @param dir the propagation direction
- /// @param noLoop @todo check with sharka
+ /// @param noLoop @todo check with sharka
///
/// @return is a extrapolation code indication
template <class T>
diff --git a/Core/include/ACTS/Layers/CylinderLayer.hpp b/Core/include/ACTS/Layers/CylinderLayer.hpp
index 412859c67..554fa3569 100644
--- a/Core/include/ACTS/Layers/CylinderLayer.hpp
+++ b/Core/include/ACTS/Layers/CylinderLayer.hpp
@@ -100,7 +100,6 @@ public:
/// Destructor
virtual ~CylinderLayer() {}
-
/// Transforms the layer into a Surface representation
/// This is for positioning and extrapolation
const CylinderSurface&
diff --git a/Core/include/ACTS/Layers/DiscLayer.hpp b/Core/include/ACTS/Layers/DiscLayer.hpp
index 3a2169407..46a406475 100644
--- a/Core/include/ACTS/Layers/DiscLayer.hpp
+++ b/Core/include/ACTS/Layers/DiscLayer.hpp
@@ -101,7 +101,6 @@ public:
/// Destructor
virtual ~DiscLayer() {}
-
/// Transforms the layer into a Surface representation for extrapolation
/// @return This method returns a surface reference
const DiscSurface&
diff --git a/Core/include/ACTS/Layers/GenericApproachDescriptor.hpp b/Core/include/ACTS/Layers/GenericApproachDescriptor.hpp
index 3b3cc63e1..81a1633e8 100644
--- a/Core/include/ACTS/Layers/GenericApproachDescriptor.hpp
+++ b/Core/include/ACTS/Layers/GenericApproachDescriptor.hpp
@@ -55,9 +55,8 @@ public:
/// A generic approach descriptor with n surfaces to test
~GenericApproachDescriptor() {}
-
/// register the Layer to the surfaces
- ///
+ ///
/// @param lay is the layer to be registerd
void
registerLayer(const Layer& lay) override;
diff --git a/Core/include/ACTS/Layers/Layer.hpp b/Core/include/ACTS/Layers/Layer.hpp
index 2cd354344..badec4b1a 100644
--- a/Core/include/ACTS/Layers/Layer.hpp
+++ b/Core/include/ACTS/Layers/Layer.hpp
@@ -188,7 +188,7 @@ public:
/// @param searchType is the level of depth for the search
/// @param startSurface is an (optional) start surface for the search:
/// excluded in return
- /// @param endSurface is an (optional) end surface for the search: excluded in
+ /// @param endSurface is an (optional) end surface for the search: excluded in
/// return
/// @ice is a (future) compatibility estimator that could be used to modify
/// the straight line approach
@@ -246,10 +246,10 @@ public:
/// (a) only when required to resolve sub surfaces for sensitive hits
/// (b) also material is ordered with sub structure
///
- /// @param resolveSensitive is a directive whether
+ /// @param resolveSensitive is a directive whether
/// one should look for sensitive surfaces in the surface array
///
- /// @return bollean that indicates if sub structure exitst
+ /// @return bollean that indicates if sub structure exitst
virtual bool
hasSubStructure(bool resolveSensitive = false) const;
@@ -257,7 +257,7 @@ public:
// - checks if any of the layer surfaces has material:
// - can be approach surfaces or layer surface
///
- /// @return bollean that indicates if material exists
+ /// @return bollean that indicates if material exists
virtual bool
hasMaterial() const;
@@ -307,7 +307,7 @@ public:
enclosingDetachedTrackingVolume() const;
/// register Volume associated to the layer - if you want to do that by hand
- ///
+ ///
/// @param avol is the provided volume
void
registerRepresentingVolume(const AbstractVolume* avol) const;
@@ -343,7 +343,7 @@ protected:
/// get compatible surfaces starting from charged parameters - forward call
/// from explicit methods
- ///
+ ///
/// @param cSurfaces are the retrun surface intersections
/// @tparam pars are the (charged) track parameters for the search
/// @param pdir is the propagation direction prescription
@@ -353,12 +353,12 @@ protected:
/// @param searchType is the level of depth for the search
/// @param startSurface is an (optional) start surface for the search:
/// excluded in return
- /// @param endSurface is an (optional) end surface for the search: excluded in
+ /// @param endSurface is an (optional) end surface for the search: excluded in
/// return
/// @ice is a (future) compatibility estimator that could be used to modify
/// the straight line approach
///
- /// @return boolean that indicates if a compatible surface exists at all
+ /// @return boolean that indicates if a compatible surface exists at all
template <class T>
bool
getCompatibleSurfaces(std::vector<SurfaceIntersection>& cSurfaces,
@@ -368,12 +368,12 @@ protected:
bool collectSensitive,
bool collectPassive,
int searchType,
- const Surface* startSurface = nullptr,
- const Surface* endSurface = nullptr,
- const ICompatibilityEstimator* ice = nullptr) const;
+ const Surface* startSurface = nullptr,
+ const Surface* endSurface = nullptr,
+ const ICompatibilityEstimator* ice = nullptr) const;
/// test compatible surface - checking directly for intersection & collection
- ///
+ ///
/// geometrical test compatible surface method
/// @param cSurfaces are the retrun surface intersections
/// @param gpos is the resolved global position
@@ -385,12 +385,12 @@ protected:
/// @param searchType is the level of depth for the search
/// @param startSurface is an (optional) start surface for the search:
/// excluded in return
- /// @param endSurface is an (optional) end surface for the search: excluded in
+ /// @param endSurface is an (optional) end surface for the search: excluded in
/// return
/// @ice is a (future) compatibility estimator that could be used to modify
/// the straight line approach
///
- /// @return boolean that indicates if a compatible surface exists at all
+ /// @return boolean that indicates if a compatible surface exists at all
void
testCompatibleSurface(std::vector<SurfaceIntersection>& cSurfaces,
const Surface& surface,
@@ -420,7 +420,7 @@ protected:
/// private method to set the enclosed detached TV,
/// called by friend class only
- ///
+ ///
/// @param dtvol is the detached tracking volume the layer is confined
void
encloseDetachedTrackingVolume(const DetachedTrackingVolume& tvol) const;
diff --git a/Core/include/ACTS/Layers/NavigationLayer.hpp b/Core/include/ACTS/Layers/NavigationLayer.hpp
index 960ede5c1..6f00bb19c 100644
--- a/Core/include/ACTS/Layers/NavigationLayer.hpp
+++ b/Core/include/ACTS/Layers/NavigationLayer.hpp
@@ -97,7 +97,7 @@ public:
protected:
/// Private Constructor
/// - this is called by the creat(args*) method
- /// passed spacer layer if needed
+ /// passed spacer layer if needed
///
/// @param surfaceRepresentation is the surface of the layer
/// @param thickness ithe layer thickness
diff --git a/Core/include/ACTS/Layers/PlaneLayer.hpp b/Core/include/ACTS/Layers/PlaneLayer.hpp
index f888dad1e..372779342 100644
--- a/Core/include/ACTS/Layers/PlaneLayer.hpp
+++ b/Core/include/ACTS/Layers/PlaneLayer.hpp
@@ -87,7 +87,6 @@ public:
/// Destructor
virtual ~PlaneLayer() {}
-
/// Transforms the layer into a Surface representation for extrapolation
/// @return returns a reference to a PlaneSurface
const PlaneSurface&
diff --git a/Core/include/ACTS/Surfaces/ConeBounds.hpp b/Core/include/ACTS/Surfaces/ConeBounds.hpp
index 7bc205242..e271afe39 100644
--- a/Core/include/ACTS/Surfaces/ConeBounds.hpp
+++ b/Core/include/ACTS/Surfaces/ConeBounds.hpp
@@ -53,7 +53,8 @@ public:
/// @param alpha is the opening angle of the cone
/// @param symm is the boolean indicating if the cone is symmetric in +/- z
/// @param halfphi is the half opening angle (default is pi)
- /// @param avphi is the phi value around which the bounds are opened (default=0)
+ /// @param avphi is the phi value around which the bounds are opened
+ /// (default=0)
ConeBounds(double alpha, bool symm, double halfphi = M_PI, double avphi = 0.);
/// Constructor - open cone with alpha, minz and maxz, by
@@ -63,7 +64,8 @@ public:
/// @param zmin cone expanding from minimal z
/// @param zmax cone expanding to maximal z
/// @param halfphi is the half opening angle (default is pi)
- /// @param avphi is the phi value around which the bounds are opened (default=0)
+ /// @param avphi is the phi value around which the bounds are opened
+ /// (default=0)
ConeBounds(double alpha,
double zmin,
double zmax,
diff --git a/Core/include/ACTS/Surfaces/ConeSurface.hpp b/Core/include/ACTS/Surfaces/ConeSurface.hpp
index f503325bf..3030de1c0 100644
--- a/Core/include/ACTS/Surfaces/ConeSurface.hpp
+++ b/Core/include/ACTS/Surfaces/ConeSurface.hpp
@@ -47,7 +47,7 @@ public:
bool symmetric = false);
/// Constructor form HepTransform and an opening angle
- ///
+ ///
/// @param htrans is the transform that places the cone in the global frame
/// @param alpha is the opening angle of the cone
/// @param locZmin is the z range over which the cone spans
@@ -60,7 +60,7 @@ public:
double halfPhi = M_PI);
/// Constructor from HepTransform and ConeBounds
- ///
+ ///
/// @param htrans is the transform that places the cone in the global frame
/// @param cbounds is the boundary class, the bounds must exit
ConeSurface(std::shared_ptr<Transform3D> htrans,
@@ -111,8 +111,9 @@ public:
/// Return the measurement frame - this is needed for alignment, in particular
/// for StraightLine and Perigee Surface
/// - the default implementation is the the RotationMatrix3D of the transform
- ///
- /// @param gpos is the global position where the measurement frame is constructed
+ ///
+ /// @param gpos is the global position where the measurement frame is
+ /// constructed
/// @param mom is the momentum used for the measurement frame construction
///
/// @return matrix that indicates the measurement frame
@@ -158,11 +159,11 @@ public:
Vector3D& gpos) const override;
/// Global to local transfomration
- ///
+ ///
/// @param gpos is the global position to be transformed
/// @param mom is the global momentum (ignored in this operation)
/// @param lpos is hte local position to be filled
- ///
+ ///
/// @return is a boolean indicating if the transformation succeeded
virtual bool
globalToLocal(const Vector3D& gpos,
@@ -217,11 +218,11 @@ public:
const BoundaryCheck& bchk = false) const override;
/// the pathCorrection for derived classes with thickness
- ///
+ ///
/// @param gpos is the global potion at the correction point
/// @param mom is the momentum at the correction point
///
- /// @return is the path correction due to incident angle
+ /// @return is the path correction due to incident angle
virtual double
pathCorrection(const Vector3D& gpos, const Vector3D& mom) const override;
@@ -260,7 +261,7 @@ inline const Vector3D
ConeSurface::normal(const Vector3D& gpos) const
{
// get it into the cylinder frame if needed
- // @todo respect opening angle
+ // @todo respect opening angle
Vector3D pos3D = gpos;
if (m_transform || m_associatedDetElement) {
pos3D = transform().inverse() * gpos;
diff --git a/Core/include/ACTS/Surfaces/CylinderBounds.hpp b/Core/include/ACTS/Surfaces/CylinderBounds.hpp
index a42dc784c..fa38851db 100644
--- a/Core/include/ACTS/Surfaces/CylinderBounds.hpp
+++ b/Core/include/ACTS/Surfaces/CylinderBounds.hpp
@@ -76,7 +76,6 @@ public:
///
/// @param cylbo is the source object
CylinderBounds(const CylinderBounds& cylbo) : SurfaceBounds(cylbo) {}
-
/// Destructor
virtual ~CylinderBounds();
@@ -111,7 +110,7 @@ public:
///
/// @param pos is the position in the cylinder frame
/// @param bchk is the boundary check directive
- ///
+ ///
/// return boolean indicator for operation success
bool
inside3D(const Vector3D& pos, const BoundaryCheck& bchk = true) const;
diff --git a/Core/include/ACTS/Surfaces/CylinderSurface.hpp b/Core/include/ACTS/Surfaces/CylinderSurface.hpp
index 7ad2c6336..a0ba836d9 100644
--- a/Core/include/ACTS/Surfaces/CylinderSurface.hpp
+++ b/Core/include/ACTS/Surfaces/CylinderSurface.hpp
@@ -47,7 +47,7 @@ public:
double hlength);
/// Constructor from Transform3D, radius halfphi, and halflenght
- ///
+ ///
/// @param htrans transform to position the surface, can be nullptr
/// @note if htrans == nullptr, the cylinder is positioned around (0.,0.,0.)
/// @param radius is the radius of the cylinder
@@ -59,7 +59,7 @@ public:
double hlength);
/// Constructor from Transform3D and CylinderBounds
- ///
+ ///
/// @param htrans transform to position the surface, can be nullptr
/// @note if htrans == nullptr, the cylinder is positioned around (0.,0.,0.)
/// @param cbounds is a shared pointer to a cylindeer bounds object, must
@@ -68,7 +68,7 @@ public:
std::shared_ptr<const CylinderBounds> cbounds);
/// Copy constructor
- ///
+ ///
/// @param csf is the source cylinder for the copy
CylinderSurface(const CylinderSurface& csf);
@@ -140,7 +140,7 @@ public:
virtual const Vector3D
normal(const Vector3D& gpos) const override;
- /// Return method for the rotational symmetry axis
+ /// Return method for the rotational symmetry axis
/// @return the z-Axis of transform
virtual const Vector3D
rotSymmetryAxis() const;
@@ -160,11 +160,11 @@ public:
Vector3D& gpos) const override;
/// Global to local transfomration
- ///
+ ///
/// @param gpos is the global position to be transformed
/// @param mom is the global momentum (ignored in this operation)
/// @param lpos is hte local position to be filled
- ///
+ ///
/// @return is a boolean indicating if the transformation succeeded
virtual bool
globalToLocal(const Vector3D& gpos,
@@ -172,23 +172,22 @@ public:
Vector2D& lpos) const override;
/// Check for position on surface
- ///
+ ///
/// @param gpos is the global position to be checked
- /// @param bchk is the boundary check object
- ///
+ /// @param bcheck is the boundary check object
/// @return is a boolean indicating if the position is on surface
virtual bool
isOnSurface(const Vector3D& gpos,
- const BoundaryCheck& bchk = true) const override;
+ const BoundaryCheck& bcheck = true) const override;
/// Fast straight line intersection schema - provides closest intersection
/// and (signed) path length
///
/// @param gpos is the global position as a starting point
/// @param dir is the global direction at the starting point
- /// @param forceDir is a boolean forcing a solution along direction
+ /// @param forceDir is a boolean forcing a solution along direction
/// @param bchk is the boundary check
- ///
+ ///
/// <b>mathematical motivation:</b>
///
/// The calculation will be done in the 3-dim frame of the cylinder,
@@ -218,11 +217,11 @@ public:
const BoundaryCheck& bchk = false) const override;
/// Path correction due to incident of the track
- ///
+ ///
/// @param gpos is the global position as a starting point
/// @param mom is the global momentum at the starting point
- ///
- /// @return is the correction factor due to incident
+ ///
+ /// @return is the correction factor due to incident
virtual double
pathCorrection(const Vector3D& gpos, const Vector3D& mom) const override;
diff --git a/Core/include/ACTS/Surfaces/DiscBounds.hpp b/Core/include/ACTS/Surfaces/DiscBounds.hpp
index 6feb4d268..d1d3a0b55 100644
--- a/Core/include/ACTS/Surfaces/DiscBounds.hpp
+++ b/Core/include/ACTS/Surfaces/DiscBounds.hpp
@@ -29,10 +29,8 @@ public:
///
/// @param sSize is the size of the store
DiscBounds(size_t sSize = 0) : SurfaceBounds(sSize) {}
-
/// Destructor
virtual ~DiscBounds() {}
-
/// Virtual Constructor
virtual DiscBounds*
clone() const = 0;
diff --git a/Core/include/ACTS/Surfaces/DiscSurface.hpp b/Core/include/ACTS/Surfaces/DiscSurface.hpp
index af2bf6847..8f0f37c72 100644
--- a/Core/include/ACTS/Surfaces/DiscSurface.hpp
+++ b/Core/include/ACTS/Surfaces/DiscSurface.hpp
@@ -56,7 +56,7 @@ public:
/// Constructor for Discs from Transform3D, \f$ r_{min}, r_{max}, hx_{min},
/// hx_{max} \f$
/// This is n this case you have DiscTrapezoidalBounds
- ///
+ ///
/// @param minhalfx is the half length in x at minimal r
/// @param minhalfx is the half length in x at maximal r
/// @param rmin is the inner radius of the disc surface
@@ -72,7 +72,7 @@ public:
double stereo = 0.);
/// Constructor for Discs from Transform3D and shared DiscBounds
- ///
+ ///
/// @param htrans is the transform that positions the disc in the global 3D
/// frame
/// @param dbounds are the disc bounds describing the surface coverage
@@ -81,7 +81,7 @@ public:
/// Constructor from detector element and identifier
/// @note the surface only acts as a proxy of the detector element
- ///
+ ///
/// @param dbounds are the disc bounds associated to this surface, must not be
/// nullptr
/// @param detelement is the detector element that is represented by this
@@ -93,7 +93,7 @@ public:
const Identifier& identifier = Identifier());
/// Copy Constructor
- ///
+ ///
/// @param dsf is the source surface for the copy
DiscSurface(const DiscSurface& dsf);
@@ -129,7 +129,7 @@ public:
///
/// @param lpos the local position where the normal is requested (ignored)
///
- /// @return is a normal vector
+ /// @return is a normal vector
const Vector3D
normal(const Vector2D& lpos = s_origin2D) const final;
@@ -147,7 +147,8 @@ public:
bounds() const override;
/// This method returns true if the GlobalPosition is on the Surface for both,
- /// within or without check of whether the local position is inside boundaries or not
+ /// within or without check of whether the local position is inside boundaries
+ /// or not
///
/// @param gpos is the global position to be checked
/// @param bchk is the boundary check directive
@@ -165,7 +166,7 @@ public:
/// @param gmom global 3D momentum representation (optionally ignored)
/// @param gpos global 3D position to be filled (given by reference for method
/// symmetry)
- ///
+ ///
/// @note the momentum is ignored for Disc surfaces in this calculateion
virtual void
localToGlobal(const Vector2D& lpos,
@@ -174,13 +175,13 @@ public:
/// Global to local transformation
/// @note the momentum is ignored for Disc surfaces in this calculateion
- ///
+ ///
/// @param gpos global 3D position - considered to be on surface but not
/// inside bounds (check is done)
/// @param gmom global 3D momentum representation (optionally ignored)
/// @param lpos local 2D position to be filled (given by reference for method
/// symmetry)
- ///
+ ///
/// @return boolean indication if operation was successful (fail means global
/// position was not on surface)
virtual bool
@@ -190,7 +191,7 @@ public:
/// Special method for DiscSurface : local<->local transformations polar <->
/// cartesian
- ///
+ ///
/// @param lpolar is a local position in polar coordinates
///
/// @return values is local 2D position in carthesian coordinates @todo check
@@ -238,7 +239,7 @@ public:
/// @param gpos is the global position as a starting point
/// @param mom is the global momentum at the starting point
///
- /// @return is the correction factor due to incident
+ /// @return is the correction factor due to incident
double
pathCorrection(const Vector3D& gpos, const Vector3D& mom) const override;
@@ -248,9 +249,9 @@ public:
///
/// @param gpos is the global position as a starting point
/// @param dir is the global direction at the starting point
- /// @param forceDir is a boolean forcing a solution along direction
+ /// @param forceDir is a boolean forcing a solution along direction
/// @param bchk is the boundary check
- ///
+ ///
/// <b>mathematical motivation:</b>
///
/// the equation of the plane is given by: <br>
diff --git a/Core/include/ACTS/Surfaces/EllipseBounds.hpp b/Core/include/ACTS/Surfaces/EllipseBounds.hpp
index 8368e8e2d..b4ddc458e 100644
--- a/Core/include/ACTS/Surfaces/EllipseBounds.hpp
+++ b/Core/include/ACTS/Surfaces/EllipseBounds.hpp
@@ -60,7 +60,7 @@ public:
double hphisec = M_PI);
/// Copy constructor
- ///
+ ///
/// @param ebo is the source bounds for the copy
EllipseBounds(const EllipseBounds& ebo) : PlanarBounds(ebo) {}
/// Destructor
@@ -68,7 +68,7 @@ public:
/// Assignment operator
///
- /// @param ebo is the source bounds for the copy
+ /// @param ebo is the source bounds for the copy
EllipseBounds&
operator=(const EllipseBounds& ebo);
@@ -95,7 +95,7 @@ public:
///
/// @param lpos Local position (assumed to be in right surface frame)
/// @param bchk boundary check directive
-
+
///
/// @return boolean indicator for the success of this operation
virtual bool
@@ -161,7 +161,7 @@ public:
private:
/// private helper function
- ///
+ ///
/// @param lpos is the local position for checking
/// @param tol0 is the absolute tolerance on the first parameter
/// @param tol1 is the absolute tolerance on the second parameter
diff --git a/Core/include/ACTS/Surfaces/InfiniteBounds.hpp b/Core/include/ACTS/Surfaces/InfiniteBounds.hpp
index 3c59b7e2c..865761c84 100644
--- a/Core/include/ACTS/Surfaces/InfiniteBounds.hpp
+++ b/Core/include/ACTS/Surfaces/InfiniteBounds.hpp
@@ -28,10 +28,8 @@ class InfiniteBounds : public SurfaceBounds
public:
/// Default Constructor
InfiniteBounds() {}
-
/// Destructor
~InfiniteBounds() {}
-
/// Return SurfaceBounds type for persistency mainly
virtual SurfaceBounds::BoundsType
type() const final
@@ -62,9 +60,9 @@ public:
}
/// Method inside() returns true for loc 1
- ///
+ ///
/// ignores input parameters
- ///
+ ///
/// @return always true
virtual bool
insideLoc1(const Vector2D&, double tol1 = 0.) const final
diff --git a/Core/include/ACTS/Surfaces/LineBounds.hpp b/Core/include/ACTS/Surfaces/LineBounds.hpp
index 88e26f714..c36ca4ace 100644
--- a/Core/include/ACTS/Surfaces/LineBounds.hpp
+++ b/Core/include/ACTS/Surfaces/LineBounds.hpp
@@ -41,7 +41,6 @@ public:
///
/// @param libo are the source bounds
LineBounds(const LineBounds& libo) : SurfaceBounds(libo) {}
-
/// Destructor
virtual ~LineBounds();
diff --git a/Core/include/ACTS/Surfaces/LineSurface.hpp b/Core/include/ACTS/Surfaces/LineSurface.hpp
index 2b5cce1b1..764e0254d 100644
--- a/Core/include/ACTS/Surfaces/LineSurface.hpp
+++ b/Core/include/ACTS/Surfaces/LineSurface.hpp
@@ -54,7 +54,7 @@ public:
std::shared_ptr<const LineBounds> lbounds = nullptr);
/// Constructor from DetectorElementBase and Element identifier
- ///
+ ///
/// @param lbounds are teh bounds describing the straw dimensions, they must
/// not be nullptr
/// @param detelement for which this surface is (at least) one representation
@@ -64,7 +64,7 @@ public:
const Identifier& identifier = Identifier());
/// Copy constructor
- ///
+ ///
/// @param slsf is teh source surface for copying
LineSurface(const LineSurface& slsf);
@@ -105,7 +105,8 @@ public:
/// for StraightLine and Perigee Surface
/// - the default implementation is the the RotationMatrix3D of the transform
///
- /// @param gpos is the global position where the measurement frame is constructed
+ /// @param gpos is the global position where the measurement frame is
+ /// constructed
/// @param mom is the momentum used for the measurement frame construction
///
/// @return is a rotation matrix that indicates the measurement frame
@@ -113,8 +114,9 @@ public:
measurementFrame(const Vector3D& gpos, const Vector3D& mom) const override;
/// Local to global transformation
- /// for line surfaces the momentum is used in order to interpret the drift radius
- ///
+ /// for line surfaces the momentum is used in order to interpret the drift
+ /// radius
+ ///
/// @param lpos is the local position to be transformed
/// @param mom is the global momentum (used to sign the closest approach)
/// @param gpos is the global position shich is filled
@@ -155,7 +157,7 @@ public:
/// @param gmom global 3D momentum representation (optionally ignored)
/// @param lpos local 2D position to be filled (given by reference for method
/// symmetry)
- ///
+ ///
/// @return boolean indication if operation was successful (fail means global
/// position was not on surface)
virtual bool
@@ -174,7 +176,7 @@ public:
///
/// @param gpos is the global position as a starting point
/// @param dir is the global direction at the starting point
- /// @param forceDir is a boolean forcing a solution along direction
+ /// @param forceDir is a boolean forcing a solution along direction
/// @param bchk is the boundary check
///
/// b>mathematical motivation:</b>
@@ -215,7 +217,7 @@ public:
/// is by definition 1 for LineSurfaces
///
/// input parameters are ignored
- ///
+ ///
/// @note there's no material associated to the line surface
virtual double
pathCorrection(const Vector3D&, const Vector3D&) const override
@@ -224,8 +226,8 @@ public:
}
/// This method checks if the provided GlobalPosition is inside the assigned
- /// straw radius, but no check is done whether the GlobalPosition is
- /// inside bounds or not. It overwrites isOnSurface from Base Class
+ /// straw radius, but no check is done whether the GlobalPosition is
+ /// inside bounds or not. It overwrites isOnSurface from Base Class
/// as it saves the time of sign determination.
///
/// @param gpos is the global position to be checked
@@ -252,7 +254,7 @@ protected:
private:
/// helper function to apply the globalToLocal with out transform
- ///
+ ///
/// @param pos is the global position
/// @param mom is the momentum
/// @param is the local position to be filled
diff --git a/Core/include/ACTS/Surfaces/PlanarBounds.hpp b/Core/include/ACTS/Surfaces/PlanarBounds.hpp
index eea30bbfd..eaac6f635 100644
--- a/Core/include/ACTS/Surfaces/PlanarBounds.hpp
+++ b/Core/include/ACTS/Surfaces/PlanarBounds.hpp
@@ -29,10 +29,8 @@ public:
///
/// @param sStore is the store size for the initialisation
PlanarBounds(size_t sStore = 0) : SurfaceBounds(sStore) {}
-
/// Destructor
virtual ~PlanarBounds() {}
-
/// Virtual Constructor
virtual PlanarBounds*
clone() const = 0;
diff --git a/Core/include/ACTS/Surfaces/PlaneSurface.hpp b/Core/include/ACTS/Surfaces/PlaneSurface.hpp
index 16efcfdb9..b98c8f33a 100644
--- a/Core/include/ACTS/Surfaces/PlaneSurface.hpp
+++ b/Core/include/ACTS/Surfaces/PlaneSurface.hpp
@@ -66,10 +66,10 @@ public:
const Identifier& identifier = Identifier());
/// Constructor for Planes with (optional) shared bounds object
- ///
+ ///
/// @param htrans transform in 3D that positions this surface
/// @param pbounds bounds object to describe the actual surface area
- ///
+ ///
/// @attention the pointer to pbounds must not be a nullptr
PlaneSurface(std::shared_ptr<Transform3D> htrans,
std::shared_ptr<const PlanarBounds> pbounds);
@@ -130,7 +130,6 @@ public:
isOnSurface(const Vector3D& gpos,
const BoundaryCheck& bchk = true) const override;
-
/// Local to global transformation
/// For planar surfaces the momentum is ignroed in the local to global
/// transformation
@@ -147,13 +146,13 @@ public:
/// Global to local transformation
/// For planar surfaces the momentum is ignroed in the global to local
/// transformation
- ///
+ ///
/// @param gpos global 3D position - considered to be on surface but not
/// inside bounds (check is done)
/// @param gmom global 3D momentum representation (optionally ignored)
/// @param lpos local 2D position to be filled (given by reference for method
/// symmetry)
- ///
+ ///
/// @return boolean indication if operation was successful (fail means global
/// position was not on surface)
virtual bool
diff --git a/Core/include/ACTS/Surfaces/RadialBounds.hpp b/Core/include/ACTS/Surfaces/RadialBounds.hpp
index 033277d30..40e7e6518 100644
--- a/Core/include/ACTS/Surfaces/RadialBounds.hpp
+++ b/Core/include/ACTS/Surfaces/RadialBounds.hpp
@@ -65,7 +65,6 @@ public:
///
/// @param rbounds is the source bounds for assignment
RadialBounds(const RadialBounds& rbounds) : DiscBounds(rbounds) {}
-
/// Destructor
virtual ~RadialBounds();
@@ -129,7 +128,7 @@ public:
double
rMax() const;
- /// Return method for the central phi value
+ /// Return method for the central phi value
///(i.e. phi value of x-axis of local 3D frame)
double
averagePhi() const;
diff --git a/Core/include/ACTS/Surfaces/RealQuadraticEquation.hpp b/Core/include/ACTS/Surfaces/RealQuadraticEquation.hpp
index 29aac3525..a91b82ac5 100644
--- a/Core/include/ACTS/Surfaces/RealQuadraticEquation.hpp
+++ b/Core/include/ACTS/Surfaces/RealQuadraticEquation.hpp
@@ -55,7 +55,7 @@ struct RealQuadraticEquation
RQESolutionType solutions;
/// Constructor
- ///
+ ///
/// @param alpha is the first parameter of the quad equation
/// @param beta is the second parameter of the quad equation
/// @param gamma is the third parameter of the quad equation
diff --git a/Core/include/ACTS/Surfaces/RectangleBounds.hpp b/Core/include/ACTS/Surfaces/RectangleBounds.hpp
index c1cd6e74c..92c19d135 100644
--- a/Core/include/ACTS/Surfaces/RectangleBounds.hpp
+++ b/Core/include/ACTS/Surfaces/RectangleBounds.hpp
@@ -47,7 +47,6 @@ public:
///
/// @param recbo are the source bounds
RectangleBounds(const RectangleBounds& recbo) : PlanarBounds(recbo) {}
-
/// Destructor
virtual ~RectangleBounds();
diff --git a/Core/include/ACTS/Surfaces/StrawSurface.hpp b/Core/include/ACTS/Surfaces/StrawSurface.hpp
index bf2f277f9..ebf6c7d65 100644
--- a/Core/include/ACTS/Surfaces/StrawSurface.hpp
+++ b/Core/include/ACTS/Surfaces/StrawSurface.hpp
@@ -34,14 +34,15 @@ public:
StrawSurface() = delete;
/// Constructor from Transform3D and bounds
- ///
+ ///
/// @param htrans is the transform that positions the surface in the global
/// frame
/// @param radius is the straw radius
/// @param halex is the half length in z
StrawSurface(std::shared_ptr<Transform3D> htrans, double radius, double halez)
: LineSurface(htrans, radius, halez)
- {}
+ {
+ }
/// Constructor from Transform3D and a shared bounds object
///
@@ -53,7 +54,7 @@ public:
std::shared_ptr<const LineBounds> lbounds = nullptr);
/// Constructor from DetectorElementBase and Element identifier
- ///
+ ///
/// @param lbounds are teh bounds describing the straw dimensions, they must
/// not be nullptr
/// @param detelement for which this surface is (at least) one representation
@@ -66,7 +67,6 @@ public:
///
/// @param slsf is the source surface for copying
StrawSurface(const StrawSurface& slsf) : LineSurface(slsf) {}
-
/// Copy constructor with shift
///
/// @param slsf is the source surface dor copying
diff --git a/Core/include/ACTS/Surfaces/Surface.hpp b/Core/include/ACTS/Surfaces/Surface.hpp
index f2ce56fea..6ddd89351 100644
--- a/Core/include/ACTS/Surfaces/Surface.hpp
+++ b/Core/include/ACTS/Surfaces/Surface.hpp
@@ -63,7 +63,7 @@ public:
};
/// Constructor with Transform3D as a shared object
- ///
+ ///
/// @param htrans Transform3D positions the surface in 3D global space
/// @note also acts as default constructor
Surface(std::shared_ptr<Transform3D> htrans = nullptr);
@@ -199,7 +199,7 @@ public:
/// Set Associated SurfaceMaterial
/// The material is usually derived in a complicated way and loaded from
/// a framework given source. As various srufaces may share the same
- ///
+ ///
/// @param material Material description this given and stored as a shared
/// pointer
void
@@ -220,7 +220,7 @@ public:
const BoundaryCheck& bchk = BoundaryCheck(true)) const;
/// The insideBounds method for local positions
- ///
+ ///
/// @param lpos local position to check
/// @param bchk BoundaryCheck directive for this onSurface check
///
@@ -240,7 +240,7 @@ public:
/// Local to global transformation
/// Generalized local to global transformation for the surface types. Since
- /// some surface types need the global momentum/direction to resolve sign
+ /// some surface types need the global momentum/direction to resolve sign
/// ambiguity this is also provided
///
/// @param lpos local 2D posittion in specialized surface frame
@@ -254,15 +254,15 @@ public:
/// Global to local transformation
/// Generalized global to local transformation for the surface types. Since
- /// some surface types need the global momentum/direction to resolve sign
+ /// some surface types need the global momentum/direction to resolve sign
/// ambiguity this is also provided
- ///
+ ///
/// @param gpos global 3D position - considered to be on surface but not
/// inside bounds (check is done)
/// @param gmom global 3D momentum representation (optionally ignored)
/// @param lpos local 2D position to be filled (given by reference for method
/// symmetry)
- ///
+ ///
/// @return boolean indication if operation was successful (fail means global
/// position was not on surface)
virtual bool
@@ -273,7 +273,7 @@ public:
/// Return mehtod for the measurement frame
/// This is the frame in which the covariance matrix is defined (specialized
/// by all surfaces)
- ///
+ ///
/// @param gpos global 3D position - considered to be on surface but not
/// inside bounds (check is done)
/// @param gmom global 3D momentum representation (optionally ignored)
diff --git a/Core/include/ACTS/Surfaces/SurfaceBounds.hpp b/Core/include/ACTS/Surfaces/SurfaceBounds.hpp
index ae7b5031f..795bb2946 100644
--- a/Core/include/ACTS/Surfaces/SurfaceBounds.hpp
+++ b/Core/include/ACTS/Surfaces/SurfaceBounds.hpp
@@ -61,20 +61,17 @@ public:
/// @param sSize is the size of the data store
/// @note the value Store is initialized to the given size
SurfaceBounds(size_t sSize = 0) : m_valueStore(sSize, 0.) {}
-
/// Copy constructor
/// It copies the value store
///
/// @param sb is the source bounds to be copied
SurfaceBounds(const SurfaceBounds& sb) : m_valueStore(sb.m_valueStore) {}
-
/// Destructor
virtual ~SurfaceBounds() {}
-
/// clone() method to make deep copy in Surface copy constructor and for
/// assigment operator of the Surface class
///
- /// @return is a newly created object
+ /// @return is a newly created object
virtual SurfaceBounds*
clone() const = 0;
@@ -88,7 +85,7 @@ public:
/// checks first on the pointer equality
/// then it cheks on the type lastly it checks on the data store
///
- /// @param sb is the source bounds to be copied
+ /// @param sb is the source bounds to be copied
virtual bool
operator==(const SurfaceBounds& sb) const;
diff --git a/Core/include/ACTS/Surfaces/TrapezoidBounds.hpp b/Core/include/ACTS/Surfaces/TrapezoidBounds.hpp
index f28d5d47d..204066660 100644
--- a/Core/include/ACTS/Surfaces/TrapezoidBounds.hpp
+++ b/Core/include/ACTS/Surfaces/TrapezoidBounds.hpp
@@ -61,7 +61,6 @@ public:
///
/// @param trabo are the source bounds for assignment
TrapezoidBounds(const TrapezoidBounds& trabo) : PlanarBounds(trabo) {}
-
/// Destructor
virtual ~TrapezoidBounds();
@@ -144,7 +143,7 @@ public:
/// @f$
/// <br>
/// and @f$ \delta_{I} = \delta_{II} = - \frac{1}{2}\kappa_{I}(x_{max} +
- /// x_{min}) @f$
+ /// x_{min}) @f$
///
/// @param lpos Local position (assumed to be in right surface frame)
/// @param bchk boundary check directive
@@ -217,7 +216,7 @@ private:
bool
insideFull(const Vector2D& lpos, double tol0 = 0., double tol1 = 0.) const;
- /// private inside() method for the triangular exclude
+ /// private inside() method for the triangular exclude
/// area for an arbitrary trapezoid
///
/// @param lpos Local position (assumed to be in right surface frame)
@@ -228,7 +227,7 @@ private:
bool
insideExclude(const Vector2D& lpos, double tol0 = 0., double tol1 = 0.) const;
- /// private isAbove() method for checking whether a point
+ /// private isAbove() method for checking whether a point
/// lies above or under a straight line
///
/// @param lpos Local position (assumed to be in right surface frame)
diff --git a/Core/include/ACTS/Surfaces/TriangleBounds.hpp b/Core/include/ACTS/Surfaces/TriangleBounds.hpp
index a4001a3e0..157a206b5 100644
--- a/Core/include/ACTS/Surfaces/TriangleBounds.hpp
+++ b/Core/include/ACTS/Surfaces/TriangleBounds.hpp
@@ -52,7 +52,6 @@ public:
///
/// @param tribo are the source bounds for assignment
TriangleBounds(const TriangleBounds& tribo) : PlanarBounds(tribo) {}
-
/// Destructor
virtual ~TriangleBounds();
@@ -95,7 +94,7 @@ public:
/// This method checks if the provided local coordinate 2 is inside the
/// surface bounds
- ///
+ ///
/// @param lpos local position in 2D local carthesian frame
/// @param tol1 is the absolute tolerance on the local first coordinate
///
diff --git a/Core/include/ACTS/Tools/CylinderVolumeBuilder.hpp b/Core/include/ACTS/Tools/CylinderVolumeBuilder.hpp
index 14e97901b..b24530fdf 100644
--- a/Core/include/ACTS/Tools/CylinderVolumeBuilder.hpp
+++ b/Core/include/ACTS/Tools/CylinderVolumeBuilder.hpp
@@ -97,7 +97,7 @@ struct VolumeSetup
/// Compatibility check radially
///
- /// @param vSetup is the setup against which is checked
+ /// @param vSetup is the setup against which is checked
bool
wrapsInR(const VolumeSetup& vSetup) const
{
@@ -107,7 +107,7 @@ struct VolumeSetup
/// Compatibility check longitudinally
///
- /// @param vSetup is the setup against which is checked
+ /// @param vSetup is the setup against which is checked
bool
wrapsInZ(const VolumeSetup& vSetup) const
{
@@ -133,7 +133,7 @@ struct VolumeSetup
{
return (containesInR(vSetup) && containesInZ(vSetup));
}
-
+
/// Check if contained radially
///
/// @param vSetup is the setup against which is checked
@@ -249,7 +249,7 @@ public:
const LayerTriple* layerTriple = nullptr) const override;
/// Set configuration method
- ///
+ ///
/// @param cvbConfig is the new configuration to be set
void
setConfiguration(const Config& cvbConfig);
diff --git a/Core/include/ACTS/Tools/CylinderVolumeHelper.hpp b/Core/include/ACTS/Tools/CylinderVolumeHelper.hpp
index b2404e871..f124c431b 100644
--- a/Core/include/ACTS/Tools/CylinderVolumeHelper.hpp
+++ b/Core/include/ACTS/Tools/CylinderVolumeHelper.hpp
@@ -75,7 +75,6 @@ public:
/// Destructor
virtual ~CylinderVolumeHelper() = default;
-
/// Create a TrackingVolume* from a set of layers and (optional) parameters
///
/// @param layers vector of static layers confined by the TrackingVolume
@@ -97,7 +96,7 @@ public:
std::shared_ptr<Transform3D> transform = nullptr,
const std::string& volumeName = "UndefinedVolume",
BinningType btype = arbitrary) const;
-
+
/// Create a TrackingVolume* from a set of layers and (optional) parameters
///
/// @param layers vector of static layers confined by the TrackingVolume
@@ -119,7 +118,7 @@ public:
double loc2Max,
const std::string& volumeName = "UndefinedVolume",
BinningType btype = arbitrary) const;
-
+
/// Create a gap volume from dimensions and
///
/// @param matprop dense material properties for this TrackingVolume
@@ -129,7 +128,7 @@ public:
/// @param cylinder type of layers
/// @param volumeName volume name to be given
///
- /// @return shared pointer to a new TrackingVolume
+ /// @return shared pointer to a new TrackingVolume
TrackingVolumePtr
createGapTrackingVolume(std::shared_ptr<Material> matprop,
double loc1Min,
@@ -140,7 +139,7 @@ public:
bool cylinder = true,
const std::string& volumeName
= "UndefinedVolume") const;
-
+
/// Create a gap volume from dimensions and
///
/// @param matprop dense material properties for this TrackingVolume
@@ -163,17 +162,17 @@ public:
BinningType btype = arbitrary) const;
/// Create a container volumes from sub volumes, input volumes are ordered in
- /// R or Z by convention
+ /// R or Z by convention
///
/// @param volumes the volumes to be contained
///
///
- /// @return shared pointer to a new TrackingVolume
+ /// @return shared pointer to a new TrackingVolume
TrackingVolumePtr
createContainerTrackingVolume(const TrackingVolumeVector& volumes) const;
/// Set configuration method
- ///
+ ///
/// @param cvbConfig is the configurtion struct assigned
void
setConfiguration(const Config& cvbConfig);
@@ -216,19 +215,19 @@ private:
/// @param bValue the binning value in which the binning works
/// @param bType is the type of binning: equidistant, arbitrary
bool
- estimateAndCheckDimension(const LayerVector& layers,
- const CylinderVolumeBounds*& cylBounds,
- std::shared_ptr<Transform3D>& transform,
- double& rMinClean,
- double& rMaxClean,
- double& zMinClean,
- double& zMaxClean,
- BinningValue& bValue,
- BinningType bType = arbitrary) const;
+ estimateAndCheckDimension(const LayerVector& layers,
+ const CylinderVolumeBounds*& cylBounds,
+ std::shared_ptr<Transform3D>& transform,
+ double& rMinClean,
+ double& rMaxClean,
+ double& zMinClean,
+ double& zMaxClean,
+ BinningValue& bValue,
+ BinningType bType = arbitrary) const;
/// Private method - interglue all volumes contained by a TrackingVolume
/// and set the outside glue volumes in the descriptor
- ///
+ ///
/// @param tVolume the tracking volume that is glued together
/// @param rBinned a boolean indicating if it is binned in r
/// @param rMin the minimum radius of the volume
@@ -245,7 +244,7 @@ private:
double zMin,
double zMax) const;
- /// Private method - glue volume to the other
+ /// Private method - glue volume to the other
///
/// @param volumeOne is the first volume in the glue process
/// @param faceOne is the first boundary face of the glue process
@@ -271,11 +270,11 @@ private:
///
/// @param tVolume is the volume to which faces are added
/// @param bsf is the boundary surface to which faces are added
- /// @param vols are the voluems which are added
+ /// @param vols are the voluems which are added
void
- addFaceVolumes(TrackingVolumePtr tVolume,
- BoundarySurfaceFace bsf,
- TrackingVolumeVector& vols) const;
+ addFaceVolumes(TrackingVolumePtr tVolume,
+ BoundarySurfaceFace bsf,
+ TrackingVolumeVector& vols) const;
/// Private method - helper method to save some code
///
diff --git a/Core/include/ACTS/Tools/ILayerBuilder.hpp b/Core/include/ACTS/Tools/ILayerBuilder.hpp
index f8e123d48..60f0c5f23 100644
--- a/Core/include/ACTS/Tools/ILayerBuilder.hpp
+++ b/Core/include/ACTS/Tools/ILayerBuilder.hpp
@@ -34,7 +34,6 @@ class ILayerBuilder
public:
/// Virtual destructor
virtual ~ILayerBuilder() {}
-
/// LayerBuilder interface method
/// @return the layers at negative side
virtual const LayerVector
diff --git a/Core/include/ACTS/Tools/ILayerCreator.hpp b/Core/include/ACTS/Tools/ILayerCreator.hpp
index d8841ef56..3241a850c 100644
--- a/Core/include/ACTS/Tools/ILayerCreator.hpp
+++ b/Core/include/ACTS/Tools/ILayerCreator.hpp
@@ -33,7 +33,6 @@ class ILayerCreator
public:
/// Virtual destructor
virtual ~ILayerCreator() {}
-
/// ILayerCreator interface method - returning a cylindrical layer
///
/// @param surfaces is the vector of sensitive surfaces represented by this
@@ -72,7 +71,7 @@ public:
size_t binsPhi) const = 0;
/// ILayerCreator interface method - returning a plane layer
- ///
+ ///
/// @param surfaces is the vector of sensitive surfaces represented by this
/// layer
/// @param envelopeXY is the additional envelope applied in XY
diff --git a/Core/include/ACTS/Tools/ISurfaceArrayCreator.hpp b/Core/include/ACTS/Tools/ISurfaceArrayCreator.hpp
index 795257b2e..715c5045c 100644
--- a/Core/include/ACTS/Tools/ISurfaceArrayCreator.hpp
+++ b/Core/include/ACTS/Tools/ISurfaceArrayCreator.hpp
@@ -32,7 +32,6 @@ class ISurfaceArrayCreator
public:
/// Virtual destructor
virtual ~ISurfaceArrayCreator() {}
-
/// SurfaceArrayCreator interface method
///
/// - create an array in a cylinder, binned in phi, z when extremas and
diff --git a/Core/include/ACTS/Tools/ITrackingGeometryBuilder.hpp b/Core/include/ACTS/Tools/ITrackingGeometryBuilder.hpp
index dbb98b421..8c5cc57ee 100644
--- a/Core/include/ACTS/Tools/ITrackingGeometryBuilder.hpp
+++ b/Core/include/ACTS/Tools/ITrackingGeometryBuilder.hpp
@@ -32,7 +32,6 @@ class TrackingGeometry;
class ITrackingGeometryBuilder
{
public:
-
/// Virtual destructor
virtual ~ITrackingGeometryBuilder() = default;
diff --git a/Core/include/ACTS/Tools/ITrackingVolumeArrayCreator.hpp b/Core/include/ACTS/Tools/ITrackingVolumeArrayCreator.hpp
index 8c2a6d61c..e11a543a6 100644
--- a/Core/include/ACTS/Tools/ITrackingVolumeArrayCreator.hpp
+++ b/Core/include/ACTS/Tools/ITrackingVolumeArrayCreator.hpp
@@ -27,7 +27,7 @@ typedef std::shared_ptr<const TrackingVolume> TrackingVolumePtr;
/// A BinnedArray of a std::shared_tr to a TrackingVolume
typedef BinnedArray<TrackingVolumePtr> TrackingVolumeArray;
- /// A std::vector of a std::shared_ptr to a TrackingVolume
+/// A std::vector of a std::shared_ptr to a TrackingVolume
typedef std::vector<TrackingVolumePtr> TrackingVolumeVector;
/// @class ITrackingVolumeArrayCreator
@@ -50,7 +50,7 @@ public:
/// TrackingVolumeArrayCreator interface method - creates array depending on
/// the binning type
- ///
+ ///
/// @param vols are the TrackingVolumes ordered in a tracker
/// @param bVal is the binning value for the volume binning
///
diff --git a/Core/include/ACTS/Tools/ITrackingVolumeBuilder.hpp b/Core/include/ACTS/Tools/ITrackingVolumeBuilder.hpp
index f6aad77aa..fb2a4e061 100644
--- a/Core/include/ACTS/Tools/ITrackingVolumeBuilder.hpp
+++ b/Core/include/ACTS/Tools/ITrackingVolumeBuilder.hpp
@@ -50,7 +50,7 @@ public:
virtual ~ITrackingVolumeBuilder() = default;
/// ITrackingVolumeBuilder interface method
- ///
+ ///
/// @param insideVolume is an (optional) volume to be wrapped
/// @param outsideBounds is an (optional) outside confinement
/// @param layerTriple is an (optional) triplet of layers
diff --git a/Core/include/ACTS/Tools/ITrackingVolumeHelper.hpp b/Core/include/ACTS/Tools/ITrackingVolumeHelper.hpp
index 10fe9c03f..f04071076 100644
--- a/Core/include/ACTS/Tools/ITrackingVolumeHelper.hpp
+++ b/Core/include/ACTS/Tools/ITrackingVolumeHelper.hpp
@@ -104,7 +104,7 @@ public:
/// @param cylinder type of layers
/// @param volumeName volume name to be given
///
- /// @return shared pointer to a new TrackingVolume
+ /// @return shared pointer to a new TrackingVolume
virtual TrackingVolumePtr
createGapTrackingVolume(std::shared_ptr<Material> matprop,
double loc1Min,
diff --git a/Core/include/ACTS/Tools/LayerArrayCreator.hpp b/Core/include/ACTS/Tools/LayerArrayCreator.hpp
index 993d8c461..d86f4cf2e 100644
--- a/Core/include/ACTS/Tools/LayerArrayCreator.hpp
+++ b/Core/include/ACTS/Tools/LayerArrayCreator.hpp
@@ -46,18 +46,19 @@ class LayerArrayCreator : public ILayerArrayCreator
{
public:
/// Constructor
- ///
+ ///
/// @param logger logging instance
LayerArrayCreator(std::unique_ptr<Logger> logger
= getDefaultLogger("LayerArrayCreator", Logging::INFO))
: m_logger(std::move(logger))
- {}
+ {
+ }
/// Destructor
virtual ~LayerArrayCreator() = default;
/// LayerArrayCreator interface method
- ///
+ ///
/// @param layers are the layers to be moved into an array
/// @param min is the minimum value for binning
/// @param max is the maximum value for binning
diff --git a/Core/include/ACTS/Tools/LayerCreator.hpp b/Core/include/ACTS/Tools/LayerCreator.hpp
index b347a25e1..c97c5d106 100644
--- a/Core/include/ACTS/Tools/LayerCreator.hpp
+++ b/Core/include/ACTS/Tools/LayerCreator.hpp
@@ -82,7 +82,7 @@ public:
size_t binsZ) const override;
/// ILayerCreator interface method - returning a cylindrical layer
- ///
+ ///
/// @param surfaces is the vector of sensitive surfaces represented by this
/// layer
/// @param envelopeMinR is the additional envelope applied in R at Rmin
@@ -101,7 +101,7 @@ public:
size_t binsPhi) const override;
/// ILayerCreator interface method - returning a cylindrical layer
- ///
+ ///
/// @param surfaces is the vector of sensitive surfaces represented by this
/// layer
/// @param envelopeXY is the additional envelope applied in XY
@@ -135,11 +135,11 @@ private:
/// @todo shift to vertices of surfaces
///
/// @param sf is the surface to be examinated
- /// @param minR minimal R extend
- /// @param maxR maximal R extend
- /// @param minPhi minimal phi extend
+ /// @param minR minimal R extend
+ /// @param maxR maximal R extend
+ /// @param minPhi minimal phi extend
/// @param maxPhi maximal phi extend
- /// @param minZ minimal z extend
+ /// @param minZ minimal z extend
/// @param maxZ maximal z extend
void
moduleExtend(const Surface& sf,
@@ -151,11 +151,11 @@ private:
double& maxZ) const;
/// Calculates the closest radial distance of a line
- ///
+ ///
/// @param pos1 is the first position on the line
/// @param pos2 is the second position on the line
///
- /// @return is the closest distance
+ /// @return is the closest distance
double
radialDistance(const Vector3D& pos1, const Vector3D& pos2) const;
diff --git a/Core/include/ACTS/Tools/SurfaceArrayCreator.hpp b/Core/include/ACTS/Tools/SurfaceArrayCreator.hpp
index cd07f4efc..198e60739 100644
--- a/Core/include/ACTS/Tools/SurfaceArrayCreator.hpp
+++ b/Core/include/ACTS/Tools/SurfaceArrayCreator.hpp
@@ -95,7 +95,7 @@ public:
/// SurfaceArrayCreator interface method
/// - create an array on a disc, binned in r, phi when extremas and
/// bin numbers are known
- ///
+ ///
/// @param surfaces are the sensitive surfaces to be
/// @param rMin is the minimimal radius of the disc
/// @param rMax is the maximal radius of the disc
@@ -136,7 +136,7 @@ public:
/// SurfaceArrayCreator interface method
/// - create an array on a plane
- ///
+ ///
/// @param surfaces are the sensitive surfaces to be
/// @param halflengthX is the half length in X
/// @param halflengthY is the half length in Y
@@ -155,7 +155,7 @@ public:
= nullptr) const final;
/// Set logging instance
- /// @param logger is the logging instance to be set
+ /// @param logger is the logging instance to be set
void
setLogger(std::unique_ptr<Logger> logger)
{
diff --git a/Core/include/ACTS/Tools/TrackingGeometryBuilder.hpp b/Core/include/ACTS/Tools/TrackingGeometryBuilder.hpp
index 2b588378c..d1db2df28 100644
--- a/Core/include/ACTS/Tools/TrackingGeometryBuilder.hpp
+++ b/Core/include/ACTS/Tools/TrackingGeometryBuilder.hpp
@@ -40,7 +40,7 @@ public:
{
/// the list of trackign volume builders
std::list<std::shared_ptr<ITrackingVolumeBuilder>> trackingVolumeBuilders{};
-
+
/// the tracking volume helper for detector construction
std::shared_ptr<ITrackingVolumeHelper> trackingVolumeHelper = nullptr;
};
diff --git a/Core/include/ACTS/Tools/TrackingVolumeArrayCreator.hpp b/Core/include/ACTS/Tools/TrackingVolumeArrayCreator.hpp
index e715ec5eb..e3edb630b 100644
--- a/Core/include/ACTS/Tools/TrackingVolumeArrayCreator.hpp
+++ b/Core/include/ACTS/Tools/TrackingVolumeArrayCreator.hpp
@@ -44,7 +44,7 @@ public:
: m_logger(std::move(logger))
{
}
-
+
/// Destructor
virtual ~TrackingVolumeArrayCreator() = default;
@@ -60,7 +60,7 @@ public:
/// Set logging instance
///
- /// @param logger is the logging instance to be set
+ /// @param logger is the logging instance to be set
void
setLogger(std::unique_ptr<Logger> logger)
{
diff --git a/Core/include/ACTS/Utilities/ApproachDescriptor.hpp b/Core/include/ACTS/Utilities/ApproachDescriptor.hpp
index 0311a9f9a..dc9d78494 100644
--- a/Core/include/ACTS/Utilities/ApproachDescriptor.hpp
+++ b/Core/include/ACTS/Utilities/ApproachDescriptor.hpp
@@ -39,10 +39,8 @@ class ApproachDescriptor
public:
/// Default constructor
ApproachDescriptor() {}
-
/// Virtual destructor
virtual ~ApproachDescriptor() {}
-
/// Register Layer
/// this gives the approach surfaces the link to the layer
///
diff --git a/Core/include/ACTS/Utilities/BinUtility.hpp b/Core/include/ACTS/Utilities/BinUtility.hpp
index 109a058d8..28b6aee0f 100644
--- a/Core/include/ACTS/Utilities/BinUtility.hpp
+++ b/Core/include/ACTS/Utilities/BinUtility.hpp
@@ -139,7 +139,6 @@ public:
/// Virtual Destructor
~BinUtility() {}
-
/// Implizit Constructor
BinUtility*
clone() const
@@ -166,7 +165,7 @@ public:
/// - calculate the bin triple with one transform
///
/// @param position is the 3D position to be evaluated
- ///
+ ///
/// @return is the bin value in 3D
std::array<size_t, 3>
binTriple(const Vector3D& position) const
@@ -205,7 +204,7 @@ public:
///
/// @param position is the position for the neighbour Range test
/// @param ba is the binning ba
- ///
+ ///
/// @return a vector of neighbour sizes
std::vector<size_t>
neighbourRange(const Vector3D& position, size_t ba = 0) const
@@ -244,9 +243,9 @@ public:
/// @param position is the global position for the next search
/// @param direction is the global position for the next search
/// @param ba is the bin accessor
- ///
- /// @todo the
- ///
+ ///
+ /// @todo the
+ ///
/// @return the next bin
int
nextDirection(const Vector3D& position,
@@ -314,9 +313,9 @@ public:
}
/// First bin maximal value
- ///
- /// @param ba is the binaccessor
- ///
+ ///
+ /// @param ba is the binaccessor
+ ///
/// @return size_t is the maximal bin of the accessor entry
size_t
max(size_t ba = 0) const
@@ -326,9 +325,9 @@ public:
}
/// Number of bins
- ///
- /// @param ba is the binaccessor
- ///
+ ///
+ /// @param ba is the binaccessor
+ ///
/// @return size_t is the bins of the accessor entry
size_t
bins(size_t ba) const
@@ -339,8 +338,8 @@ public:
/// The type/value of the binning
///
- /// @param ba is the binaccessor
- ///
+ /// @param ba is the binaccessor
+ ///
/// @return the binning value of the accessor entry
BinningValue
binningValue(size_t ba = 0) const throw(std::string)
diff --git a/Core/include/ACTS/Utilities/BinnedArray.hpp b/Core/include/ACTS/Utilities/BinnedArray.hpp
index 9b9618ecf..d645c854e 100644
--- a/Core/include/ACTS/Utilities/BinnedArray.hpp
+++ b/Core/include/ACTS/Utilities/BinnedArray.hpp
@@ -34,10 +34,8 @@ class BinnedArray
public:
/// Default Constructor - needed for inherited classes
BinnedArray() {}
-
/// Virtual Destructor
virtual ~BinnedArray() {}
-
/// Returns the object in the associated bin according the local position
///
/// @param lposition is the local position for the object retrieval
@@ -48,7 +46,7 @@ public:
object(const Vector2D& lposition, std::array<size_t, 3>& bins) const = 0;
/// Same method without bins for backward compatibility
- ///
+ ///
/// @param lposition is the local position for finding the obect
///
/// @return the object according to the estimated bin
@@ -86,19 +84,19 @@ public:
/// @todo check if this needs connectivity directive
///
/// @param bin is the binning
- ///
+ ///
/// @return a vector of unique objects
virtual std::vector<T>
objectCluster(const std::array<size_t, 3>& bin) const = 0;
/// Return all unqiue object
- /// @note this is the accessor to the
+ /// @note this is the accessor to the
/// @return the vector of all array objects
virtual const std::vector<T>&
arrayObjects() const = 0;
/// Return the object grid multiple entries are allowed
- /// @return the object grid
+ /// @return the object grid
virtual const std::vector<std::vector<std::vector<T>>>&
objectGrid() const = 0;
diff --git a/Core/include/ACTS/Utilities/BinnedArrayXD.hpp b/Core/include/ACTS/Utilities/BinnedArrayXD.hpp
index 384dae580..72917fdd2 100644
--- a/Core/include/ACTS/Utilities/BinnedArrayXD.hpp
+++ b/Core/include/ACTS/Utilities/BinnedArrayXD.hpp
@@ -54,7 +54,7 @@ public:
/// Constructor with std::vector and a BinUtility
/// - fills the internal data structur
- ///
+ ///
/// @param tapvector is a vector of object and binning position
/// @param bu is the unique bin utility for this binned array
BinnedArrayXD(const std::vector<TAP>& tapvector,
@@ -127,7 +127,6 @@ public:
/// Destructor
~BinnedArrayXD() {}
-
/// Returns the object in the array from a local position
///
/// @todo check if we can change to triple return at once
diff --git a/Core/include/ACTS/Utilities/BinningData.hpp b/Core/include/ACTS/Utilities/BinningData.hpp
index dc9c02c4e..6157cf166 100644
--- a/Core/include/ACTS/Utilities/BinningData.hpp
+++ b/Core/include/ACTS/Utilities/BinningData.hpp
@@ -221,7 +221,6 @@ public:
/// Destructor
~BinningData() {}
-
/// Return the number of bins - including sub bins
size_t
bins() const
@@ -313,7 +312,7 @@ public:
///
/// @param phi is phi value to be gauged
///
- /// @return float the gauged phi
+ /// @return float the gauged phi
float
gaugePhi(float phi) const
{
@@ -380,7 +379,7 @@ public:
}
/// Generic search - forwards to correct function pointer
- ///
+ ///
/// @param value is the searchvalue as float
///
/// @return bin according tot this
@@ -395,7 +394,7 @@ public:
/// Generic search with sub structure
/// - forwards to correct function pointer
- ///
+ ///
/// @param value is the searchvalue as float
///
/// @return bin according tot this
@@ -438,7 +437,7 @@ public:
///
/// @param position is the start search position
/// @param dir is the direction
- ///
+ ///
/// @return next bin to try
size_t
next(const Vector3D& position, const Vector3D& dir) const
diff --git a/Core/include/ACTS/Utilities/GeometryID.hpp b/Core/include/ACTS/Utilities/GeometryID.hpp
index e908c0762..4ead5dd59 100644
--- a/Core/include/ACTS/Utilities/GeometryID.hpp
+++ b/Core/include/ACTS/Utilities/GeometryID.hpp
@@ -53,25 +53,23 @@ public:
/// default constructor
///
GeometryID() : m_value(0) {}
-
/// constructor from a ready-made value
///
/// @param id_value is the full decoded value of the identifier
GeometryID(geo_id_value id_value) : m_value(id_value) {}
-
// constructor from a shift and a value
///
/// @param id is numbered object
/// @param type_shift is the shift necessary for the object type
GeometryID(geo_id_value id, geo_id_value type_shift)
: m_value((id << type_shift))
- {}
+ {
+ }
/// Copy constructor
///
/// @param tddID is the geometry ID that will be copied
GeometryID(const GeometryID& tddID) : m_value(tddID.m_value) {}
-
/// Assignement operator
///
/// @param tddID is the geometry ID that will be assigned
diff --git a/Core/include/ACTS/Utilities/GeometryObject.hpp b/Core/include/ACTS/Utilities/GeometryObject.hpp
index e587f6253..53f75c2e6 100644
--- a/Core/include/ACTS/Utilities/GeometryObject.hpp
+++ b/Core/include/ACTS/Utilities/GeometryObject.hpp
@@ -34,12 +34,10 @@ public:
///
/// @param geoID the geometry identifier of the object
GeometryObject() : m_geoID(0) {}
-
/// constructor from a ready-made value
///
/// @param geoID the geometry identifier of the object
GeometryObject(const GeometryID& geoID) : m_geoID(geoID) {}
-
/// assignment operator
///
/// @param geoID the source geoID
@@ -67,7 +65,7 @@ public:
///
/// @param bValue is the dobule in which you want to bin
///
- /// @return float to be used for the binning schema
+ /// @return float to be used for the binning schema
double
binningPositionValue(BinningValue bValue) const;
diff --git a/Core/include/ACTS/Utilities/GeometryObjectSorter.hpp b/Core/include/ACTS/Utilities/GeometryObjectSorter.hpp
index 62af29f74..c7163a631 100644
--- a/Core/include/ACTS/Utilities/GeometryObjectSorter.hpp
+++ b/Core/include/ACTS/Utilities/GeometryObjectSorter.hpp
@@ -22,7 +22,6 @@ template <class T>
class GeometryObjectSorterT : public std::binary_function<T, T, bool>
{
public:
-
/// Constructor from a binning value
///
/// @param bValue is the value in which the binning is done
@@ -34,7 +33,7 @@ public:
}
/// Comparison operator
- ///
+ ///
/// @tparam one first object
/// @tparam two second object
///
diff --git a/Core/include/ACTS/Utilities/Identifier.hpp b/Core/include/ACTS/Utilities/Identifier.hpp
index b5bdd77f5..2943114d8 100644
--- a/Core/include/ACTS/Utilities/Identifier.hpp
+++ b/Core/include/ACTS/Utilities/Identifier.hpp
@@ -53,7 +53,7 @@ public:
Identifier();
/// Constructor from value_type
- ///
+ ///
/// @param value is the identifier value
explicit Identifier(value_type value);
@@ -80,7 +80,7 @@ public:
/// @param old is the assigment parameter
Identifier&
operator=(const Identifier& old);
-
+
/// @param value is the assigment parameter
Identifier&
operator=(value_type value);
diff --git a/Core/include/ACTS/Utilities/Intersection.hpp b/Core/include/ACTS/Utilities/Intersection.hpp
index b1d86f72a..e7b051190 100644
--- a/Core/include/ACTS/Utilities/Intersection.hpp
+++ b/Core/include/ACTS/Utilities/Intersection.hpp
@@ -38,15 +38,17 @@ struct Intersection
bool svalid,
double dist = 0.)
: position(sinter), pathLength(slenght), distance(dist), valid(svalid)
- {}
+ {
+ }
Intersection()
: position(Vector3D(0., 0., 0.)), pathLength(0.), distance(0.), valid(false)
- {}
+ {
+ }
/// Smaller operator for sorting
///
- /// @param si is the intersection for testing
+ /// @param si is the intersection for testing
bool
operator<(const Intersection& si) const
{
@@ -65,7 +67,6 @@ public:
/// Default constructor
ObjectIntersection() : intersection(), object(nullptr), pDirection(0) {}
-
/// Object intersection
///
/// @param sInter is the intersection
@@ -121,7 +122,7 @@ public:
/// Smaller operator for ordering & sorting
///
- /// @param fi is the full intersection to be tested
+ /// @param fi is the full intersection to be tested
bool
operator<(const FullIntersection<T, R, S>& fi) const
{
diff --git a/Core/include/ACTS/Volumes/BoundarySurfaceT.hpp b/Core/include/ACTS/Volumes/BoundarySurfaceT.hpp
index c8cbf661a..76a3bac79 100644
--- a/Core/include/ACTS/Volumes/BoundarySurfaceT.hpp
+++ b/Core/include/ACTS/Volumes/BoundarySurfaceT.hpp
@@ -34,7 +34,8 @@ class Surface;
/// @note inside/outside definitions are given by the normal vector of the
/// surface
///
-/// @todo change to one schema with BinnedArray0D and along/opposite nominclature
+/// @todo change to one schema with BinnedArray0D and along/opposite
+/// nominclature
template <class T>
class BoundarySurfaceT
diff --git a/Core/include/ACTS/Volumes/CuboidVolumeBounds.hpp b/Core/include/ACTS/Volumes/CuboidVolumeBounds.hpp
index b336ea9b2..f8191d33e 100644
--- a/Core/include/ACTS/Volumes/CuboidVolumeBounds.hpp
+++ b/Core/include/ACTS/Volumes/CuboidVolumeBounds.hpp
@@ -90,7 +90,7 @@ public:
/// @note this method is a pure factory the volume is resposible
/// for the memory management
///
- /// @param transformPtr is the transfrom of the volume
+ /// @param transformPtr is the transfrom of the volume
const std::vector<const Surface*>
decomposeToSurfaces(std::shared_ptr<Transform3D> transformPtr) const override;
diff --git a/Core/include/ACTS/Volumes/CylinderVolumeBounds.hpp b/Core/include/ACTS/Volumes/CylinderVolumeBounds.hpp
index f99c285dd..3ff42b4ed 100644
--- a/Core/include/ACTS/Volumes/CylinderVolumeBounds.hpp
+++ b/Core/include/ACTS/Volumes/CylinderVolumeBounds.hpp
@@ -53,13 +53,13 @@ class PlanarBounds;
/// - positiveFaceXY [1] : Acts::DiscSurface with \f$ r_{inner}>0 \f$
/// and \f$ \phi < \pi \f$,
/// parallel to \f$ xy \f$ plane at positive \f$z\f$
-/// - tubeSectorOuterCover [2] : Acts::CylinderSurface with
+/// - tubeSectorOuterCover [2] : Acts::CylinderSurface with
/// \f$ r = r_{outer}\f$
-/// - tubeSectorInnerCover [3] : Acts::CylinderSurface with
+/// - tubeSectorInnerCover [3] : Acts::CylinderSurface with
/// \f$ r = r_{inner} \f$
/// - tubeSectorNegativePhi [4] : Rectangular Acts::PlaneSurface attached to
/// [0] and [1] at negative \f$ \phi \f$
-/// - tubeSectorNegativePhi [5] :
+/// - tubeSectorNegativePhi [5] :
// Rectangular Acts::PlaneSurface attached to
/// [0] and [1] at positive \f$ \phi \f$
///
@@ -105,7 +105,7 @@ public:
double halez);
/// Copy Constructor
- ///
+ ///
/// @param cylbo is the source cylinder volume bounds for the copy
CylinderVolumeBounds(const CylinderVolumeBounds& cylbo);
diff --git a/Core/include/ACTS/Volumes/DoubleTrapezoidVolumeBounds.hpp b/Core/include/ACTS/Volumes/DoubleTrapezoidVolumeBounds.hpp
index 7ec779bdc..05c87a663 100644
--- a/Core/include/ACTS/Volumes/DoubleTrapezoidVolumeBounds.hpp
+++ b/Core/include/ACTS/Volumes/DoubleTrapezoidVolumeBounds.hpp
@@ -163,7 +163,7 @@ public:
private:
/// dump method
///
- /// @tparam dT is the output stream to be dumped into
+ /// @tparam dT is the output stream to be dumped into
template <class T>
T&
dumpT(T& dT) const;
diff --git a/Core/include/ACTS/Volumes/TrapezoidVolumeBounds.hpp b/Core/include/ACTS/Volumes/TrapezoidVolumeBounds.hpp
index 0543e8148..dca72a3d3 100644
--- a/Core/include/ACTS/Volumes/TrapezoidVolumeBounds.hpp
+++ b/Core/include/ACTS/Volumes/TrapezoidVolumeBounds.hpp
@@ -41,7 +41,7 @@ class TrapezoidBounds;
/// (associated to beta)
/// - negativeFaceZX [4] : Rectangular Acts::PlaneSurface,
/// parallel to \f$ zx \f$ plane at negative \f$y\f$
-/// - positiveFaceZX [5] : Rectangular Acts::PlaneSurface,
+/// - positiveFaceZX [5] : Rectangular Acts::PlaneSurface,
/// parallel to \f$ zx \f$ plane at positive \f$y\f$
///
/// @image html TrapezoidVolumeBounds_decomp.gif
@@ -76,7 +76,7 @@ public:
double hlengthz);
/// Constructor - the trapezoid boundaries (arbitrary trapezoid)
- ///
+ ///
/// @param minhlenghtx is the half length in x at minimal y
/// @param hlenghty is the half length in y
/// @param hlengthz is the half length in z
diff --git a/Core/include/ACTS/Volumes/Volume.hpp b/Core/include/ACTS/Volumes/Volume.hpp
index d9667296d..edad5b7fc 100644
--- a/Core/include/ACTS/Volumes/Volume.hpp
+++ b/Core/include/ACTS/Volumes/Volume.hpp
@@ -61,7 +61,7 @@ public:
virtual Volume*
clone() const;
- //// Return methods for geometry transform
+ //// Return methods for geometry transform
const Transform3D&
transform() const;
@@ -85,7 +85,7 @@ public:
/// The binning position method
/// - as default the center is given, but may be overloaded
///
- /// @param bValue is the binning value schema
+ /// @param bValue is the binning value schema
///
/// @return vector 3D that can be used for the binning
virtual const Vector3D
diff --git a/Core/include/ACTS/Volumes/VolumeBounds.hpp b/Core/include/ACTS/Volumes/VolumeBounds.hpp
index b3fda16c4..77794b9c0 100644
--- a/Core/include/ACTS/Volumes/VolumeBounds.hpp
+++ b/Core/include/ACTS/Volumes/VolumeBounds.hpp
@@ -46,10 +46,8 @@ class VolumeBounds
public:
/// Default Constructor*/
VolumeBounds() {}
-
/// Destructor
virtual ~VolumeBounds() {}
-
/// clone() method to make deep copy in Volume copy constructor and for
/// assigment operator of the Surface class.
virtual VolumeBounds*
diff --git a/Core/src/Detector/DetachedTrackingVolume.cpp b/Core/src/Detector/DetachedTrackingVolume.cpp
index 1706f6977..aec03218f 100644
--- a/Core/src/Detector/DetachedTrackingVolume.cpp
+++ b/Core/src/Detector/DetachedTrackingVolume.cpp
@@ -65,7 +65,7 @@ Acts::DetachedTrackingVolume::clone(std::string name,
{
// create the new base tracking volume
std::shared_ptr<const TrackingVolume> shiftedTrackingVolume
- = TrackingVolume::create(*m_trkVolume,shift);
+ = TrackingVolume::create(*m_trkVolume, shift);
// create and shift the layers if there are any
std::shared_ptr<const Layer> layerRepresentation = m_layerRepresentation
diff --git a/Core/src/Layers/Layer.cpp b/Core/src/Layers/Layer.cpp
index 528dabda0..07e2e568c 100644
--- a/Core/src/Layers/Layer.cpp
+++ b/Core/src/Layers/Layer.cpp
@@ -29,7 +29,8 @@ Acts::Layer::Layer()
, m_representingVolume(nullptr)
, m_layerType(Acts::passive)
, m_materialSurface(nullptr)
-{}
+{
+}
Acts::Layer::Layer(std::unique_ptr<SurfaceArray> surfaceArray,
double thickness,
@@ -45,7 +46,8 @@ Acts::Layer::Layer(std::unique_ptr<SurfaceArray> surfaceArray,
, m_representingVolume(nullptr)
, m_layerType(laytyp)
, m_materialSurface(nullptr)
-{}
+{
+}
Acts::Layer::Layer(const Layer& lay)
: m_nextLayers(NextLayers(nullptr, nullptr))
@@ -58,7 +60,8 @@ Acts::Layer::Layer(const Layer& lay)
, m_representingVolume(lay.m_representingVolume)
, m_layerType(lay.m_layerType)
, m_materialSurface(nullptr)
-{}
+{
+}
Acts::Layer::~Layer()
{
diff --git a/Core/src/Utilities/Units.cpp b/Core/src/Utilities/Units.cpp
index 03e4dc9b2..c8982f2e2 100644
--- a/Core/src/Utilities/Units.cpp
+++ b/Core/src/Utilities/Units.cpp
@@ -78,5 +78,5 @@ namespace units {
static const double conversion = 1. / (_c * _c * _GeV_per_J);
return m * conversion;
}
-} // namespace units
+} // namespace units
} // namespace Acts
diff --git a/Examples/src/BuildGenericDetector.cpp b/Examples/src/BuildGenericDetector.cpp
index aaa31466d..33033f729 100644
--- a/Examples/src/BuildGenericDetector.cpp
+++ b/Examples/src/BuildGenericDetector.cpp
@@ -54,8 +54,8 @@ buildGenericDetector(Logging::Level surfaceLLevel,
//-------------------------------------------------------------------------------------
// list the volume builders
std::list<std::shared_ptr<ITrackingVolumeBuilder>> volumeBuilders;
- // a hash include for the Generic Detector : a bit ugly but effective
- #include "GenericDetector.ipp"
+// a hash include for the Generic Detector : a bit ugly but effective
+#include "GenericDetector.ipp"
//-------------------------------------------------------------------------------------
// create the tracking geometry
TrackingGeometryBuilder::Config tgConfig;
--
GitLab