From 3181c2850a4be2ed5608b79f090b0cacbf47ed49 Mon Sep 17 00:00:00 2001
From: Paul Gessinger <hello@paulgessinger.com>
Date: Tue, 24 Apr 2018 13:41:18 +0200
Subject: [PATCH] rename include folder ACTS -> Acts
---
CMakeLists.txt | 2 +-
...{ACTSVersion.hpp.in => ActsVersion.hpp.in} | 0
Core/CMakeLists.txt | 8 ++---
.../Detector/DetachedTrackingVolume.hpp | 10 +++---
.../Detector/DetectorElementBase.hpp | 4 +--
.../Detector/GlueVolumesDescriptor.hpp | 4 +--
.../Detector/TrackingGeometry.hpp | 4 +--
.../Detector/TrackingVolume.hpp | 16 ++++-----
.../Digitization/CartesianSegmentation.hpp | 10 +++---
.../Digitization/DigitizationCell.hpp | 2 +-
.../Digitization/DigitizationModule.hpp | 6 ++--
.../Digitization/PlanarModuleCluster.hpp | 14 ++++----
.../Digitization/PlanarModuleStepper.hpp | 6 ++--
.../Digitization/PolarSegmentation.hpp | 10 +++---
.../Digitization/Segmentation.hpp | 4 +--
.../{ACTS => Acts}/EventData/ChargePolicy.hpp | 0
.../{ACTS => Acts}/EventData/Measurement.hpp | 8 ++---
.../EventData/NeutralParameters.hpp | 8 ++---
.../{ACTS => Acts}/EventData/ParameterSet.hpp | 24 ++++++-------
.../EventData/ParticleDefinitions.hpp | 4 +--
.../EventData/SingleBoundTrackParameters.hpp | 4 +--
.../SingleCurvilinearTrackParameters.hpp | 4 +--
.../EventData/SingleTrackParameters.hpp | 6 ++--
.../EventData/TrackParameters.hpp | 8 ++---
.../EventData/TrackParametersBase.hpp | 8 ++---
.../EventData/TransportJacobian.hpp | 2 +-
.../detail/coordinate_transformations.hpp | 4 +--
.../detail/fittable_type_generator.hpp | 2 +-
.../EventData/detail/full_parameter_set.hpp | 2 +-
.../detail/initialize_parameter_set.hpp | 0
.../detail/make_projection_matrix.hpp | 2 +-
.../EventData/detail/residual_calculator.hpp | 4 +--
.../EventData/detail/value_corrector.hpp | 4 +--
.../{ACTS => Acts}/Fitter/KalmanFitter.hpp | 6 ++--
.../{ACTS => Acts}/Fitter/KalmanUpdator.hpp | 6 ++--
.../{ACTS => Acts}/Layers/ConeLayer.hpp | 6 ++--
.../{ACTS => Acts}/Layers/CylinderLayer.hpp | 14 ++++----
.../{ACTS => Acts}/Layers/DiscLayer.hpp | 8 ++---
.../Layers/GenericApproachDescriptor.hpp | 2 +-
Core/include/{ACTS => Acts}/Layers/Layer.hpp | 20 +++++------
.../{ACTS => Acts}/Layers/NavigationLayer.hpp | 8 ++---
.../{ACTS => Acts}/Layers/PlaneLayer.hpp | 6 ++--
.../{ACTS => Acts}/Layers/ProtoLayer.hpp | 6 ++--
.../{ACTS => Acts}/Layers/detail/Layer.ipp | 0
.../MagneticField/ConstantBField.hpp | 4 +--
.../MagneticField/InterpolatedBFieldMap.hpp | 8 ++---
.../MagneticField/SharedBFieldMap.hpp | 4 +--
.../MagneticField/concept/AnyFieldLookup.hpp | 2 +-
.../Material/BinnedSurfaceMaterial.hpp | 8 ++---
.../Material/HomogeneousSurfaceMaterial.hpp | 6 ++--
.../{ACTS => Acts}/Material/Material.hpp | 0
.../Material/MaterialProperties.hpp | 2 +-
.../Material/SurfaceMaterial.hpp | 6 ++--
.../Material/SurfaceMaterialProxy.hpp | 4 +--
.../{ACTS => Acts}/Propagator/AbortList.hpp | 12 +++----
.../{ACTS => Acts}/Propagator/ActionList.hpp | 12 +++----
.../Propagator/EigenStepper.hpp | 10 +++---
.../{ACTS => Acts}/Propagator/Propagator.hpp | 8 ++---
.../Propagator/detail/Extendable.hpp | 2 +-
.../abort_condition_signature_check.hpp | 4 +--
.../detail/abort_list_implementation.hpp | 4 +--
.../detail/action_list_implementation.hpp | 2 +-
.../detail/action_signature_check.hpp | 2 +-
.../detail/condition_uses_result_type.hpp | 2 +-
.../detail/standard_abort_conditions.hpp | 0
.../Seeding/BarrelSeedFinder.hpp | 6 ++--
.../{ACTS => Acts}/Seeding/SpacePoint.hpp | 4 +--
.../{ACTS => Acts}/Seeding/TrackSeed.hpp | 6 ++--
.../Seeding/detail/cyclic_range.hpp | 2 +-
.../Seeding/detail/geometry.hpp | 4 +--
.../{ACTS => Acts}/Surfaces/BoundaryCheck.hpp | 4 +--
.../{ACTS => Acts}/Surfaces/ConeBounds.hpp | 6 ++--
.../{ACTS => Acts}/Surfaces/ConeSurface.hpp | 10 +++---
.../Surfaces/CylinderBounds.hpp | 8 ++---
.../Surfaces/CylinderSurface.hpp | 8 ++---
.../{ACTS => Acts}/Surfaces/DiamondBounds.hpp | 10 +++---
.../{ACTS => Acts}/Surfaces/DiscBounds.hpp | 2 +-
.../{ACTS => Acts}/Surfaces/DiscSurface.hpp | 12 +++----
.../Surfaces/DiscTrapezoidalBounds.hpp | 8 ++---
.../{ACTS => Acts}/Surfaces/EllipseBounds.hpp | 8 ++---
.../Surfaces/InfiniteBounds.hpp | 6 ++--
.../{ACTS => Acts}/Surfaces/LineBounds.hpp | 6 ++--
.../{ACTS => Acts}/Surfaces/LineSurface.hpp | 10 +++---
.../Surfaces/PerigeeSurface.hpp | 10 +++---
.../{ACTS => Acts}/Surfaces/PlanarBounds.hpp | 4 +--
.../{ACTS => Acts}/Surfaces/PlaneSurface.hpp | 12 +++----
.../{ACTS => Acts}/Surfaces/RadialBounds.hpp | 10 +++---
.../Surfaces/RectangleBounds.hpp | 6 ++--
.../{ACTS => Acts}/Surfaces/StrawSurface.hpp | 10 +++---
.../{ACTS => Acts}/Surfaces/Surface.hpp | 22 ++++++------
.../{ACTS => Acts}/Surfaces/SurfaceArray.hpp | 16 ++++-----
.../{ACTS => Acts}/Surfaces/SurfaceBounds.hpp | 6 ++--
.../Surfaces/TrapezoidBounds.hpp | 10 +++---
.../Surfaces/TriangleBounds.hpp | 10 +++---
.../Tools/CylinderVolumeBuilder.hpp | 14 ++++----
.../Tools/CylinderVolumeHelper.hpp | 10 +++---
.../Tools/ILayerArrayCreator.hpp | 4 +--
.../{ACTS => Acts}/Tools/ILayerBuilder.hpp | 0
.../Tools/ITrackingGeometryBuilder.hpp | 0
.../Tools/ITrackingVolumeArrayCreator.hpp | 4 +--
.../Tools/ITrackingVolumeBuilder.hpp | 0
.../Tools/ITrackingVolumeHelper.hpp | 4 +--
.../Tools/LayerArrayCreator.hpp | 6 ++--
.../{ACTS => Acts}/Tools/LayerCreator.hpp | 10 +++---
.../Tools/PassiveLayerBuilder.hpp | 6 ++--
.../Tools/SurfaceArrayCreator.hpp | 14 ++++----
.../Tools/TrackingGeometryBuilder.hpp | 10 +++---
.../Tools/TrackingVolumeArrayCreator.hpp | 8 ++---
.../Utilities/ApproachDescriptor.hpp | 4 +--
.../Utilities/BFieldMapUtils.hpp | 4 +--
.../{ACTS => Acts}/Utilities/BinUtility.hpp | 6 ++--
.../{ACTS => Acts}/Utilities/BinnedArray.hpp | 4 +--
.../Utilities/BinnedArrayXD.hpp | 4 +--
.../{ACTS => Acts}/Utilities/BinningData.hpp | 6 ++--
.../{ACTS => Acts}/Utilities/BinningType.hpp | 0
.../{ACTS => Acts}/Utilities/Definitions.hpp | 6 ++--
.../{ACTS => Acts}/Utilities/GeometryID.hpp | 2 +-
.../Utilities/GeometryObject.hpp | 6 ++--
.../Utilities/GeometryObjectSorter.hpp | 0
.../Utilities/GeometrySignature.hpp | 0
.../Utilities/GeometryStatics.hpp | 2 +-
.../{ACTS => Acts}/Utilities/Helpers.hpp | 0
.../{ACTS => Acts}/Utilities/IAxis.hpp | 0
.../{ACTS => Acts}/Utilities/Identifier.hpp | 0
.../Utilities/InstanceFactory.hpp | 24 ++++++-------
.../Utilities/Interpolation.hpp | 4 +--
.../{ACTS => Acts}/Utilities/Intersection.hpp | 0
.../{ACTS => Acts}/Utilities/Logger.hpp | 0
.../Utilities/MaterialInteraction.hpp | 6 ++--
.../Utilities/ParameterDefinitions.hpp | 0
.../Utilities/ParameterTypes.hpp | 0
.../{ACTS => Acts}/Utilities/ThrowAssert.hpp | 0
.../{ACTS => Acts}/Utilities/Units.hpp | 18 +++++-----
.../{ACTS => Acts}/Utilities/VariantData.hpp | 4 +--
.../Utilities/VariantDataFwd.hpp | 0
.../Utilities/concept/AnyGrid.hpp | 0
.../{ACTS => Acts}/Utilities/detail/Axis.hpp | 2 +-
.../detail/DefaultParameterDefinitions.hpp | 2 +-
.../{ACTS => Acts}/Utilities/detail/Grid.hpp | 6 ++--
.../Utilities/detail/MPL/all_of.hpp | 0
.../Utilities/detail/MPL/any_of.hpp | 0
.../Utilities/detail/MPL/are_sorted.hpp | 0
.../Utilities/detail/MPL/are_within.hpp | 0
.../Utilities/detail/MPL/at_index.hpp | 0
.../Utilities/detail/MPL/boost_mpl_helper.hpp | 0
.../Utilities/detail/MPL/get_position.hpp | 0
.../Utilities/detail/MPL/has_duplicates.hpp | 0
.../Utilities/detail/MPL/is_contained.hpp | 0
.../Utilities/detail/MPL/type_collector.hpp | 2 +-
.../Utilities/detail/MatrixBasePlugin.hpp | 0
.../Utilities/detail/MatrixPlugin.hpp | 0
.../detail/RealQuadraticEquation.hpp | 0
.../Utilities/detail/TransformPlugin.hpp | 0
.../Utilities/detail/grid_helper.hpp | 2 +-
.../Utilities/detail/interpolation_impl.hpp | 0
.../Utilities/detail/periodic.hpp | 0
.../{ACTS => Acts}/Volumes/AbstractVolume.hpp | 6 ++--
.../Volumes/BoundarySurfaceFace.hpp | 0
.../Volumes/BoundarySurfaceT.hpp | 8 ++---
.../Volumes/CuboidVolumeBounds.hpp | 4 +--
.../Volumes/CylinderVolumeBounds.hpp | 4 +--
.../Volumes/DoubleTrapezoidVolumeBounds.hpp | 4 +--
.../Volumes/TrapezoidVolumeBounds.hpp | 4 +--
.../include/{ACTS => Acts}/Volumes/Volume.hpp | 6 ++--
.../{ACTS => Acts}/Volumes/VolumeBounds.hpp | 4 +--
Core/src/Detector/DetachedTrackingVolume.cpp | 6 ++--
Core/src/Detector/GlueVolumesDescriptor.cpp | 4 +--
Core/src/Detector/TrackingGeometry.cpp | 12 +++----
Core/src/Detector/TrackingVolume.cpp | 14 ++++----
.../Digitization/CartesianSegmentation.cpp | 8 ++---
Core/src/Digitization/DigitizationModule.cpp | 2 +-
Core/src/Digitization/PlanarModuleStepper.cpp | 10 +++---
Core/src/Digitization/PolarSegmentation.cpp | 10 +++---
Core/src/EventData/NeutralParameters.cpp | 2 +-
Core/src/EventData/TrackParameters.cpp | 2 +-
Core/src/EventData/TrackParametersBase.cpp | 2 +-
Core/src/EventData/TransportJacobian.cpp | 2 +-
Core/src/GeometryUtils/BinUtility.cpp | 2 +-
Core/src/GeometryUtils/GeometryID.cpp | 2 +-
Core/src/Layers/ConeLayer.cpp | 8 ++---
Core/src/Layers/CylinderLayer.cpp | 22 ++++++------
Core/src/Layers/DiscLayer.cpp | 24 ++++++-------
Core/src/Layers/Layer.cpp | 12 +++----
Core/src/Layers/NavigationLayer.cpp | 8 ++---
Core/src/Layers/PlaneLayer.cpp | 10 +++---
Core/src/Layers/ProtoLayer.cpp | 2 +-
Core/src/Material/BinnedSurfaceMaterial.cpp | 4 +--
.../Material/HomogeneousSurfaceMaterial.cpp | 4 +--
Core/src/Material/MaterialProperties.cpp | 2 +-
Core/src/Material/SurfaceMaterialProxy.cpp | 2 +-
Core/src/Surfaces/ConeBounds.cpp | 6 ++--
Core/src/Surfaces/ConeSurface.cpp | 8 ++---
Core/src/Surfaces/CylinderBounds.cpp | 6 ++--
Core/src/Surfaces/CylinderSurface.cpp | 8 ++---
Core/src/Surfaces/DiamondBounds.cpp | 6 ++--
Core/src/Surfaces/DiscSurface.cpp | 16 ++++-----
Core/src/Surfaces/DiscTrapezoidalBounds.cpp | 6 ++--
Core/src/Surfaces/EllipseBounds.cpp | 6 ++--
Core/src/Surfaces/InfinitieBounds.cpp | 4 +--
Core/src/Surfaces/LineBounds.cpp | 4 +--
Core/src/Surfaces/LineSurface.cpp | 6 ++--
Core/src/Surfaces/PerigeeSurface.cpp | 4 +--
Core/src/Surfaces/PlaneSurface.cpp | 14 ++++----
Core/src/Surfaces/RadialBounds.cpp | 6 ++--
Core/src/Surfaces/RectangleBounds.cpp | 6 ++--
Core/src/Surfaces/StrawSurface.cpp | 8 ++---
Core/src/Surfaces/Surface.cpp | 2 +-
Core/src/Surfaces/SurfaceArray.cpp | 12 +++----
Core/src/Surfaces/TrapezoidBounds.cpp | 4 +--
Core/src/Surfaces/TriangleBounds.cpp | 4 +--
Core/src/Tools/CylinderVolumeBuilder.cpp | 18 +++++-----
Core/src/Tools/CylinderVolumeHelper.cpp | 32 ++++++++---------
Core/src/Tools/LayerArrayCreator.cpp | 30 ++++++++--------
Core/src/Tools/LayerCreator.cpp | 18 +++++-----
Core/src/Tools/PassiveLayerBuilder.cpp | 16 ++++-----
Core/src/Tools/SurfaceArrayCreator.cpp | 18 +++++-----
Core/src/Tools/TrackingGeometryBuilder.cpp | 12 +++----
Core/src/Tools/TrackingVolumeArrayCreator.cpp | 14 ++++----
Core/src/Utilities/BFieldMapUtils.cpp | 6 ++--
Core/src/Utilities/Logger.cpp | 2 +-
Core/src/Utilities/MaterialInteraction.cpp | 2 +-
Core/src/Utilities/Units.cpp | 2 +-
Core/src/Volumes/AbstractVolume.cpp | 8 ++---
Core/src/Volumes/CuboidVolumeBounds.cpp | 8 ++---
Core/src/Volumes/CylinderVolumeBounds.cpp | 14 ++++----
.../Volumes/DoubleTrapezoidVolumeBounds.cpp | 8 ++---
Core/src/Volumes/TrapezoidVolumeBounds.cpp | 10 +++---
Core/src/Volumes/Volume.cpp | 4 +--
Core/src/Volumes/VolumeBounds.cpp | 2 +-
Examples/src/CustomDefaultLogger.cpp | 2 +-
.../ATLSeedingIntegrationTest.cpp | 2 +-
IntegrationTests/PropagationTests.cpp | 28 +++++++--------
.../PropagationTestsAtlasField.cpp | 36 +++++++++----------
.../covariance_validation_fixture.hpp | 6 ++--
.../Extrapolation/ExtrapolationCell.hpp | 16 ++++-----
.../Extrapolation/ExtrapolationEngine.hpp | 18 +++++-----
.../Extrapolation/IExtrapolationEngine.hpp | 8 ++---
.../Extrapolation/IMaterialEffectsEngine.hpp | 10 +++---
.../IMultipleScatteringUpdator.hpp | 2 +-
.../Extrapolation/INavigationEngine.hpp | 6 ++--
.../Extrapolation/IPropagationEngine.hpp | 6 ++--
.../Extrapolation/MaterialEffectsEngine.hpp | 16 ++++-----
.../Extrapolation/MaterialUpdateMode.hpp | 0
.../Extrapolation/RungeKuttaEngine.hpp | 28 +++++++--------
.../Extrapolation/StaticEngine.hpp | 20 +++++------
.../Extrapolation/StaticNavigationEngine.hpp | 20 +++++------
.../{ACTS => Acts}/Extrapolation/Wrapper.hpp | 16 ++++-----
.../detail/ExtrapolationCell.ipp | 0
.../detail/ExtrapolationEngine.ipp | 8 ++---
.../detail/ExtrapolationMacros.hpp | 0
.../Extrapolation/detail/RungeKuttaEngine.ipp | 16 ++++-----
.../Extrapolation/detail/RungeKuttaUtils.hpp | 6 ++--
.../Extrapolation/detail/StaticEngine.ipp | 14 ++++----
.../detail/StaticNavigationEngine.ipp | 12 +++----
.../Propagator/AtlasStepper.hpp | 8 ++---
.../{ACTS => Acts}/Seeding/ATL_Seedmaker.hpp | 6 ++--
.../{ACTS => Acts}/Seeding/ATL_Seedmaker.ipp | 0
.../{ACTS => Acts}/Seeding/InternalSeed.hpp | 4 +--
.../{ACTS => Acts}/Seeding/SPForSeed.hpp | 0
.../include/{ACTS => Acts}/Seeding/Seed.hpp | 0
.../src/Extrapolation/ExtrapolationCell.cpp | 2 +-
.../src/Extrapolation/ExtrapolationEngine.cpp | 2 +-
.../Extrapolation/MaterialEffectsEngine.cpp | 8 ++---
Legacy/src/Extrapolation/RungeKuttaUtils.cpp | 14 ++++----
Legacy/src/Extrapolation/StaticEngine.cpp | 2 +-
.../Extrapolation/StaticNavigationEngine.cpp | 2 +-
.../Plugins/DD4hepPlugins/ActsExtension.hpp | 10 +++---
.../DD4hepPlugins/ConvertDD4hepDetector.hpp | 12 +++----
.../DD4hepPlugins/DD4hepDetElement.hpp | 2 +-
.../DD4hepPlugins/DD4hepLayerBuilder.hpp | 12 +++----
.../Plugins/DD4hepPlugins/IActsExtension.hpp | 2 +-
Plugins/DD4hepPlugin/src/ActsExtension.cpp | 16 ++++-----
.../src/ConvertDD4hepDetector.cpp | 20 +++++------
.../src/DD4hepDetectorElement.cpp | 14 ++++----
.../DD4hepPlugin/src/DD4hepLayerBuilder.cpp | 36 +++++++++----------
.../Geant4Plugins/Geant4DetectorElement.hpp | 0
.../Plugins/JsonPlugin/FromJson.hpp | 2 +-
.../Plugins/JsonPlugin/lib/json.hpp | 0
Plugins/JsonPlugin/src/FromJson.cpp | 8 ++---
.../MaterialPlugins/AssignedMaterialSteps.hpp | 6 ++--
.../MaterialPlugins/MaterialMapper.hpp | 14 ++++----
.../Plugins/MaterialPlugins/MaterialStep.hpp | 4 +--
.../Plugins/MaterialPlugins/MaterialTrack.hpp | 2 +-
.../MaterialPlugins/SurfaceMaterialRecord.hpp | 10 +++---
Plugins/MaterialPlugin/src/MaterialMapper.cpp | 34 +++++++++---------
Plugins/MaterialPlugin/src/MaterialStep.cpp | 2 +-
Plugins/MaterialPlugin/src/MaterialTrack.cpp | 2 +-
.../src/SurfaceMaterialRecord.cpp | 4 +--
.../TGeoPlugins/TGeoDetectorElement.hpp | 2 +-
.../Plugins/TGeoPlugins/TGeoLayerBuilder.hpp | 8 ++---
.../TGeoPlugin/src/TGeoDetectorElement.cpp | 22 ++++++------
Plugins/TGeoPlugin/src/TGeoLayerBuilder.cpp | 6 ++--
Tests/Detector/GeometryCreation.hpp | 18 +++++-----
.../Detector/TrackingGeometryClosureTests.cpp | 4 +--
Tests/Detector/TrackingGeometryGeoIDTests.cpp | 4 +--
Tests/EventData/BoundParametersTests.cpp | 28 +++++++--------
.../EventData/CurvilinearParametersTests.cpp | 6 ++--
Tests/EventData/MeasurementTests.cpp | 6 ++--
Tests/EventData/ParameterSetTests.cpp | 4 +--
Tests/EventData/ParametersTestHelper.hpp | 4 +--
.../Extrapolation/ExtrapolationCellTests.cpp | 10 +++---
Tests/Fitter/GainMatrixTests.cpp | 10 +++---
Tests/Fitter/KalmanFilterTestUtils.hpp | 32 ++++++++---------
Tests/Fitter/KalmanFilterTests.cpp | 28 +++++++--------
Tests/Json/FromJsonTests.cpp | 22 ++++++------
Tests/Layers/ConeLayerTests.cpp | 14 ++++----
Tests/Layers/CylinderLayerTests.cpp | 16 ++++-----
Tests/Layers/DiscLayerTests.cpp | 18 +++++-----
.../Layers/GenericApproachDescriptorTests.cpp | 4 +--
Tests/Layers/LayerStub.hpp | 2 +-
Tests/Layers/LayerTests.cpp | 12 +++----
Tests/Layers/NavigationLayerTests.cpp | 14 ++++----
Tests/Layers/PlaneLayerTests.cpp | 14 ++++----
Tests/Layers/ProtoLayerTests.cpp | 2 +-
Tests/MagneticField/ConstantBFieldTests.cpp | 6 ++--
.../InterpolatedBFieldMapTests.cpp | 6 ++--
Tests/Material/MaterialPropertiesTests.cpp | 2 +-
Tests/Material/MaterialTests.cpp | 2 +-
.../MaterialMapping/MaterialMappingTests.cpp | 8 ++---
Tests/Propagator/AbortListTests.cpp | 12 +++----
Tests/Propagator/ActionListTests.cpp | 20 +++++------
Tests/Propagator/AtlasPropagatorBenchmark.cpp | 12 +++----
Tests/Propagator/AtlasStepperBenchmark.cpp | 12 +++----
Tests/Propagator/EigenStepperBenchmark.cpp | 12 +++----
Tests/Propagator/ExtendableTests.cpp | 4 +--
Tests/Propagator/JacobianTests.cpp | 20 +++++------
Tests/Propagator/PropagatorTests.cpp | 18 +++++-----
Tests/Propagator/RungeKuttaEngineTests.cpp | 22 ++++++------
Tests/Seeding/SeedingTests.cpp | 6 ++--
Tests/Seeding/SeedingTestsCommon.hpp | 4 +--
Tests/Seeding/SeedingToolsTests.cpp | 6 ++--
Tests/Surfaces/BoundaryCheckBenchmark.cpp | 6 ++--
Tests/Surfaces/BoundaryCheckTests.cpp | 6 ++--
Tests/Surfaces/ConeBoundsTests.cpp | 6 ++--
Tests/Surfaces/ConeSurfaceTests.cpp | 8 ++---
Tests/Surfaces/CylinderBoundsTests.cpp | 6 ++--
Tests/Surfaces/CylinderSurfaceTests.cpp | 8 ++---
Tests/Surfaces/DetectorElementStub.hpp | 12 +++----
Tests/Surfaces/DiamondBoundsTests.cpp | 8 ++---
Tests/Surfaces/DiscSurfaceTests.cpp | 12 +++----
Tests/Surfaces/DiscTrapezoidalBoundsTests.cpp | 6 ++--
Tests/Surfaces/EllipseBoundsTests.cpp | 6 ++--
Tests/Surfaces/InfiniteBoundsTests.cpp | 4 +--
Tests/Surfaces/LineBoundsTests.cpp | 4 +--
Tests/Surfaces/LineSurfaceStub.hpp | 6 ++--
Tests/Surfaces/LineSurfaceTests.cpp | 8 ++---
Tests/Surfaces/PerigeeSurfaceTests.cpp | 14 ++++----
Tests/Surfaces/PlaneSurfaceTests.cpp | 10 +++---
Tests/Surfaces/RadialBoundsTests.cpp | 6 ++--
Tests/Surfaces/RectangleBoundsTests.cpp | 6 ++--
Tests/Surfaces/StrawSurfaceTests.cpp | 12 +++----
Tests/Surfaces/SurfaceArrayTests.cpp | 22 ++++++------
Tests/Surfaces/SurfaceBoundsTests.cpp | 6 ++--
Tests/Surfaces/SurfaceStub.hpp | 10 +++---
Tests/Surfaces/SurfaceTests.cpp | 12 +++----
Tests/Surfaces/TrapezoidBoundsTests.cpp | 6 ++--
Tests/Surfaces/TriangleBoundsTests.cpp | 6 ++--
Tests/Tools/CylinderVolumeBuilderTests.cpp | 4 +--
Tests/Tools/LayerCreatorTests.cpp | 26 +++++++-------
Tests/Tools/SurfaceArrayCreatorTests.cpp | 10 +++---
Tests/Utilities/AxesTests.cpp | 2 +-
Tests/Utilities/BFieldMapUtilsTests.cpp | 4 +--
Tests/Utilities/BinUtilityTests.cpp | 6 ++--
Tests/Utilities/BinningDataTests.cpp | 4 +--
Tests/Utilities/GeometryIDTests.cpp | 4 +--
Tests/Utilities/GridTests.cpp | 6 ++--
Tests/Utilities/InterpolationTests.cpp | 6 ++--
Tests/Utilities/LoggerTests.cpp | 2 +-
Tests/Utilities/MPLTests.cpp | 16 ++++-----
.../Utilities/RealQuadraticEquationTests.cpp | 4 +--
Tests/Utilities/UnitConversionTests.cpp | 2 +-
Tests/Volumes/CylinderVolumeBoundsTests.cpp | 6 ++--
doc/Modules.hpp | 2 +-
373 files changed, 1376 insertions(+), 1376 deletions(-)
rename Core/{ACTSVersion.hpp.in => ActsVersion.hpp.in} (100%)
rename Core/include/{ACTS => Acts}/Detector/DetachedTrackingVolume.hpp (96%)
rename Core/include/{ACTS => Acts}/Detector/DetectorElementBase.hpp (98%)
rename Core/include/{ACTS => Acts}/Detector/GlueVolumesDescriptor.hpp (96%)
rename Core/include/{ACTS => Acts}/Detector/TrackingGeometry.hpp (98%)
rename Core/include/{ACTS => Acts}/Detector/TrackingVolume.hpp (98%)
rename Core/include/{ACTS => Acts}/Digitization/CartesianSegmentation.hpp (95%)
rename Core/include/{ACTS => Acts}/Digitization/DigitizationCell.hpp (98%)
rename Core/include/{ACTS => Acts}/Digitization/DigitizationModule.hpp (97%)
rename Core/include/{ACTS => Acts}/Digitization/PlanarModuleCluster.hpp (89%)
rename Core/include/{ACTS => Acts}/Digitization/PlanarModuleStepper.hpp (95%)
rename Core/include/{ACTS => Acts}/Digitization/PolarSegmentation.hpp (96%)
rename Core/include/{ACTS => Acts}/Digitization/Segmentation.hpp (97%)
rename Core/include/{ACTS => Acts}/EventData/ChargePolicy.hpp (100%)
rename Core/include/{ACTS => Acts}/EventData/Measurement.hpp (98%)
rename Core/include/{ACTS => Acts}/EventData/NeutralParameters.hpp (76%)
rename Core/include/{ACTS => Acts}/EventData/ParameterSet.hpp (96%)
rename Core/include/{ACTS => Acts}/EventData/ParticleDefinitions.hpp (99%)
rename Core/include/{ACTS => Acts}/EventData/SingleBoundTrackParameters.hpp (99%)
rename Core/include/{ACTS => Acts}/EventData/SingleCurvilinearTrackParameters.hpp (98%)
rename Core/include/{ACTS => Acts}/EventData/SingleTrackParameters.hpp (97%)
rename Core/include/{ACTS => Acts}/EventData/TrackParameters.hpp (75%)
rename Core/include/{ACTS => Acts}/EventData/TrackParametersBase.hpp (96%)
rename Core/include/{ACTS => Acts}/EventData/TransportJacobian.hpp (98%)
rename Core/include/{ACTS => Acts}/EventData/detail/coordinate_transformations.hpp (96%)
rename Core/include/{ACTS => Acts}/EventData/detail/fittable_type_generator.hpp (98%)
rename Core/include/{ACTS => Acts}/EventData/detail/full_parameter_set.hpp (97%)
rename Core/include/{ACTS => Acts}/EventData/detail/initialize_parameter_set.hpp (100%)
rename Core/include/{ACTS => Acts}/EventData/detail/make_projection_matrix.hpp (98%)
rename Core/include/{ACTS => Acts}/EventData/detail/residual_calculator.hpp (96%)
rename Core/include/{ACTS => Acts}/EventData/detail/value_corrector.hpp (96%)
rename Core/include/{ACTS => Acts}/Fitter/KalmanFitter.hpp (98%)
rename Core/include/{ACTS => Acts}/Fitter/KalmanUpdator.hpp (94%)
rename Core/include/{ACTS => Acts}/Layers/ConeLayer.hpp (97%)
rename Core/include/{ACTS => Acts}/Layers/CylinderLayer.hpp (94%)
rename Core/include/{ACTS => Acts}/Layers/DiscLayer.hpp (96%)
rename Core/include/{ACTS => Acts}/Layers/GenericApproachDescriptor.hpp (99%)
rename Core/include/{ACTS => Acts}/Layers/Layer.hpp (97%)
rename Core/include/{ACTS => Acts}/Layers/NavigationLayer.hpp (96%)
rename Core/include/{ACTS => Acts}/Layers/PlaneLayer.hpp (97%)
rename Core/include/{ACTS => Acts}/Layers/ProtoLayer.hpp (93%)
rename Core/include/{ACTS => Acts}/Layers/detail/Layer.ipp (100%)
rename Core/include/{ACTS => Acts}/MagneticField/ConstantBField.hpp (98%)
rename Core/include/{ACTS => Acts}/MagneticField/InterpolatedBFieldMap.hpp (98%)
rename Core/include/{ACTS => Acts}/MagneticField/SharedBFieldMap.hpp (95%)
rename Core/include/{ACTS => Acts}/MagneticField/concept/AnyFieldLookup.hpp (99%)
rename Core/include/{ACTS => Acts}/Material/BinnedSurfaceMaterial.hpp (96%)
rename Core/include/{ACTS => Acts}/Material/HomogeneousSurfaceMaterial.hpp (95%)
rename Core/include/{ACTS => Acts}/Material/Material.hpp (100%)
rename Core/include/{ACTS => Acts}/Material/MaterialProperties.hpp (99%)
rename Core/include/{ACTS => Acts}/Material/SurfaceMaterial.hpp (96%)
rename Core/include/{ACTS => Acts}/Material/SurfaceMaterialProxy.hpp (97%)
rename Core/include/{ACTS => Acts}/Propagator/AbortList.hpp (84%)
rename Core/include/{ACTS => Acts}/Propagator/ActionList.hpp (85%)
rename Core/include/{ACTS => Acts}/Propagator/EigenStepper.hpp (98%)
rename Core/include/{ACTS => Acts}/Propagator/Propagator.hpp (98%)
rename Core/include/{ACTS => Acts}/Propagator/detail/Extendable.hpp (97%)
rename Core/include/{ACTS => Acts}/Propagator/detail/abort_condition_signature_check.hpp (95%)
rename Core/include/{ACTS => Acts}/Propagator/detail/abort_list_implementation.hpp (96%)
rename Core/include/{ACTS => Acts}/Propagator/detail/action_list_implementation.hpp (97%)
rename Core/include/{ACTS => Acts}/Propagator/detail/action_signature_check.hpp (97%)
rename Core/include/{ACTS => Acts}/Propagator/detail/condition_uses_result_type.hpp (94%)
rename Core/include/{ACTS => Acts}/Propagator/detail/standard_abort_conditions.hpp (100%)
rename Core/include/{ACTS => Acts}/Seeding/BarrelSeedFinder.hpp (95%)
rename Core/include/{ACTS => Acts}/Seeding/SpacePoint.hpp (96%)
rename Core/include/{ACTS => Acts}/Seeding/TrackSeed.hpp (95%)
rename Core/include/{ACTS => Acts}/Seeding/detail/cyclic_range.hpp (98%)
rename Core/include/{ACTS => Acts}/Seeding/detail/geometry.hpp (97%)
rename Core/include/{ACTS => Acts}/Surfaces/BoundaryCheck.hpp (99%)
rename Core/include/{ACTS => Acts}/Surfaces/ConeBounds.hpp (97%)
rename Core/include/{ACTS => Acts}/Surfaces/ConeSurface.hpp (97%)
rename Core/include/{ACTS => Acts}/Surfaces/CylinderBounds.hpp (96%)
rename Core/include/{ACTS => Acts}/Surfaces/CylinderSurface.hpp (98%)
rename Core/include/{ACTS => Acts}/Surfaces/DiamondBounds.hpp (95%)
rename Core/include/{ACTS => Acts}/Surfaces/DiscBounds.hpp (95%)
rename Core/include/{ACTS => Acts}/Surfaces/DiscSurface.hpp (98%)
rename Core/include/{ACTS => Acts}/Surfaces/DiscTrapezoidalBounds.hpp (96%)
rename Core/include/{ACTS => Acts}/Surfaces/EllipseBounds.hpp (96%)
rename Core/include/{ACTS => Acts}/Surfaces/InfiniteBounds.hpp (93%)
rename Core/include/{ACTS => Acts}/Surfaces/LineBounds.hpp (95%)
rename Core/include/{ACTS => Acts}/Surfaces/LineSurface.hpp (98%)
rename Core/include/{ACTS => Acts}/Surfaces/PerigeeSurface.hpp (92%)
rename Core/include/{ACTS => Acts}/Surfaces/PlanarBounds.hpp (93%)
rename Core/include/{ACTS => Acts}/Surfaces/PlaneSurface.hpp (97%)
rename Core/include/{ACTS => Acts}/Surfaces/RadialBounds.hpp (94%)
rename Core/include/{ACTS => Acts}/Surfaces/RectangleBounds.hpp (96%)
rename Core/include/{ACTS => Acts}/Surfaces/StrawSurface.hpp (94%)
rename Core/include/{ACTS => Acts}/Surfaces/Surface.hpp (97%)
rename Core/include/{ACTS => Acts}/Surfaces/SurfaceArray.hpp (98%)
rename Core/include/{ACTS => Acts}/Surfaces/SurfaceBounds.hpp (96%)
rename Core/include/{ACTS => Acts}/Surfaces/TrapezoidBounds.hpp (96%)
rename Core/include/{ACTS => Acts}/Surfaces/TriangleBounds.hpp (92%)
rename Core/include/{ACTS => Acts}/Tools/CylinderVolumeBuilder.hpp (98%)
rename Core/include/{ACTS => Acts}/Tools/CylinderVolumeHelper.hpp (98%)
rename Core/include/{ACTS => Acts}/Tools/ILayerArrayCreator.hpp (95%)
rename Core/include/{ACTS => Acts}/Tools/ILayerBuilder.hpp (100%)
rename Core/include/{ACTS => Acts}/Tools/ITrackingGeometryBuilder.hpp (100%)
rename Core/include/{ACTS => Acts}/Tools/ITrackingVolumeArrayCreator.hpp (96%)
rename Core/include/{ACTS => Acts}/Tools/ITrackingVolumeBuilder.hpp (100%)
rename Core/include/{ACTS => Acts}/Tools/ITrackingVolumeHelper.hpp (98%)
rename Core/include/{ACTS => Acts}/Tools/LayerArrayCreator.hpp (96%)
rename Core/include/{ACTS => Acts}/Tools/LayerCreator.hpp (97%)
rename Core/include/{ACTS => Acts}/Tools/PassiveLayerBuilder.hpp (97%)
rename Core/include/{ACTS => Acts}/Tools/SurfaceArrayCreator.hpp (98%)
rename Core/include/{ACTS => Acts}/Tools/TrackingGeometryBuilder.hpp (93%)
rename Core/include/{ACTS => Acts}/Tools/TrackingVolumeArrayCreator.hpp (92%)
rename Core/include/{ACTS => Acts}/Utilities/ApproachDescriptor.hpp (96%)
rename Core/include/{ACTS => Acts}/Utilities/BFieldMapUtils.hpp (98%)
rename Core/include/{ACTS => Acts}/Utilities/BinUtility.hpp (99%)
rename Core/include/{ACTS => Acts}/Utilities/BinnedArray.hpp (97%)
rename Core/include/{ACTS => Acts}/Utilities/BinnedArrayXD.hpp (98%)
rename Core/include/{ACTS => Acts}/Utilities/BinningData.hpp (99%)
rename Core/include/{ACTS => Acts}/Utilities/BinningType.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/Definitions.hpp (95%)
rename Core/include/{ACTS => Acts}/Utilities/GeometryID.hpp (99%)
rename Core/include/{ACTS => Acts}/Utilities/GeometryObject.hpp (95%)
rename Core/include/{ACTS => Acts}/Utilities/GeometryObjectSorter.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/GeometrySignature.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/GeometryStatics.hpp (97%)
rename Core/include/{ACTS => Acts}/Utilities/Helpers.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/IAxis.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/Identifier.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/InstanceFactory.hpp (89%)
rename Core/include/{ACTS => Acts}/Utilities/Interpolation.hpp (97%)
rename Core/include/{ACTS => Acts}/Utilities/Intersection.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/Logger.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/MaterialInteraction.hpp (96%)
rename Core/include/{ACTS => Acts}/Utilities/ParameterDefinitions.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/ParameterTypes.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/ThrowAssert.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/Units.hpp (94%)
rename Core/include/{ACTS => Acts}/Utilities/VariantData.hpp (99%)
rename Core/include/{ACTS => Acts}/Utilities/VariantDataFwd.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/concept/AnyGrid.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/detail/Axis.hpp (99%)
rename Core/include/{ACTS => Acts}/Utilities/detail/DefaultParameterDefinitions.hpp (97%)
rename Core/include/{ACTS => Acts}/Utilities/detail/Grid.hpp (99%)
rename Core/include/{ACTS => Acts}/Utilities/detail/MPL/all_of.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/detail/MPL/any_of.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/detail/MPL/are_sorted.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/detail/MPL/are_within.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/detail/MPL/at_index.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/detail/MPL/boost_mpl_helper.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/detail/MPL/get_position.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/detail/MPL/has_duplicates.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/detail/MPL/is_contained.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/detail/MPL/type_collector.hpp (98%)
rename Core/include/{ACTS => Acts}/Utilities/detail/MatrixBasePlugin.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/detail/MatrixPlugin.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/detail/RealQuadraticEquation.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/detail/TransformPlugin.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/detail/grid_helper.hpp (99%)
rename Core/include/{ACTS => Acts}/Utilities/detail/interpolation_impl.hpp (100%)
rename Core/include/{ACTS => Acts}/Utilities/detail/periodic.hpp (100%)
rename Core/include/{ACTS => Acts}/Volumes/AbstractVolume.hpp (95%)
rename Core/include/{ACTS => Acts}/Volumes/BoundarySurfaceFace.hpp (100%)
rename Core/include/{ACTS => Acts}/Volumes/BoundarySurfaceT.hpp (97%)
rename Core/include/{ACTS => Acts}/Volumes/CuboidVolumeBounds.hpp (98%)
rename Core/include/{ACTS => Acts}/Volumes/CylinderVolumeBounds.hpp (99%)
rename Core/include/{ACTS => Acts}/Volumes/DoubleTrapezoidVolumeBounds.hpp (99%)
rename Core/include/{ACTS => Acts}/Volumes/TrapezoidVolumeBounds.hpp (98%)
rename Core/include/{ACTS => Acts}/Volumes/Volume.hpp (95%)
rename Core/include/{ACTS => Acts}/Volumes/VolumeBounds.hpp (97%)
rename Legacy/include/{ACTS => Acts}/Extrapolation/ExtrapolationCell.hpp (98%)
rename Legacy/include/{ACTS => Acts}/Extrapolation/ExtrapolationEngine.hpp (92%)
rename Legacy/include/{ACTS => Acts}/Extrapolation/IExtrapolationEngine.hpp (92%)
rename Legacy/include/{ACTS => Acts}/Extrapolation/IMaterialEffectsEngine.hpp (91%)
rename Legacy/include/{ACTS => Acts}/Extrapolation/IMultipleScatteringUpdator.hpp (96%)
rename Legacy/include/{ACTS => Acts}/Extrapolation/INavigationEngine.hpp (95%)
rename Legacy/include/{ACTS => Acts}/Extrapolation/IPropagationEngine.hpp (96%)
rename Legacy/include/{ACTS => Acts}/Extrapolation/MaterialEffectsEngine.hpp (92%)
rename Legacy/include/{ACTS => Acts}/Extrapolation/MaterialUpdateMode.hpp (100%)
rename Legacy/include/{ACTS => Acts}/Extrapolation/RungeKuttaEngine.hpp (95%)
rename Legacy/include/{ACTS => Acts}/Extrapolation/StaticEngine.hpp (93%)
rename Legacy/include/{ACTS => Acts}/Extrapolation/StaticNavigationEngine.hpp (92%)
rename Legacy/include/{ACTS => Acts}/Extrapolation/Wrapper.hpp (96%)
rename Legacy/include/{ACTS => Acts}/Extrapolation/detail/ExtrapolationCell.ipp (100%)
rename Legacy/include/{ACTS => Acts}/Extrapolation/detail/ExtrapolationEngine.ipp (98%)
rename Legacy/include/{ACTS => Acts}/Extrapolation/detail/ExtrapolationMacros.hpp (100%)
rename Legacy/include/{ACTS => Acts}/Extrapolation/detail/RungeKuttaEngine.ipp (99%)
rename Legacy/include/{ACTS => Acts}/Extrapolation/detail/RungeKuttaUtils.hpp (98%)
rename Legacy/include/{ACTS => Acts}/Extrapolation/detail/StaticEngine.ipp (98%)
rename Legacy/include/{ACTS => Acts}/Extrapolation/detail/StaticNavigationEngine.ipp (98%)
rename Legacy/include/{ACTS => Acts}/Propagator/AtlasStepper.hpp (99%)
rename Legacy/include/{ACTS => Acts}/Seeding/ATL_Seedmaker.hpp (98%)
rename Legacy/include/{ACTS => Acts}/Seeding/ATL_Seedmaker.ipp (100%)
rename Legacy/include/{ACTS => Acts}/Seeding/InternalSeed.hpp (98%)
rename Legacy/include/{ACTS => Acts}/Seeding/SPForSeed.hpp (100%)
rename Legacy/include/{ACTS => Acts}/Seeding/Seed.hpp (100%)
rename Plugins/DD4hepPlugin/include/{ACTS => Acts}/Plugins/DD4hepPlugins/ActsExtension.hpp (98%)
rename Plugins/DD4hepPlugin/include/{ACTS => Acts}/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp (97%)
rename Plugins/DD4hepPlugin/include/{ACTS => Acts}/Plugins/DD4hepPlugins/DD4hepDetElement.hpp (98%)
rename Plugins/DD4hepPlugin/include/{ACTS => Acts}/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp (96%)
rename Plugins/DD4hepPlugin/include/{ACTS => Acts}/Plugins/DD4hepPlugins/IActsExtension.hpp (99%)
rename Plugins/Geant4Plugin/include/{ACTS => Acts}/Plugins/Geant4Plugins/Geant4DetectorElement.hpp (100%)
rename Plugins/JsonPlugin/include/{ACTS => Acts}/Plugins/JsonPlugin/FromJson.hpp (93%)
rename Plugins/JsonPlugin/include/{ACTS => Acts}/Plugins/JsonPlugin/lib/json.hpp (100%)
rename Plugins/MaterialPlugin/include/{ACTS => Acts}/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp (90%)
rename Plugins/MaterialPlugin/include/{ACTS => Acts}/Plugins/MaterialPlugins/MaterialMapper.hpp (93%)
rename Plugins/MaterialPlugin/include/{ACTS => Acts}/Plugins/MaterialPlugins/MaterialStep.hpp (97%)
rename Plugins/MaterialPlugin/include/{ACTS => Acts}/Plugins/MaterialPlugins/MaterialTrack.hpp (98%)
rename Plugins/MaterialPlugin/include/{ACTS => Acts}/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp (93%)
rename Plugins/TGeoPlugin/include/{ACTS => Acts}/Plugins/TGeoPlugins/TGeoDetectorElement.hpp (99%)
rename Plugins/TGeoPlugin/include/{ACTS => Acts}/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp (96%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c99b5318f..9299a0941 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ option (ACTS_BUILD_TGEO_PLUGIN "Build TGeo plugins" OFF)
option (ACTS_BUILD_JSON_PLUGIN "Build Json plugin" OFF)
# all other compile-time parameters must be defined here for clear visibility
# and to avoid forgotten options somewhere deep in the hierarchy
-set (ACTS_PARAMETER_DEFINITIONS_PLUGIN "ACTS/Utilities/detail/DefaultParameterDefinitions.hpp" CACHE FILEPATH "Default track parameter definition")
+set (ACTS_PARAMETER_DEFINITIONS_PLUGIN "Acts/Utilities/detail/DefaultParameterDefinitions.hpp" CACHE FILEPATH "Default track parameter definition")
# handle inter-plugin dependencies
if (ACTS_BUILD_DD4HEP_PLUGIN)
diff --git a/Core/ACTSVersion.hpp.in b/Core/ActsVersion.hpp.in
similarity index 100%
rename from Core/ACTSVersion.hpp.in
rename to Core/ActsVersion.hpp.in
diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt
index 29f0eee91..990e123d2 100644
--- a/Core/CMakeLists.txt
+++ b/Core/CMakeLists.txt
@@ -17,11 +17,11 @@ install (DIRECTORY include/ACTS
# generate version header and make it available to the build
configure_file(
- ACTSVersion.hpp.in
- ${CMAKE_CURRENT_BINARY_DIR}/ACTS/ACTSVersion.hpp)
+ ActsVersion.hpp.in
+ ${CMAKE_CURRENT_BINARY_DIR}/Acts/ActsVersion.hpp)
install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/ACTS/ACTSVersion.hpp
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ACTS)
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/Acts/ActsVersion.hpp
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Acts)
target_include_directories(ACTSCore PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
acts_add_targets_to_cdash_project(PROJECT ACore TARGETS ACTSCore)
diff --git a/Core/include/ACTS/Detector/DetachedTrackingVolume.hpp b/Core/include/Acts/Detector/DetachedTrackingVolume.hpp
similarity index 96%
rename from Core/include/ACTS/Detector/DetachedTrackingVolume.hpp
rename to Core/include/Acts/Detector/DetachedTrackingVolume.hpp
index 4bd74f5ef..b5bacc5be 100644
--- a/Core/include/ACTS/Detector/DetachedTrackingVolume.hpp
+++ b/Core/include/Acts/Detector/DetachedTrackingVolume.hpp
@@ -14,11 +14,11 @@
#define ACTS_DETECTOR_DETACHEDTRACKINGVOLUME_H 1
#include <memory>
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Layers/PlaneLayer.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometrySignature.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Layers/PlaneLayer.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometrySignature.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Detector/DetectorElementBase.hpp b/Core/include/Acts/Detector/DetectorElementBase.hpp
similarity index 98%
rename from Core/include/ACTS/Detector/DetectorElementBase.hpp
rename to Core/include/Acts/Detector/DetectorElementBase.hpp
index df5257cc9..337e36883 100644
--- a/Core/include/ACTS/Detector/DetectorElementBase.hpp
+++ b/Core/include/Acts/Detector/DetectorElementBase.hpp
@@ -19,8 +19,8 @@
#include <memory>
#include <vector>
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Identifier.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Identifier.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Detector/GlueVolumesDescriptor.hpp b/Core/include/Acts/Detector/GlueVolumesDescriptor.hpp
similarity index 96%
rename from Core/include/ACTS/Detector/GlueVolumesDescriptor.hpp
rename to Core/include/Acts/Detector/GlueVolumesDescriptor.hpp
index e3a02bfa0..690e1ef56 100644
--- a/Core/include/ACTS/Detector/GlueVolumesDescriptor.hpp
+++ b/Core/include/Acts/Detector/GlueVolumesDescriptor.hpp
@@ -16,8 +16,8 @@
#include <map>
#include <memory>
#include <vector>
-#include "ACTS/Utilities/BinnedArray.hpp"
-#include "ACTS/Volumes/BoundarySurfaceFace.hpp"
+#include "Acts/Utilities/BinnedArray.hpp"
+#include "Acts/Volumes/BoundarySurfaceFace.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Detector/TrackingGeometry.hpp b/Core/include/Acts/Detector/TrackingGeometry.hpp
similarity index 98%
rename from Core/include/ACTS/Detector/TrackingGeometry.hpp
rename to Core/include/Acts/Detector/TrackingGeometry.hpp
index 22e95749f..3dcbda734 100644
--- a/Core/include/ACTS/Detector/TrackingGeometry.hpp
+++ b/Core/include/Acts/Detector/TrackingGeometry.hpp
@@ -13,8 +13,8 @@
#ifndef ACTS_DETECTOR_TRACKINGGEOMETRY_H
#define ACTS_DETECTOR_TRACKINGGEOMETRY_H
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometrySignature.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometrySignature.hpp"
// STD
#include <map>
#include <memory>
diff --git a/Core/include/ACTS/Detector/TrackingVolume.hpp b/Core/include/Acts/Detector/TrackingVolume.hpp
similarity index 98%
rename from Core/include/ACTS/Detector/TrackingVolume.hpp
rename to Core/include/Acts/Detector/TrackingVolume.hpp
index 7479e0f90..e69e173bf 100644
--- a/Core/include/ACTS/Detector/TrackingVolume.hpp
+++ b/Core/include/Acts/Detector/TrackingVolume.hpp
@@ -15,14 +15,14 @@
#include <map>
#include <string>
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Surfaces/BoundaryCheck.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/BinnedArray.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometrySignature.hpp"
-#include "ACTS/Volumes/BoundarySurfaceT.hpp"
-#include "ACTS/Volumes/Volume.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Surfaces/BoundaryCheck.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/BinnedArray.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometrySignature.hpp"
+#include "Acts/Volumes/BoundarySurfaceT.hpp"
+#include "Acts/Volumes/Volume.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Digitization/CartesianSegmentation.hpp b/Core/include/Acts/Digitization/CartesianSegmentation.hpp
similarity index 95%
rename from Core/include/ACTS/Digitization/CartesianSegmentation.hpp
rename to Core/include/Acts/Digitization/CartesianSegmentation.hpp
index 1fdf51c00..3173c8b01 100644
--- a/Core/include/ACTS/Digitization/CartesianSegmentation.hpp
+++ b/Core/include/Acts/Digitization/CartesianSegmentation.hpp
@@ -10,11 +10,11 @@
#define ACTS_DIGITIZATION_CARTESIANSEGMENTATION_H
#include <memory>
-#include "ACTS/Digitization/DigitizationCell.hpp"
-#include "ACTS/Digitization/Segmentation.hpp"
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Digitization/DigitizationCell.hpp"
+#include "Acts/Digitization/Segmentation.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Digitization/DigitizationCell.hpp b/Core/include/Acts/Digitization/DigitizationCell.hpp
similarity index 98%
rename from Core/include/ACTS/Digitization/DigitizationCell.hpp
rename to Core/include/Acts/Digitization/DigitizationCell.hpp
index 1f2cd1c41..ca7861a1a 100644
--- a/Core/include/ACTS/Digitization/DigitizationCell.hpp
+++ b/Core/include/Acts/Digitization/DigitizationCell.hpp
@@ -9,7 +9,7 @@
#ifndef ACTS_DIGITIZATION_DIGITIZATIONCELL_H
#define ACTS_DIGITIZATION_DIGITIZATIONCELL_H
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Digitization/DigitizationModule.hpp b/Core/include/Acts/Digitization/DigitizationModule.hpp
similarity index 97%
rename from Core/include/ACTS/Digitization/DigitizationModule.hpp
rename to Core/include/Acts/Digitization/DigitizationModule.hpp
index df5d82ecf..ad6c0b96b 100644
--- a/Core/include/ACTS/Digitization/DigitizationModule.hpp
+++ b/Core/include/Acts/Digitization/DigitizationModule.hpp
@@ -10,9 +10,9 @@
#define ACTS_DIGITIZATION_DIGITIZATIONMODULE_H
#include <memory>
-#include "ACTS/Digitization/DigitizationCell.hpp"
-#include "ACTS/Digitization/Segmentation.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Digitization/DigitizationCell.hpp"
+#include "Acts/Digitization/Segmentation.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Digitization/PlanarModuleCluster.hpp b/Core/include/Acts/Digitization/PlanarModuleCluster.hpp
similarity index 89%
rename from Core/include/ACTS/Digitization/PlanarModuleCluster.hpp
rename to Core/include/Acts/Digitization/PlanarModuleCluster.hpp
index 2fed4da8e..1d238786c 100644
--- a/Core/include/ACTS/Digitization/PlanarModuleCluster.hpp
+++ b/Core/include/Acts/Digitization/PlanarModuleCluster.hpp
@@ -9,13 +9,13 @@
#ifndef ACTS_DIGITIZATION_PLANARMODULECLUSTER_H
#define ACTS_DIGITIZATION_PLANARMODULECLUSTER_H 1
-#include "ACTS/Digitization/DigitizationCell.hpp"
-#include "ACTS/EventData/Measurement.hpp"
-#include "ACTS/EventData/ParticleDefinitions.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Identifier.hpp"
-#include "ACTS/Utilities/Logger.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Digitization/DigitizationCell.hpp"
+#include "Acts/EventData/Measurement.hpp"
+#include "Acts/EventData/ParticleDefinitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Identifier.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Digitization/PlanarModuleStepper.hpp b/Core/include/Acts/Digitization/PlanarModuleStepper.hpp
similarity index 95%
rename from Core/include/ACTS/Digitization/PlanarModuleStepper.hpp
rename to Core/include/Acts/Digitization/PlanarModuleStepper.hpp
index d34911473..178dc24e4 100644
--- a/Core/include/ACTS/Digitization/PlanarModuleStepper.hpp
+++ b/Core/include/Acts/Digitization/PlanarModuleStepper.hpp
@@ -11,9 +11,9 @@
#include <memory>
#include <vector>
-#include "ACTS/Digitization/DigitizationCell.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/Digitization/DigitizationCell.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Logger.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Digitization/PolarSegmentation.hpp b/Core/include/Acts/Digitization/PolarSegmentation.hpp
similarity index 96%
rename from Core/include/ACTS/Digitization/PolarSegmentation.hpp
rename to Core/include/Acts/Digitization/PolarSegmentation.hpp
index 242a62e8e..af02b3746 100644
--- a/Core/include/ACTS/Digitization/PolarSegmentation.hpp
+++ b/Core/include/Acts/Digitization/PolarSegmentation.hpp
@@ -10,11 +10,11 @@
// #define ACTS_DIGITIZATION_POLARSEGMENTATION_H
//
// #include <memory>
-// #include "ACTS/Digitization/DigitizationCell.hpp"
-// #include "ACTS/Digitization/Segmentation.hpp"
-// #include "ACTS/Surfaces/TrapezoidBounds.hpp"
-// #include "ACTS/Utilities/BinUtility.hpp"
-// #include "ACTS/Utilities/Definitions.hpp"
+// #include "Acts/Digitization/DigitizationCell.hpp"
+// #include "Acts/Digitization/Segmentation.hpp"
+// #include "Acts/Surfaces/TrapezoidBounds.hpp"
+// #include "Acts/Utilities/BinUtility.hpp"
+// #include "Acts/Utilities/Definitions.hpp"
// namespace Acts {
//
diff --git a/Core/include/ACTS/Digitization/Segmentation.hpp b/Core/include/Acts/Digitization/Segmentation.hpp
similarity index 97%
rename from Core/include/ACTS/Digitization/Segmentation.hpp
rename to Core/include/Acts/Digitization/Segmentation.hpp
index 28d69a4d3..59feafb8c 100644
--- a/Core/include/ACTS/Digitization/Segmentation.hpp
+++ b/Core/include/Acts/Digitization/Segmentation.hpp
@@ -11,8 +11,8 @@
#include <memory>
#include <vector>
-#include "ACTS/Digitization/DigitizationCell.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Digitization/DigitizationCell.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/EventData/ChargePolicy.hpp b/Core/include/Acts/EventData/ChargePolicy.hpp
similarity index 100%
rename from Core/include/ACTS/EventData/ChargePolicy.hpp
rename to Core/include/Acts/EventData/ChargePolicy.hpp
diff --git a/Core/include/ACTS/EventData/Measurement.hpp b/Core/include/Acts/EventData/Measurement.hpp
similarity index 98%
rename from Core/include/ACTS/EventData/Measurement.hpp
rename to Core/include/Acts/EventData/Measurement.hpp
index b03988a61..844164d27 100644
--- a/Core/include/ACTS/EventData/Measurement.hpp
+++ b/Core/include/Acts/EventData/Measurement.hpp
@@ -13,10 +13,10 @@
#include <ostream>
#include <type_traits>
#include <utility>
-#include "ACTS/EventData/ParameterSet.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/EventData/detail/fittable_type_generator.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
+#include "Acts/EventData/ParameterSet.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/EventData/detail/fittable_type_generator.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/EventData/NeutralParameters.hpp b/Core/include/Acts/EventData/NeutralParameters.hpp
similarity index 76%
rename from Core/include/ACTS/EventData/NeutralParameters.hpp
rename to Core/include/Acts/EventData/NeutralParameters.hpp
index fdbd05233..b4ada7d2f 100644
--- a/Core/include/ACTS/EventData/NeutralParameters.hpp
+++ b/Core/include/Acts/EventData/NeutralParameters.hpp
@@ -9,10 +9,10 @@
#ifndef ACTS_NEUTRALPARAMETERS_H
#define ACTS_NEUTRALPARAMETERS_H 1
-#include "ACTS/EventData/ChargePolicy.hpp"
-#include "ACTS/EventData/SingleBoundTrackParameters.hpp"
-#include "ACTS/EventData/SingleCurvilinearTrackParameters.hpp"
-#include "ACTS/EventData/SingleTrackParameters.hpp"
+#include "Acts/EventData/ChargePolicy.hpp"
+#include "Acts/EventData/SingleBoundTrackParameters.hpp"
+#include "Acts/EventData/SingleCurvilinearTrackParameters.hpp"
+#include "Acts/EventData/SingleTrackParameters.hpp"
namespace Acts {
typedef SingleTrackParameters<NeutralPolicy> NeutralParameters;
diff --git a/Core/include/ACTS/EventData/ParameterSet.hpp b/Core/include/Acts/EventData/ParameterSet.hpp
similarity index 96%
rename from Core/include/ACTS/EventData/ParameterSet.hpp
rename to Core/include/Acts/EventData/ParameterSet.hpp
index 404e8efdf..3f92f95b6 100644
--- a/Core/include/ACTS/EventData/ParameterSet.hpp
+++ b/Core/include/Acts/EventData/ParameterSet.hpp
@@ -15,18 +15,18 @@
#include <utility>
// ACTS includes
-#include "ACTS/EventData/detail/full_parameter_set.hpp"
-#include "ACTS/EventData/detail/initialize_parameter_set.hpp"
-#include "ACTS/EventData/detail/make_projection_matrix.hpp"
-#include "ACTS/EventData/detail/residual_calculator.hpp"
-#include "ACTS/EventData/detail/value_corrector.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
-#include "ACTS/Utilities/detail/MPL/are_sorted.hpp"
-#include "ACTS/Utilities/detail/MPL/are_within.hpp"
-#include "ACTS/Utilities/detail/MPL/at_index.hpp"
-#include "ACTS/Utilities/detail/MPL/get_position.hpp"
-#include "ACTS/Utilities/detail/MPL/is_contained.hpp"
+#include "Acts/EventData/detail/full_parameter_set.hpp"
+#include "Acts/EventData/detail/initialize_parameter_set.hpp"
+#include "Acts/EventData/detail/make_projection_matrix.hpp"
+#include "Acts/EventData/detail/residual_calculator.hpp"
+#include "Acts/EventData/detail/value_corrector.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Utilities/detail/MPL/are_sorted.hpp"
+#include "Acts/Utilities/detail/MPL/are_within.hpp"
+#include "Acts/Utilities/detail/MPL/at_index.hpp"
+#include "Acts/Utilities/detail/MPL/get_position.hpp"
+#include "Acts/Utilities/detail/MPL/is_contained.hpp"
namespace Acts {
/// @cond
diff --git a/Core/include/ACTS/EventData/ParticleDefinitions.hpp b/Core/include/Acts/EventData/ParticleDefinitions.hpp
similarity index 99%
rename from Core/include/ACTS/EventData/ParticleDefinitions.hpp
rename to Core/include/Acts/EventData/ParticleDefinitions.hpp
index 245ab8c03..c85d67c67 100644
--- a/Core/include/ACTS/EventData/ParticleDefinitions.hpp
+++ b/Core/include/Acts/EventData/ParticleDefinitions.hpp
@@ -14,8 +14,8 @@
#define ACTS_EVENTDATA_PARTICLEDEFINITIONS_H
#include <vector>
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
// barcodes
typedef unsigned long barcode_type;
diff --git a/Core/include/ACTS/EventData/SingleBoundTrackParameters.hpp b/Core/include/Acts/EventData/SingleBoundTrackParameters.hpp
similarity index 99%
rename from Core/include/ACTS/EventData/SingleBoundTrackParameters.hpp
rename to Core/include/Acts/EventData/SingleBoundTrackParameters.hpp
index 55c1dcba8..db2161fb2 100644
--- a/Core/include/ACTS/EventData/SingleBoundTrackParameters.hpp
+++ b/Core/include/Acts/EventData/SingleBoundTrackParameters.hpp
@@ -9,8 +9,8 @@
#ifndef ACTS_SINGLEBOUNDTRACKPARAMETERS_H
#define ACTS_SINGLEBOUNDTRACKPARAMETERS_H
-#include "ACTS/EventData/SingleTrackParameters.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
+#include "Acts/EventData/SingleTrackParameters.hpp"
+#include "Acts/Surfaces/Surface.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/EventData/SingleCurvilinearTrackParameters.hpp b/Core/include/Acts/EventData/SingleCurvilinearTrackParameters.hpp
similarity index 98%
rename from Core/include/ACTS/EventData/SingleCurvilinearTrackParameters.hpp
rename to Core/include/Acts/EventData/SingleCurvilinearTrackParameters.hpp
index 571741f4a..16387994a 100644
--- a/Core/include/ACTS/EventData/SingleCurvilinearTrackParameters.hpp
+++ b/Core/include/Acts/EventData/SingleCurvilinearTrackParameters.hpp
@@ -10,8 +10,8 @@
#define ACTS_SINGLECURVILINEARTRACKPARAMETERS_H
#include <memory>
-#include "ACTS/EventData/SingleTrackParameters.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
+#include "Acts/EventData/SingleTrackParameters.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/EventData/SingleTrackParameters.hpp b/Core/include/Acts/EventData/SingleTrackParameters.hpp
similarity index 97%
rename from Core/include/ACTS/EventData/SingleTrackParameters.hpp
rename to Core/include/Acts/EventData/SingleTrackParameters.hpp
index 46a833c5f..b46603058 100644
--- a/Core/include/ACTS/EventData/SingleTrackParameters.hpp
+++ b/Core/include/Acts/EventData/SingleTrackParameters.hpp
@@ -10,9 +10,9 @@
#define ACTS_SINGLETRACKPARAMETERS_H
#include <type_traits>
-#include "ACTS/EventData/TrackParametersBase.hpp"
-#include "ACTS/EventData/detail/coordinate_transformations.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/EventData/TrackParametersBase.hpp"
+#include "Acts/EventData/detail/coordinate_transformations.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/EventData/TrackParameters.hpp b/Core/include/Acts/EventData/TrackParameters.hpp
similarity index 75%
rename from Core/include/ACTS/EventData/TrackParameters.hpp
rename to Core/include/Acts/EventData/TrackParameters.hpp
index 591ab8f66..b98d9406f 100644
--- a/Core/include/ACTS/EventData/TrackParameters.hpp
+++ b/Core/include/Acts/EventData/TrackParameters.hpp
@@ -9,10 +9,10 @@
#ifndef ACTS_TRACKPARAMETERS_H
#define ACTS_TRACKPARAMETERS_H
-#include "ACTS/EventData/ChargePolicy.hpp"
-#include "ACTS/EventData/SingleBoundTrackParameters.hpp"
-#include "ACTS/EventData/SingleCurvilinearTrackParameters.hpp"
-#include "ACTS/EventData/SingleTrackParameters.hpp"
+#include "Acts/EventData/ChargePolicy.hpp"
+#include "Acts/EventData/SingleBoundTrackParameters.hpp"
+#include "Acts/EventData/SingleCurvilinearTrackParameters.hpp"
+#include "Acts/EventData/SingleTrackParameters.hpp"
namespace Acts {
typedef SingleTrackParameters<ChargedPolicy> TrackParameters;
diff --git a/Core/include/ACTS/EventData/TrackParametersBase.hpp b/Core/include/Acts/EventData/TrackParametersBase.hpp
similarity index 96%
rename from Core/include/ACTS/EventData/TrackParametersBase.hpp
rename to Core/include/Acts/EventData/TrackParametersBase.hpp
index 81735c28c..be2cef025 100644
--- a/Core/include/ACTS/EventData/TrackParametersBase.hpp
+++ b/Core/include/Acts/EventData/TrackParametersBase.hpp
@@ -12,11 +12,11 @@
// STL include(s)
#include <ostream>
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
// ACTS includes
-#include "ACTS/EventData/ChargePolicy.hpp"
-#include "ACTS/EventData/ParameterSet.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
+#include "Acts/EventData/ChargePolicy.hpp"
+#include "Acts/EventData/ParameterSet.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
namespace Acts {
// forward declarations
diff --git a/Core/include/ACTS/EventData/TransportJacobian.hpp b/Core/include/Acts/EventData/TransportJacobian.hpp
similarity index 98%
rename from Core/include/ACTS/EventData/TransportJacobian.hpp
rename to Core/include/Acts/EventData/TransportJacobian.hpp
index 16a8b74f7..9bfb788c3 100644
--- a/Core/include/ACTS/EventData/TransportJacobian.hpp
+++ b/Core/include/Acts/EventData/TransportJacobian.hpp
@@ -13,7 +13,7 @@
#ifndef ACTS_EXTRAPOLATIONUTILS_TRANSPORTJACOBIAN_H
#define ACTS_EXTRAPOLATIONUTILS_TRANSPORTJACOBIAN_H 1
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/EventData/detail/coordinate_transformations.hpp b/Core/include/Acts/EventData/detail/coordinate_transformations.hpp
similarity index 96%
rename from Core/include/ACTS/EventData/detail/coordinate_transformations.hpp
rename to Core/include/Acts/EventData/detail/coordinate_transformations.hpp
index 8aaa145b2..d1aaa8cab 100644
--- a/Core/include/ACTS/EventData/detail/coordinate_transformations.hpp
+++ b/Core/include/Acts/EventData/detail/coordinate_transformations.hpp
@@ -11,8 +11,8 @@
// ACTS includes
#include <cmath>
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
#ifdef ACTS_COORDINATE_TRANSFORM_PLUGIN
diff --git a/Core/include/ACTS/EventData/detail/fittable_type_generator.hpp b/Core/include/Acts/EventData/detail/fittable_type_generator.hpp
similarity index 98%
rename from Core/include/ACTS/EventData/detail/fittable_type_generator.hpp
rename to Core/include/Acts/EventData/detail/fittable_type_generator.hpp
index da909d3b9..f541535ae 100644
--- a/Core/include/ACTS/EventData/detail/fittable_type_generator.hpp
+++ b/Core/include/Acts/EventData/detail/fittable_type_generator.hpp
@@ -14,7 +14,7 @@
#include <boost/variant.hpp>
// ACTS include(s)
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
namespace Acts {
// forward declaration
diff --git a/Core/include/ACTS/EventData/detail/full_parameter_set.hpp b/Core/include/Acts/EventData/detail/full_parameter_set.hpp
similarity index 97%
rename from Core/include/ACTS/EventData/detail/full_parameter_set.hpp
rename to Core/include/Acts/EventData/detail/full_parameter_set.hpp
index c2c548fde..d2556d642 100644
--- a/Core/include/ACTS/EventData/detail/full_parameter_set.hpp
+++ b/Core/include/Acts/EventData/detail/full_parameter_set.hpp
@@ -14,7 +14,7 @@
#include <utility>
// ACTS include(s)
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
namespace Acts {
/// @cond
diff --git a/Core/include/ACTS/EventData/detail/initialize_parameter_set.hpp b/Core/include/Acts/EventData/detail/initialize_parameter_set.hpp
similarity index 100%
rename from Core/include/ACTS/EventData/detail/initialize_parameter_set.hpp
rename to Core/include/Acts/EventData/detail/initialize_parameter_set.hpp
diff --git a/Core/include/ACTS/EventData/detail/make_projection_matrix.hpp b/Core/include/Acts/EventData/detail/make_projection_matrix.hpp
similarity index 98%
rename from Core/include/ACTS/EventData/detail/make_projection_matrix.hpp
rename to Core/include/Acts/EventData/detail/make_projection_matrix.hpp
index f3ce6e2de..82fbc743c 100644
--- a/Core/include/ACTS/EventData/detail/make_projection_matrix.hpp
+++ b/Core/include/Acts/EventData/detail/make_projection_matrix.hpp
@@ -10,7 +10,7 @@
#define ACTS_MAKE_PROJECTION_MATRIX_H 1
// ACTS include(s)
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
/// @cond detail
diff --git a/Core/include/ACTS/EventData/detail/residual_calculator.hpp b/Core/include/Acts/EventData/detail/residual_calculator.hpp
similarity index 96%
rename from Core/include/ACTS/EventData/detail/residual_calculator.hpp
rename to Core/include/Acts/EventData/detail/residual_calculator.hpp
index d14001af7..cf3589eb6 100644
--- a/Core/include/ACTS/EventData/detail/residual_calculator.hpp
+++ b/Core/include/Acts/EventData/detail/residual_calculator.hpp
@@ -10,8 +10,8 @@
#define ACTS_RESIDUAL_CALCULATOR_H 1
// ACTS include(s)
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
namespace Acts {
/// @cond detail
diff --git a/Core/include/ACTS/EventData/detail/value_corrector.hpp b/Core/include/Acts/EventData/detail/value_corrector.hpp
similarity index 96%
rename from Core/include/ACTS/EventData/detail/value_corrector.hpp
rename to Core/include/Acts/EventData/detail/value_corrector.hpp
index 98259872a..bb4d4bf22 100644
--- a/Core/include/ACTS/EventData/detail/value_corrector.hpp
+++ b/Core/include/Acts/EventData/detail/value_corrector.hpp
@@ -10,8 +10,8 @@
#define ACTS_VALUE_CORRECTOR_H 1
// ACTS include(s)
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
namespace Acts {
/// @cond detail
diff --git a/Core/include/ACTS/Fitter/KalmanFitter.hpp b/Core/include/Acts/Fitter/KalmanFitter.hpp
similarity index 98%
rename from Core/include/ACTS/Fitter/KalmanFitter.hpp
rename to Core/include/Acts/Fitter/KalmanFitter.hpp
index f2a7d2742..0fed98b9f 100644
--- a/Core/include/ACTS/Fitter/KalmanFitter.hpp
+++ b/Core/include/Acts/Fitter/KalmanFitter.hpp
@@ -15,9 +15,9 @@
#include <type_traits>
// ATS include(s)
-#include "ACTS/EventData/Measurement.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/EventData/Measurement.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
class Track;
diff --git a/Core/include/ACTS/Fitter/KalmanUpdator.hpp b/Core/include/Acts/Fitter/KalmanUpdator.hpp
similarity index 94%
rename from Core/include/ACTS/Fitter/KalmanUpdator.hpp
rename to Core/include/Acts/Fitter/KalmanUpdator.hpp
index c21bda8ed..e012a0bb6 100644
--- a/Core/include/ACTS/Fitter/KalmanUpdator.hpp
+++ b/Core/include/Acts/Fitter/KalmanUpdator.hpp
@@ -16,9 +16,9 @@
#include <boost/variant.hpp>
// ATS include(s)
-#include "ACTS/EventData/Measurement.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/EventData/Measurement.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
/**
diff --git a/Core/include/ACTS/Layers/ConeLayer.hpp b/Core/include/Acts/Layers/ConeLayer.hpp
similarity index 97%
rename from Core/include/ACTS/Layers/ConeLayer.hpp
rename to Core/include/Acts/Layers/ConeLayer.hpp
index eb0aa789b..ac3869919 100644
--- a/Core/include/ACTS/Layers/ConeLayer.hpp
+++ b/Core/include/Acts/Layers/ConeLayer.hpp
@@ -14,9 +14,9 @@
#define ACTS_LAYERS_CONELAYER_H
#include <algorithm>
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Surfaces/ConeSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Surfaces/ConeSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Layers/CylinderLayer.hpp b/Core/include/Acts/Layers/CylinderLayer.hpp
similarity index 94%
rename from Core/include/ACTS/Layers/CylinderLayer.hpp
rename to Core/include/Acts/Layers/CylinderLayer.hpp
index 32d11e95d..357c53646 100644
--- a/Core/include/ACTS/Layers/CylinderLayer.hpp
+++ b/Core/include/Acts/Layers/CylinderLayer.hpp
@@ -14,13 +14,13 @@
#define ACTS_LAYERS_CYLINDERLAYER_H
#include <algorithm>
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/InstanceFactory.hpp"
-#include "ACTS/Utilities/ThrowAssert.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
-#include "ACTS/Volumes/CylinderVolumeBounds.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/InstanceFactory.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
+#include "Acts/Volumes/CylinderVolumeBounds.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Layers/DiscLayer.hpp b/Core/include/Acts/Layers/DiscLayer.hpp
similarity index 96%
rename from Core/include/ACTS/Layers/DiscLayer.hpp
rename to Core/include/Acts/Layers/DiscLayer.hpp
index 463119960..9ab68e127 100644
--- a/Core/include/ACTS/Layers/DiscLayer.hpp
+++ b/Core/include/Acts/Layers/DiscLayer.hpp
@@ -16,10 +16,10 @@
class MsgStream;
#include <algorithm>
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Surfaces/DiscSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Layers/GenericApproachDescriptor.hpp b/Core/include/Acts/Layers/GenericApproachDescriptor.hpp
similarity index 99%
rename from Core/include/ACTS/Layers/GenericApproachDescriptor.hpp
rename to Core/include/Acts/Layers/GenericApproachDescriptor.hpp
index aace48471..3ed9151e4 100644
--- a/Core/include/ACTS/Layers/GenericApproachDescriptor.hpp
+++ b/Core/include/Acts/Layers/GenericApproachDescriptor.hpp
@@ -14,7 +14,7 @@
#define ACTS_DETECTOR_GENERICAPPROPACHDESCRIPTOR_H 1
#include <algorithm>
-#include "ACTS/Utilities/ApproachDescriptor.hpp"
+#include "Acts/Utilities/ApproachDescriptor.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Layers/Layer.hpp b/Core/include/Acts/Layers/Layer.hpp
similarity index 97%
rename from Core/include/ACTS/Layers/Layer.hpp
rename to Core/include/Acts/Layers/Layer.hpp
index 2ac4d1119..b7fd21b1a 100644
--- a/Core/include/ACTS/Layers/Layer.hpp
+++ b/Core/include/Acts/Layers/Layer.hpp
@@ -15,15 +15,15 @@
// Core module
#include <map>
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Surfaces/SurfaceArray.hpp"
-#include "ACTS/Utilities/ApproachDescriptor.hpp"
-#include "ACTS/Utilities/BinnedArray.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometryObject.hpp"
-#include "ACTS/Utilities/Intersection.hpp"
-#include "ACTS/Volumes/AbstractVolume.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Surfaces/SurfaceArray.hpp"
+#include "Acts/Utilities/ApproachDescriptor.hpp"
+#include "Acts/Utilities/BinnedArray.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometryObject.hpp"
+#include "Acts/Utilities/Intersection.hpp"
+#include "Acts/Volumes/AbstractVolume.hpp"
namespace Acts {
@@ -545,6 +545,6 @@ typedef BinnedArray<LayerPtr> LayerArray;
} // end of namespace
-#include "ACTS/Layers/detail/Layer.ipp"
+#include "Acts/Layers/detail/Layer.ipp"
#endif // ACTS_DETECTOR_LAYER_H
diff --git a/Core/include/ACTS/Layers/NavigationLayer.hpp b/Core/include/Acts/Layers/NavigationLayer.hpp
similarity index 96%
rename from Core/include/ACTS/Layers/NavigationLayer.hpp
rename to Core/include/Acts/Layers/NavigationLayer.hpp
index ca19989ff..8943ed995 100644
--- a/Core/include/ACTS/Layers/NavigationLayer.hpp
+++ b/Core/include/Acts/Layers/NavigationLayer.hpp
@@ -13,10 +13,10 @@
#ifndef ACTS_LAYERS_NAVIGATIONLAYER_H
#define ACTS_LAYERS_NAVIGATIONLAYER_H
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Utilities/BinnedArray.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Utilities/BinnedArray.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Layers/PlaneLayer.hpp b/Core/include/Acts/Layers/PlaneLayer.hpp
similarity index 97%
rename from Core/include/ACTS/Layers/PlaneLayer.hpp
rename to Core/include/Acts/Layers/PlaneLayer.hpp
index ecf69887a..b5e7bf327 100644
--- a/Core/include/ACTS/Layers/PlaneLayer.hpp
+++ b/Core/include/Acts/Layers/PlaneLayer.hpp
@@ -14,9 +14,9 @@
#define ACTS_LAYERS_PLANELAYER_H
#include <algorithm>
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Layers/ProtoLayer.hpp b/Core/include/Acts/Layers/ProtoLayer.hpp
similarity index 93%
rename from Core/include/ACTS/Layers/ProtoLayer.hpp
rename to Core/include/Acts/Layers/ProtoLayer.hpp
index 83985b81e..0db7088e2 100644
--- a/Core/include/ACTS/Layers/ProtoLayer.hpp
+++ b/Core/include/Acts/Layers/ProtoLayer.hpp
@@ -10,9 +10,9 @@
#define ACTS_LAYERS_PROTOLAYER_H 1
#include <iostream>
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Layers/detail/Layer.ipp b/Core/include/Acts/Layers/detail/Layer.ipp
similarity index 100%
rename from Core/include/ACTS/Layers/detail/Layer.ipp
rename to Core/include/Acts/Layers/detail/Layer.ipp
diff --git a/Core/include/ACTS/MagneticField/ConstantBField.hpp b/Core/include/Acts/MagneticField/ConstantBField.hpp
similarity index 98%
rename from Core/include/ACTS/MagneticField/ConstantBField.hpp
rename to Core/include/Acts/MagneticField/ConstantBField.hpp
index 27ac71b17..3719278b1 100644
--- a/Core/include/ACTS/MagneticField/ConstantBField.hpp
+++ b/Core/include/Acts/MagneticField/ConstantBField.hpp
@@ -9,8 +9,8 @@
#ifndef ACTS_MAGNETICFIELD_CONSTANTBFIELD_H
#define ACTS_MAGNETICFIELD_CONSTANTBFIELD_H 1
-#include "ACTS/MagneticField/concept/AnyFieldLookup.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/MagneticField/concept/AnyFieldLookup.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/MagneticField/InterpolatedBFieldMap.hpp b/Core/include/Acts/MagneticField/InterpolatedBFieldMap.hpp
similarity index 98%
rename from Core/include/ACTS/MagneticField/InterpolatedBFieldMap.hpp
rename to Core/include/Acts/MagneticField/InterpolatedBFieldMap.hpp
index d6a8f9831..5d3c95625 100644
--- a/Core/include/ACTS/MagneticField/InterpolatedBFieldMap.hpp
+++ b/Core/include/Acts/MagneticField/InterpolatedBFieldMap.hpp
@@ -9,10 +9,10 @@
#pragma once
#include <functional>
-#include "ACTS/MagneticField/concept/AnyFieldLookup.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Interpolation.hpp"
-#include "ACTS/Utilities/concept/AnyGrid.hpp"
+#include "Acts/MagneticField/concept/AnyFieldLookup.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Interpolation.hpp"
+#include "Acts/Utilities/concept/AnyGrid.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/MagneticField/SharedBFieldMap.hpp b/Core/include/Acts/MagneticField/SharedBFieldMap.hpp
similarity index 95%
rename from Core/include/ACTS/MagneticField/SharedBFieldMap.hpp
rename to Core/include/Acts/MagneticField/SharedBFieldMap.hpp
index d91b3a8bc..c0965e2b3 100644
--- a/Core/include/ACTS/MagneticField/SharedBFieldMap.hpp
+++ b/Core/include/Acts/MagneticField/SharedBFieldMap.hpp
@@ -9,8 +9,8 @@
#ifndef ACTS_MAGNETICFIELD_SHAREDBFIELD_H
#define ACTS_MAGNETICFIELD_SHAREDBFIELD_H
-#include "ACTS/MagneticField/concept/AnyFieldLookup.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/MagneticField/concept/AnyFieldLookup.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/MagneticField/concept/AnyFieldLookup.hpp b/Core/include/Acts/MagneticField/concept/AnyFieldLookup.hpp
similarity index 99%
rename from Core/include/ACTS/MagneticField/concept/AnyFieldLookup.hpp
rename to Core/include/Acts/MagneticField/concept/AnyFieldLookup.hpp
index d440e847c..2a0f99ac2 100644
--- a/Core/include/ACTS/MagneticField/concept/AnyFieldLookup.hpp
+++ b/Core/include/Acts/MagneticField/concept/AnyFieldLookup.hpp
@@ -14,7 +14,7 @@
#include <boost/type_erasure/member.hpp>
#include <boost/type_erasure/relaxed.hpp>
#include <vector>
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
// clang-format off
BOOST_TYPE_ERASURE_MEMBER((Acts)(concept)(afl_detail)(has_getField), getField, 1)
diff --git a/Core/include/ACTS/Material/BinnedSurfaceMaterial.hpp b/Core/include/Acts/Material/BinnedSurfaceMaterial.hpp
similarity index 96%
rename from Core/include/ACTS/Material/BinnedSurfaceMaterial.hpp
rename to Core/include/Acts/Material/BinnedSurfaceMaterial.hpp
index 4a56e5188..b1eacb7f9 100644
--- a/Core/include/ACTS/Material/BinnedSurfaceMaterial.hpp
+++ b/Core/include/Acts/Material/BinnedSurfaceMaterial.hpp
@@ -13,10 +13,10 @@
#ifndef ACTS_MATERIAL_BINNEDSURFACEMATERIAL_H
#define ACTS_MATERIAL_BINNEDSURFACEMATERIAL_H 1
-#include "ACTS/Material/MaterialProperties.hpp"
-#include "ACTS/Material/SurfaceMaterial.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
+#include "Acts/Material/SurfaceMaterial.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Material/HomogeneousSurfaceMaterial.hpp b/Core/include/Acts/Material/HomogeneousSurfaceMaterial.hpp
similarity index 95%
rename from Core/include/ACTS/Material/HomogeneousSurfaceMaterial.hpp
rename to Core/include/Acts/Material/HomogeneousSurfaceMaterial.hpp
index 878e7480e..cf4c50c4e 100644
--- a/Core/include/ACTS/Material/HomogeneousSurfaceMaterial.hpp
+++ b/Core/include/Acts/Material/HomogeneousSurfaceMaterial.hpp
@@ -14,9 +14,9 @@
#define ACTS_MATERIAL_HOMOGENOUSLAYERMATERIAL_H
#include <vector>
-#include "ACTS/Material/MaterialProperties.hpp"
-#include "ACTS/Material/SurfaceMaterial.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
+#include "Acts/Material/SurfaceMaterial.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Material/Material.hpp b/Core/include/Acts/Material/Material.hpp
similarity index 100%
rename from Core/include/ACTS/Material/Material.hpp
rename to Core/include/Acts/Material/Material.hpp
diff --git a/Core/include/ACTS/Material/MaterialProperties.hpp b/Core/include/Acts/Material/MaterialProperties.hpp
similarity index 99%
rename from Core/include/ACTS/Material/MaterialProperties.hpp
rename to Core/include/Acts/Material/MaterialProperties.hpp
index f78a1fb4a..47a3d165c 100644
--- a/Core/include/ACTS/Material/MaterialProperties.hpp
+++ b/Core/include/Acts/Material/MaterialProperties.hpp
@@ -14,7 +14,7 @@
#define ACTS_MATERIAL_MATERIALPROPERTIES_H
// Geometry module
-#include "ACTS/Material/Material.hpp"
+#include "Acts/Material/Material.hpp"
// STD/STL
#include <iostream>
diff --git a/Core/include/ACTS/Material/SurfaceMaterial.hpp b/Core/include/Acts/Material/SurfaceMaterial.hpp
similarity index 96%
rename from Core/include/ACTS/Material/SurfaceMaterial.hpp
rename to Core/include/Acts/Material/SurfaceMaterial.hpp
index ef3ec8a47..82046be51 100644
--- a/Core/include/ACTS/Material/SurfaceMaterial.hpp
+++ b/Core/include/Acts/Material/SurfaceMaterial.hpp
@@ -15,9 +15,9 @@
#include <memory>
#include <vector>
-#include "ACTS/Material/MaterialProperties.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometryID.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometryID.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Material/SurfaceMaterialProxy.hpp b/Core/include/Acts/Material/SurfaceMaterialProxy.hpp
similarity index 97%
rename from Core/include/ACTS/Material/SurfaceMaterialProxy.hpp
rename to Core/include/Acts/Material/SurfaceMaterialProxy.hpp
index 092267962..108a673d7 100644
--- a/Core/include/ACTS/Material/SurfaceMaterialProxy.hpp
+++ b/Core/include/Acts/Material/SurfaceMaterialProxy.hpp
@@ -13,8 +13,8 @@
#ifndef ACTS_MATERIAL_SURFACEMATERIALPROXY_H
#define ACTS_MATERIAL_SURFACEMATERIALPROXY_H
-#include "ACTS/Material/SurfaceMaterial.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
+#include "Acts/Material/SurfaceMaterial.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Propagator/AbortList.hpp b/Core/include/Acts/Propagator/AbortList.hpp
similarity index 84%
rename from Core/include/ACTS/Propagator/AbortList.hpp
rename to Core/include/Acts/Propagator/AbortList.hpp
index fd0ad06b2..dd8cbf69a 100644
--- a/Core/include/ACTS/Propagator/AbortList.hpp
+++ b/Core/include/Acts/Propagator/AbortList.hpp
@@ -9,12 +9,12 @@
#ifndef ACTS_ABORT_LIST_HPP
#define ACTS_ABORT_LIST_HPP 1
-#include "ACTS/Propagator/ActionList.hpp"
-#include "ACTS/Propagator/detail/Extendable.hpp"
-#include "ACTS/Propagator/detail/abort_condition_signature_check.hpp"
-#include "ACTS/Propagator/detail/abort_list_implementation.hpp"
-#include "ACTS/Utilities/detail/MPL/boost_mpl_helper.hpp"
-#include "ACTS/Utilities/detail/MPL/has_duplicates.hpp"
+#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/detail/Extendable.hpp"
+#include "Acts/Propagator/detail/abort_condition_signature_check.hpp"
+#include "Acts/Propagator/detail/abort_list_implementation.hpp"
+#include "Acts/Utilities/detail/MPL/boost_mpl_helper.hpp"
+#include "Acts/Utilities/detail/MPL/has_duplicates.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Propagator/ActionList.hpp b/Core/include/Acts/Propagator/ActionList.hpp
similarity index 85%
rename from Core/include/ACTS/Propagator/ActionList.hpp
rename to Core/include/Acts/Propagator/ActionList.hpp
index dcd1a8481..82e68fefc 100644
--- a/Core/include/ACTS/Propagator/ActionList.hpp
+++ b/Core/include/Acts/Propagator/ActionList.hpp
@@ -9,12 +9,12 @@
#ifndef ACTS_ACTION_LIST_HPP
#define ACTS_ACTION_LIST_HPP
-#include "ACTS/Propagator/detail/Extendable.hpp"
-#include "ACTS/Propagator/detail/action_list_implementation.hpp"
-#include "ACTS/Propagator/detail/action_signature_check.hpp"
-#include "ACTS/Utilities/detail/MPL/all_of.hpp"
-#include "ACTS/Utilities/detail/MPL/has_duplicates.hpp"
-#include "ACTS/Utilities/detail/MPL/type_collector.hpp"
+#include "Acts/Propagator/detail/Extendable.hpp"
+#include "Acts/Propagator/detail/action_list_implementation.hpp"
+#include "Acts/Propagator/detail/action_signature_check.hpp"
+#include "Acts/Utilities/detail/MPL/all_of.hpp"
+#include "Acts/Utilities/detail/MPL/has_duplicates.hpp"
+#include "Acts/Utilities/detail/MPL/type_collector.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Propagator/EigenStepper.hpp b/Core/include/Acts/Propagator/EigenStepper.hpp
similarity index 98%
rename from Core/include/ACTS/Propagator/EigenStepper.hpp
rename to Core/include/Acts/Propagator/EigenStepper.hpp
index 2896082f0..d60fcdf98 100644
--- a/Core/include/ACTS/Propagator/EigenStepper.hpp
+++ b/Core/include/Acts/Propagator/EigenStepper.hpp
@@ -10,11 +10,11 @@
#define ACTS_EIGEN_STEPPER_HPP 1
#include <cmath>
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/MagneticField/concept/AnyFieldLookup.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/MagneticField/concept/AnyFieldLookup.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Propagator/Propagator.hpp b/Core/include/Acts/Propagator/Propagator.hpp
similarity index 98%
rename from Core/include/ACTS/Propagator/Propagator.hpp
rename to Core/include/Acts/Propagator/Propagator.hpp
index 7aea84d40..64a235bd5 100644
--- a/Core/include/ACTS/Propagator/Propagator.hpp
+++ b/Core/include/Acts/Propagator/Propagator.hpp
@@ -12,10 +12,10 @@
#include <cmath>
#include <memory>
#include <type_traits>
-#include "ACTS/Propagator/AbortList.hpp"
-#include "ACTS/Propagator/ActionList.hpp"
-#include "ACTS/Propagator/detail/standard_abort_conditions.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Propagator/AbortList.hpp"
+#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/detail/standard_abort_conditions.hpp"
+#include "Acts/Utilities/Units.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Propagator/detail/Extendable.hpp b/Core/include/Acts/Propagator/detail/Extendable.hpp
similarity index 97%
rename from Core/include/ACTS/Propagator/detail/Extendable.hpp
rename to Core/include/Acts/Propagator/detail/Extendable.hpp
index 8875ebca9..66fcae252 100644
--- a/Core/include/ACTS/Propagator/detail/Extendable.hpp
+++ b/Core/include/Acts/Propagator/detail/Extendable.hpp
@@ -11,7 +11,7 @@
#include <tuple>
#include <type_traits>
-#include "ACTS/Utilities/detail/MPL/all_of.hpp"
+#include "Acts/Utilities/detail/MPL/all_of.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Propagator/detail/abort_condition_signature_check.hpp b/Core/include/Acts/Propagator/detail/abort_condition_signature_check.hpp
similarity index 95%
rename from Core/include/ACTS/Propagator/detail/abort_condition_signature_check.hpp
rename to Core/include/Acts/Propagator/detail/abort_condition_signature_check.hpp
index 23d675bca..206447e61 100644
--- a/Core/include/ACTS/Propagator/detail/abort_condition_signature_check.hpp
+++ b/Core/include/Acts/Propagator/detail/abort_condition_signature_check.hpp
@@ -10,8 +10,8 @@
#define ACTS_ABORT_CONDITION_SIGNATURE_CHECK_HPP 1
#include <type_traits>
-#include "ACTS/Propagator/detail/condition_uses_result_type.hpp"
-#include "ACTS/Utilities/detail/MPL/type_collector.hpp"
+#include "Acts/Propagator/detail/condition_uses_result_type.hpp"
+#include "Acts/Utilities/detail/MPL/type_collector.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Propagator/detail/abort_list_implementation.hpp b/Core/include/Acts/Propagator/detail/abort_list_implementation.hpp
similarity index 96%
rename from Core/include/ACTS/Propagator/detail/abort_list_implementation.hpp
rename to Core/include/Acts/Propagator/detail/abort_list_implementation.hpp
index 2ccd6c002..0bac72cb4 100644
--- a/Core/include/ACTS/Propagator/detail/abort_list_implementation.hpp
+++ b/Core/include/Acts/Propagator/detail/abort_list_implementation.hpp
@@ -10,8 +10,8 @@
#define ACTS_ABORT_LIST_IMPLEMENTATION_HPP
#include <algorithm>
-#include "ACTS/Propagator/detail/condition_uses_result_type.hpp"
-#include "ACTS/Utilities/detail/MPL/type_collector.hpp"
+#include "Acts/Propagator/detail/condition_uses_result_type.hpp"
+#include "Acts/Utilities/detail/MPL/type_collector.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Propagator/detail/action_list_implementation.hpp b/Core/include/Acts/Propagator/detail/action_list_implementation.hpp
similarity index 97%
rename from Core/include/ACTS/Propagator/detail/action_list_implementation.hpp
rename to Core/include/Acts/Propagator/detail/action_list_implementation.hpp
index 7d500e8fb..2f6fde29d 100644
--- a/Core/include/ACTS/Propagator/detail/action_list_implementation.hpp
+++ b/Core/include/Acts/Propagator/detail/action_list_implementation.hpp
@@ -9,7 +9,7 @@
#ifndef ACTS_ACTION_LIST_IMPLEMENTATION_HPP
#define ACTS_ACTION_LIST_IMPLEMENTATION_HPP
-#include "ACTS/Utilities/detail/MPL/type_collector.hpp"
+#include "Acts/Utilities/detail/MPL/type_collector.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Propagator/detail/action_signature_check.hpp b/Core/include/Acts/Propagator/detail/action_signature_check.hpp
similarity index 97%
rename from Core/include/ACTS/Propagator/detail/action_signature_check.hpp
rename to Core/include/Acts/Propagator/detail/action_signature_check.hpp
index 6e1a3f18b..00d317cb7 100644
--- a/Core/include/ACTS/Propagator/detail/action_signature_check.hpp
+++ b/Core/include/Acts/Propagator/detail/action_signature_check.hpp
@@ -10,7 +10,7 @@
#define ACTS_ACTION_SIGNATURE_CHECK_HPP
#include <type_traits>
-#include "ACTS/Utilities/detail/MPL/type_collector.hpp"
+#include "Acts/Utilities/detail/MPL/type_collector.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Propagator/detail/condition_uses_result_type.hpp b/Core/include/Acts/Propagator/detail/condition_uses_result_type.hpp
similarity index 94%
rename from Core/include/ACTS/Propagator/detail/condition_uses_result_type.hpp
rename to Core/include/Acts/Propagator/detail/condition_uses_result_type.hpp
index 0abbe74f4..791699364 100644
--- a/Core/include/ACTS/Propagator/detail/condition_uses_result_type.hpp
+++ b/Core/include/Acts/Propagator/detail/condition_uses_result_type.hpp
@@ -10,7 +10,7 @@
#define ACTS_CONDITION_USES_RESULT_TYPE_HPP 1
#include <type_traits>
-#include "ACTS/Utilities/detail/MPL/type_collector.hpp"
+#include "Acts/Utilities/detail/MPL/type_collector.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Propagator/detail/standard_abort_conditions.hpp b/Core/include/Acts/Propagator/detail/standard_abort_conditions.hpp
similarity index 100%
rename from Core/include/ACTS/Propagator/detail/standard_abort_conditions.hpp
rename to Core/include/Acts/Propagator/detail/standard_abort_conditions.hpp
diff --git a/Core/include/ACTS/Seeding/BarrelSeedFinder.hpp b/Core/include/Acts/Seeding/BarrelSeedFinder.hpp
similarity index 95%
rename from Core/include/ACTS/Seeding/BarrelSeedFinder.hpp
rename to Core/include/Acts/Seeding/BarrelSeedFinder.hpp
index ec87d4116..4f0de62a0 100644
--- a/Core/include/ACTS/Seeding/BarrelSeedFinder.hpp
+++ b/Core/include/Acts/Seeding/BarrelSeedFinder.hpp
@@ -9,9 +9,9 @@
#ifndef ACTS_SEEDING_BARRELSEEDFINDER_HPP
#define ACTS_SEEDING_BARRELSEEDFINDER_HPP
-#include "ACTS/Seeding/SpacePoint.hpp"
-#include "ACTS/Seeding/TrackSeed.hpp"
-#include "ACTS/Seeding/detail/geometry.hpp"
+#include "Acts/Seeding/SpacePoint.hpp"
+#include "Acts/Seeding/TrackSeed.hpp"
+#include "Acts/Seeding/detail/geometry.hpp"
namespace Acts {
namespace Seeding {
diff --git a/Core/include/ACTS/Seeding/SpacePoint.hpp b/Core/include/Acts/Seeding/SpacePoint.hpp
similarity index 96%
rename from Core/include/ACTS/Seeding/SpacePoint.hpp
rename to Core/include/Acts/Seeding/SpacePoint.hpp
index 557bdf79f..9e2f4ebca 100644
--- a/Core/include/ACTS/Seeding/SpacePoint.hpp
+++ b/Core/include/Acts/Seeding/SpacePoint.hpp
@@ -13,8 +13,8 @@
#include <ostream>
#include <vector>
-#include "ACTS/Seeding/detail/cyclic_range.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Seeding/detail/cyclic_range.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
namespace Seeding {
diff --git a/Core/include/ACTS/Seeding/TrackSeed.hpp b/Core/include/Acts/Seeding/TrackSeed.hpp
similarity index 95%
rename from Core/include/ACTS/Seeding/TrackSeed.hpp
rename to Core/include/Acts/Seeding/TrackSeed.hpp
index 147ebbed9..591c74a08 100644
--- a/Core/include/ACTS/Seeding/TrackSeed.hpp
+++ b/Core/include/Acts/Seeding/TrackSeed.hpp
@@ -14,9 +14,9 @@
#include <utility>
#include <vector>
-#include "ACTS/Seeding/SpacePoint.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/detail/periodic.hpp"
+#include "Acts/Seeding/SpacePoint.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/detail/periodic.hpp"
namespace Acts {
namespace Seeding {
diff --git a/Core/include/ACTS/Seeding/detail/cyclic_range.hpp b/Core/include/Acts/Seeding/detail/cyclic_range.hpp
similarity index 98%
rename from Core/include/ACTS/Seeding/detail/cyclic_range.hpp
rename to Core/include/Acts/Seeding/detail/cyclic_range.hpp
index 794b31389..117a50a6f 100644
--- a/Core/include/ACTS/Seeding/detail/cyclic_range.hpp
+++ b/Core/include/Acts/Seeding/detail/cyclic_range.hpp
@@ -11,7 +11,7 @@
#include <algorithm>
-#include "ACTS/Utilities/detail/periodic.hpp"
+#include "Acts/Utilities/detail/periodic.hpp"
namespace Acts {
namespace detail {
diff --git a/Core/include/ACTS/Seeding/detail/geometry.hpp b/Core/include/Acts/Seeding/detail/geometry.hpp
similarity index 97%
rename from Core/include/ACTS/Seeding/detail/geometry.hpp
rename to Core/include/Acts/Seeding/detail/geometry.hpp
index a5b9d4eb8..c795b5e16 100644
--- a/Core/include/ACTS/Seeding/detail/geometry.hpp
+++ b/Core/include/Acts/Seeding/detail/geometry.hpp
@@ -11,8 +11,8 @@
#include <cmath>
-#include <ACTS/Utilities/Definitions.hpp>
-#include <ACTS/Utilities/detail/RealQuadraticEquation.hpp>
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/detail/RealQuadraticEquation.hpp"
namespace Acts {
namespace detail {
diff --git a/Core/include/ACTS/Surfaces/BoundaryCheck.hpp b/Core/include/Acts/Surfaces/BoundaryCheck.hpp
similarity index 99%
rename from Core/include/ACTS/Surfaces/BoundaryCheck.hpp
rename to Core/include/Acts/Surfaces/BoundaryCheck.hpp
index 3a84edfbb..8767f9fcc 100644
--- a/Core/include/ACTS/Surfaces/BoundaryCheck.hpp
+++ b/Core/include/Acts/Surfaces/BoundaryCheck.hpp
@@ -18,8 +18,8 @@
#include <iterator>
#include <vector>
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Surfaces/ConeBounds.hpp b/Core/include/Acts/Surfaces/ConeBounds.hpp
similarity index 97%
rename from Core/include/ACTS/Surfaces/ConeBounds.hpp
rename to Core/include/Acts/Surfaces/ConeBounds.hpp
index 9125bc43a..a71fccc55 100644
--- a/Core/include/ACTS/Surfaces/ConeBounds.hpp
+++ b/Core/include/Acts/Surfaces/ConeBounds.hpp
@@ -15,9 +15,9 @@
#include <cfloat>
-#include "ACTS/Surfaces/SurfaceBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/SurfaceBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Surfaces/ConeSurface.hpp b/Core/include/Acts/Surfaces/ConeSurface.hpp
similarity index 97%
rename from Core/include/ACTS/Surfaces/ConeSurface.hpp
rename to Core/include/Acts/Surfaces/ConeSurface.hpp
index ec24bd902..61d294a5d 100644
--- a/Core/include/ACTS/Surfaces/ConeSurface.hpp
+++ b/Core/include/Acts/Surfaces/ConeSurface.hpp
@@ -13,11 +13,11 @@
#ifndef ACTS_SURFACES_CONESURFACE_H
#define ACTS_SURFACES_CONESURFACE_H 1
-#include "ACTS/Surfaces/ConeBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/ConeBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Surfaces/CylinderBounds.hpp b/Core/include/Acts/Surfaces/CylinderBounds.hpp
similarity index 96%
rename from Core/include/ACTS/Surfaces/CylinderBounds.hpp
rename to Core/include/Acts/Surfaces/CylinderBounds.hpp
index c82538020..a6f0c0576 100644
--- a/Core/include/ACTS/Surfaces/CylinderBounds.hpp
+++ b/Core/include/Acts/Surfaces/CylinderBounds.hpp
@@ -15,10 +15,10 @@
#include <cmath>
-#include "ACTS/Surfaces/SurfaceBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
-#include "ACTS/Utilities/detail/periodic.hpp"
+#include "Acts/Surfaces/SurfaceBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
+#include "Acts/Utilities/detail/periodic.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Surfaces/CylinderSurface.hpp b/Core/include/Acts/Surfaces/CylinderSurface.hpp
similarity index 98%
rename from Core/include/ACTS/Surfaces/CylinderSurface.hpp
rename to Core/include/Acts/Surfaces/CylinderSurface.hpp
index 9315a84a5..0e22e00f2 100644
--- a/Core/include/ACTS/Surfaces/CylinderSurface.hpp
+++ b/Core/include/Acts/Surfaces/CylinderSurface.hpp
@@ -15,10 +15,10 @@
#include <cmath>
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Surfaces/DiamondBounds.hpp b/Core/include/Acts/Surfaces/DiamondBounds.hpp
similarity index 95%
rename from Core/include/ACTS/Surfaces/DiamondBounds.hpp
rename to Core/include/Acts/Surfaces/DiamondBounds.hpp
index 153d9c4af..47424df46 100644
--- a/Core/include/ACTS/Surfaces/DiamondBounds.hpp
+++ b/Core/include/Acts/Surfaces/DiamondBounds.hpp
@@ -15,11 +15,11 @@
#include <cmath>
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Surfaces/DiscBounds.hpp b/Core/include/Acts/Surfaces/DiscBounds.hpp
similarity index 95%
rename from Core/include/ACTS/Surfaces/DiscBounds.hpp
rename to Core/include/Acts/Surfaces/DiscBounds.hpp
index 2035384d7..5b8d4683d 100644
--- a/Core/include/ACTS/Surfaces/DiscBounds.hpp
+++ b/Core/include/Acts/Surfaces/DiscBounds.hpp
@@ -13,7 +13,7 @@
#ifndef ACTS_SURFACESDISCBOUNDS_H
#define ACTS_SURFACESDISCBOUNDS_H
-#include "ACTS/Surfaces/SurfaceBounds.hpp"
+#include "Acts/Surfaces/SurfaceBounds.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Surfaces/DiscSurface.hpp b/Core/include/Acts/Surfaces/DiscSurface.hpp
similarity index 98%
rename from Core/include/ACTS/Surfaces/DiscSurface.hpp
rename to Core/include/Acts/Surfaces/DiscSurface.hpp
index e7f67d65d..d02ed245f 100644
--- a/Core/include/ACTS/Surfaces/DiscSurface.hpp
+++ b/Core/include/Acts/Surfaces/DiscSurface.hpp
@@ -13,12 +13,12 @@
#ifndef ACTS_SURFACE_SDISCSURFACE_H
#define ACTS_SURFACE_SDISCSURFACE_H 1
-#include "ACTS/Surfaces/DiscBounds.hpp"
-#include "ACTS/Surfaces/InfiniteBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Identifier.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/DiscBounds.hpp"
+#include "Acts/Surfaces/InfiniteBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Identifier.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Surfaces/DiscTrapezoidalBounds.hpp b/Core/include/Acts/Surfaces/DiscTrapezoidalBounds.hpp
similarity index 96%
rename from Core/include/ACTS/Surfaces/DiscTrapezoidalBounds.hpp
rename to Core/include/Acts/Surfaces/DiscTrapezoidalBounds.hpp
index 3fb29e9a0..5c0d978df 100644
--- a/Core/include/ACTS/Surfaces/DiscTrapezoidalBounds.hpp
+++ b/Core/include/Acts/Surfaces/DiscTrapezoidalBounds.hpp
@@ -15,10 +15,10 @@
#include <cmath>
-#include "ACTS/Surfaces/DiscBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/DiscBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Surfaces/EllipseBounds.hpp b/Core/include/Acts/Surfaces/EllipseBounds.hpp
similarity index 96%
rename from Core/include/ACTS/Surfaces/EllipseBounds.hpp
rename to Core/include/Acts/Surfaces/EllipseBounds.hpp
index fbf2061ca..e3b4003c6 100644
--- a/Core/include/ACTS/Surfaces/EllipseBounds.hpp
+++ b/Core/include/Acts/Surfaces/EllipseBounds.hpp
@@ -16,10 +16,10 @@
#include <cmath>
#include <cstdlib>
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Surfaces/InfiniteBounds.hpp b/Core/include/Acts/Surfaces/InfiniteBounds.hpp
similarity index 93%
rename from Core/include/ACTS/Surfaces/InfiniteBounds.hpp
rename to Core/include/Acts/Surfaces/InfiniteBounds.hpp
index db2dd01e8..d6333051a 100644
--- a/Core/include/ACTS/Surfaces/InfiniteBounds.hpp
+++ b/Core/include/Acts/Surfaces/InfiniteBounds.hpp
@@ -13,9 +13,9 @@
#ifndef ACTS_INFINITE_BOUNDS_H
#define ACTS_INFINITE_BOUNDS_H 1
-#include "ACTS/Surfaces/SurfaceBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/SurfaceBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Surfaces/LineBounds.hpp b/Core/include/Acts/Surfaces/LineBounds.hpp
similarity index 95%
rename from Core/include/ACTS/Surfaces/LineBounds.hpp
rename to Core/include/Acts/Surfaces/LineBounds.hpp
index bc5c953ea..a1e1e8c5c 100644
--- a/Core/include/ACTS/Surfaces/LineBounds.hpp
+++ b/Core/include/Acts/Surfaces/LineBounds.hpp
@@ -13,9 +13,9 @@
#ifndef ACTS_SURFACES_LINEBOUNDS_H
#define ACTS_SURFACES_LINEBOUNDS_H 1
-#include "ACTS/Surfaces/SurfaceBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/SurfaceBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Surfaces/LineSurface.hpp b/Core/include/Acts/Surfaces/LineSurface.hpp
similarity index 98%
rename from Core/include/ACTS/Surfaces/LineSurface.hpp
rename to Core/include/Acts/Surfaces/LineSurface.hpp
index b3dbe69db..0e2ae3eb7 100644
--- a/Core/include/ACTS/Surfaces/LineSurface.hpp
+++ b/Core/include/Acts/Surfaces/LineSurface.hpp
@@ -13,11 +13,11 @@
#ifndef ACTS_SURFACES_LINESURFACE_H
#define ACTS_SURFACES_LINESURFACE_H
-#include "ACTS/Surfaces/InfiniteBounds.hpp"
-#include "ACTS/Surfaces/LineBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/InfiniteBounds.hpp"
+#include "Acts/Surfaces/LineBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Surfaces/PerigeeSurface.hpp b/Core/include/Acts/Surfaces/PerigeeSurface.hpp
similarity index 92%
rename from Core/include/ACTS/Surfaces/PerigeeSurface.hpp
rename to Core/include/Acts/Surfaces/PerigeeSurface.hpp
index ea0e8e85c..981ee380e 100644
--- a/Core/include/ACTS/Surfaces/PerigeeSurface.hpp
+++ b/Core/include/Acts/Surfaces/PerigeeSurface.hpp
@@ -13,11 +13,11 @@
#ifndef ACTS_SURFACES_PERIGEESURFACE_H
#define ACTS_SURFACES_PERIGEESURFACE_H 1
-#include "ACTS/Surfaces/InfiniteBounds.hpp"
-#include "ACTS/Surfaces/LineSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometryStatics.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/InfiniteBounds.hpp"
+#include "Acts/Surfaces/LineSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometryStatics.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Surfaces/PlanarBounds.hpp b/Core/include/Acts/Surfaces/PlanarBounds.hpp
similarity index 93%
rename from Core/include/ACTS/Surfaces/PlanarBounds.hpp
rename to Core/include/Acts/Surfaces/PlanarBounds.hpp
index b37c060de..0447ae0f3 100644
--- a/Core/include/ACTS/Surfaces/PlanarBounds.hpp
+++ b/Core/include/Acts/Surfaces/PlanarBounds.hpp
@@ -15,8 +15,8 @@
#include <vector>
-#include "ACTS/Surfaces/SurfaceBounds.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/SurfaceBounds.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Surfaces/PlaneSurface.hpp b/Core/include/Acts/Surfaces/PlaneSurface.hpp
similarity index 97%
rename from Core/include/ACTS/Surfaces/PlaneSurface.hpp
rename to Core/include/Acts/Surfaces/PlaneSurface.hpp
index c4a0a9f5a..4dc117f37 100644
--- a/Core/include/ACTS/Surfaces/PlaneSurface.hpp
+++ b/Core/include/Acts/Surfaces/PlaneSurface.hpp
@@ -14,12 +14,12 @@
#define ACTS_SURFACES_PLANESURFACE_H 1
#include <limits>
-#include "ACTS/Surfaces/InfiniteBounds.hpp"
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Identifier.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/InfiniteBounds.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Identifier.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Surfaces/RadialBounds.hpp b/Core/include/Acts/Surfaces/RadialBounds.hpp
similarity index 94%
rename from Core/include/ACTS/Surfaces/RadialBounds.hpp
rename to Core/include/Acts/Surfaces/RadialBounds.hpp
index 38a4d9d8a..f9a209b92 100644
--- a/Core/include/ACTS/Surfaces/RadialBounds.hpp
+++ b/Core/include/Acts/Surfaces/RadialBounds.hpp
@@ -15,11 +15,11 @@
#include <cmath>
-#include "ACTS/Surfaces/DiscBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
-#include "ACTS/Utilities/detail/periodic.hpp"
+#include "Acts/Surfaces/DiscBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
+#include "Acts/Utilities/detail/periodic.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Surfaces/RectangleBounds.hpp b/Core/include/Acts/Surfaces/RectangleBounds.hpp
similarity index 96%
rename from Core/include/ACTS/Surfaces/RectangleBounds.hpp
rename to Core/include/Acts/Surfaces/RectangleBounds.hpp
index eb6aa2a7f..7b0803e87 100644
--- a/Core/include/ACTS/Surfaces/RectangleBounds.hpp
+++ b/Core/include/Acts/Surfaces/RectangleBounds.hpp
@@ -13,9 +13,9 @@
#ifndef ACTS_SURFACES_RECTANGLEBOUNDS_H
#define ACTS_SURFACES_RECTANGLEBOUNDS_H 1
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Surfaces/StrawSurface.hpp b/Core/include/Acts/Surfaces/StrawSurface.hpp
similarity index 94%
rename from Core/include/ACTS/Surfaces/StrawSurface.hpp
rename to Core/include/Acts/Surfaces/StrawSurface.hpp
index 4335a0fd3..2c6579e79 100644
--- a/Core/include/ACTS/Surfaces/StrawSurface.hpp
+++ b/Core/include/Acts/Surfaces/StrawSurface.hpp
@@ -13,11 +13,11 @@
#ifndef ACTS_SURFACES_STRAWSURFACE_H
#define ACTS_SURFACES_STRAWSURFACE_H
-#include "ACTS/Surfaces/LineBounds.hpp"
-#include "ACTS/Surfaces/LineSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Identifier.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/LineBounds.hpp"
+#include "Acts/Surfaces/LineSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Identifier.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Surfaces/Surface.hpp b/Core/include/Acts/Surfaces/Surface.hpp
similarity index 97%
rename from Core/include/ACTS/Surfaces/Surface.hpp
rename to Core/include/Acts/Surfaces/Surface.hpp
index 3751c920e..dc6bfaa96 100644
--- a/Core/include/ACTS/Surfaces/Surface.hpp
+++ b/Core/include/Acts/Surfaces/Surface.hpp
@@ -13,17 +13,17 @@
#ifndef ACTS_SURFACES_SURFACE_H
#define ACTS_SURFACES_SURFACE_H 1
-#include "ACTS/Detector/DetectorElementBase.hpp"
-#include "ACTS/Surfaces/BoundaryCheck.hpp"
-#include "ACTS/Surfaces/SurfaceBounds.hpp"
-#include "ACTS/Utilities/BinnedArray.hpp"
-#include "ACTS/Utilities/BinningType.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometryObject.hpp"
-#include "ACTS/Utilities/GeometryStatics.hpp"
-#include "ACTS/Utilities/Identifier.hpp"
-#include "ACTS/Utilities/Intersection.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Detector/DetectorElementBase.hpp"
+#include "Acts/Surfaces/BoundaryCheck.hpp"
+#include "Acts/Surfaces/SurfaceBounds.hpp"
+#include "Acts/Utilities/BinnedArray.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometryObject.hpp"
+#include "Acts/Utilities/GeometryStatics.hpp"
+#include "Acts/Utilities/Identifier.hpp"
+#include "Acts/Utilities/Intersection.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Surfaces/SurfaceArray.hpp b/Core/include/Acts/Surfaces/SurfaceArray.hpp
similarity index 98%
rename from Core/include/ACTS/Surfaces/SurfaceArray.hpp
rename to Core/include/Acts/Surfaces/SurfaceArray.hpp
index 7ea78515a..499902f0b 100644
--- a/Core/include/ACTS/Surfaces/SurfaceArray.hpp
+++ b/Core/include/Acts/Surfaces/SurfaceArray.hpp
@@ -12,14 +12,14 @@
#include <iostream>
#include <type_traits>
#include <vector>
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/BinningType.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/IAxis.hpp"
-#include "ACTS/Utilities/InstanceFactory.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
-#include "ACTS/Utilities/detail/Axis.hpp"
-#include "ACTS/Utilities/detail/Grid.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/IAxis.hpp"
+#include "Acts/Utilities/InstanceFactory.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
+#include "Acts/Utilities/detail/Axis.hpp"
+#include "Acts/Utilities/detail/Grid.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Surfaces/SurfaceBounds.hpp b/Core/include/Acts/Surfaces/SurfaceBounds.hpp
similarity index 96%
rename from Core/include/ACTS/Surfaces/SurfaceBounds.hpp
rename to Core/include/Acts/Surfaces/SurfaceBounds.hpp
index abbffe4ab..79ac27e63 100644
--- a/Core/include/ACTS/Surfaces/SurfaceBounds.hpp
+++ b/Core/include/Acts/Surfaces/SurfaceBounds.hpp
@@ -15,9 +15,9 @@
#include <ostream>
-#include "ACTS/Surfaces/BoundaryCheck.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/BoundaryCheck.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Surfaces/TrapezoidBounds.hpp b/Core/include/Acts/Surfaces/TrapezoidBounds.hpp
similarity index 96%
rename from Core/include/ACTS/Surfaces/TrapezoidBounds.hpp
rename to Core/include/Acts/Surfaces/TrapezoidBounds.hpp
index 808670404..ce871ae56 100644
--- a/Core/include/ACTS/Surfaces/TrapezoidBounds.hpp
+++ b/Core/include/Acts/Surfaces/TrapezoidBounds.hpp
@@ -15,11 +15,11 @@
#include <cmath>
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Surfaces/TriangleBounds.hpp b/Core/include/Acts/Surfaces/TriangleBounds.hpp
similarity index 92%
rename from Core/include/ACTS/Surfaces/TriangleBounds.hpp
rename to Core/include/Acts/Surfaces/TriangleBounds.hpp
index c7d314380..b9fe7c964 100644
--- a/Core/include/ACTS/Surfaces/TriangleBounds.hpp
+++ b/Core/include/Acts/Surfaces/TriangleBounds.hpp
@@ -16,11 +16,11 @@
#include <array>
#include <utility>
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Tools/CylinderVolumeBuilder.hpp b/Core/include/Acts/Tools/CylinderVolumeBuilder.hpp
similarity index 98%
rename from Core/include/ACTS/Tools/CylinderVolumeBuilder.hpp
rename to Core/include/Acts/Tools/CylinderVolumeBuilder.hpp
index 24f87e561..70e3113a9 100644
--- a/Core/include/ACTS/Tools/CylinderVolumeBuilder.hpp
+++ b/Core/include/Acts/Tools/CylinderVolumeBuilder.hpp
@@ -15,13 +15,13 @@
#include <limits>
#include <string>
-#include "ACTS/Material/Material.hpp"
-#include "ACTS/Tools/ILayerBuilder.hpp"
-#include "ACTS/Tools/ITrackingVolumeBuilder.hpp"
-#include "ACTS/Tools/ITrackingVolumeHelper.hpp"
-#include "ACTS/Utilities/BinningType.hpp"
-#include "ACTS/Utilities/Logger.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Material/Material.hpp"
+#include "Acts/Tools/ILayerBuilder.hpp"
+#include "Acts/Tools/ITrackingVolumeBuilder.hpp"
+#include "Acts/Tools/ITrackingVolumeHelper.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/Units.hpp"
#ifndef ATAS_GEOMETRYTOOLS_TAKESMALLERBIGGER
#define ATAS_GEOMETRYTOOLS_TAKESMALLERBIGGER
diff --git a/Core/include/ACTS/Tools/CylinderVolumeHelper.hpp b/Core/include/Acts/Tools/CylinderVolumeHelper.hpp
similarity index 98%
rename from Core/include/ACTS/Tools/CylinderVolumeHelper.hpp
rename to Core/include/Acts/Tools/CylinderVolumeHelper.hpp
index 5c75ec7f8..58d8796f9 100644
--- a/Core/include/ACTS/Tools/CylinderVolumeHelper.hpp
+++ b/Core/include/Acts/Tools/CylinderVolumeHelper.hpp
@@ -25,11 +25,11 @@
#include <memory>
#include <string>
#include <vector>
-#include "ACTS/Tools/ILayerArrayCreator.hpp"
-#include "ACTS/Tools/ITrackingVolumeArrayCreator.hpp"
-#include "ACTS/Tools/ITrackingVolumeHelper.hpp"
-#include "ACTS/Utilities/Logger.hpp"
-#include "ACTS/Volumes/BoundarySurfaceFace.hpp"
+#include "Acts/Tools/ILayerArrayCreator.hpp"
+#include "Acts/Tools/ITrackingVolumeArrayCreator.hpp"
+#include "Acts/Tools/ITrackingVolumeHelper.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Volumes/BoundarySurfaceFace.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Tools/ILayerArrayCreator.hpp b/Core/include/Acts/Tools/ILayerArrayCreator.hpp
similarity index 95%
rename from Core/include/ACTS/Tools/ILayerArrayCreator.hpp
rename to Core/include/Acts/Tools/ILayerArrayCreator.hpp
index 27bc15b96..2544a49ed 100644
--- a/Core/include/ACTS/Tools/ILayerArrayCreator.hpp
+++ b/Core/include/Acts/Tools/ILayerArrayCreator.hpp
@@ -15,8 +15,8 @@
#include <memory>
#include <vector>
-#include "ACTS/Utilities/BinnedArray.hpp"
-#include "ACTS/Utilities/BinningType.hpp"
+#include "Acts/Utilities/BinnedArray.hpp"
+#include "Acts/Utilities/BinningType.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Tools/ILayerBuilder.hpp b/Core/include/Acts/Tools/ILayerBuilder.hpp
similarity index 100%
rename from Core/include/ACTS/Tools/ILayerBuilder.hpp
rename to Core/include/Acts/Tools/ILayerBuilder.hpp
diff --git a/Core/include/ACTS/Tools/ITrackingGeometryBuilder.hpp b/Core/include/Acts/Tools/ITrackingGeometryBuilder.hpp
similarity index 100%
rename from Core/include/ACTS/Tools/ITrackingGeometryBuilder.hpp
rename to Core/include/Acts/Tools/ITrackingGeometryBuilder.hpp
diff --git a/Core/include/ACTS/Tools/ITrackingVolumeArrayCreator.hpp b/Core/include/Acts/Tools/ITrackingVolumeArrayCreator.hpp
similarity index 96%
rename from Core/include/ACTS/Tools/ITrackingVolumeArrayCreator.hpp
rename to Core/include/Acts/Tools/ITrackingVolumeArrayCreator.hpp
index 454b6c9fa..3b1db9cb5 100644
--- a/Core/include/ACTS/Tools/ITrackingVolumeArrayCreator.hpp
+++ b/Core/include/Acts/Tools/ITrackingVolumeArrayCreator.hpp
@@ -15,8 +15,8 @@
#include <memory>
#include <vector>
-#include "ACTS/Utilities/BinnedArray.hpp"
-#include "ACTS/Utilities/BinningType.hpp"
+#include "Acts/Utilities/BinnedArray.hpp"
+#include "Acts/Utilities/BinningType.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Tools/ITrackingVolumeBuilder.hpp b/Core/include/Acts/Tools/ITrackingVolumeBuilder.hpp
similarity index 100%
rename from Core/include/ACTS/Tools/ITrackingVolumeBuilder.hpp
rename to Core/include/Acts/Tools/ITrackingVolumeBuilder.hpp
diff --git a/Core/include/ACTS/Tools/ITrackingVolumeHelper.hpp b/Core/include/Acts/Tools/ITrackingVolumeHelper.hpp
similarity index 98%
rename from Core/include/ACTS/Tools/ITrackingVolumeHelper.hpp
rename to Core/include/Acts/Tools/ITrackingVolumeHelper.hpp
index 411af2cb7..3c63e9544 100644
--- a/Core/include/ACTS/Tools/ITrackingVolumeHelper.hpp
+++ b/Core/include/Acts/Tools/ITrackingVolumeHelper.hpp
@@ -14,12 +14,12 @@
#define ACTS_TOOLS_ITRACKINGVOLUMEHELPER_H 1
// Geometry module
-#include "ACTS/Utilities/BinningType.hpp"
+#include "Acts/Utilities/BinningType.hpp"
// Core module
#include <memory>
#include <string>
#include <vector>
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Tools/LayerArrayCreator.hpp b/Core/include/Acts/Tools/LayerArrayCreator.hpp
similarity index 96%
rename from Core/include/ACTS/Tools/LayerArrayCreator.hpp
rename to Core/include/Acts/Tools/LayerArrayCreator.hpp
index 4952887ec..04c076eb0 100644
--- a/Core/include/ACTS/Tools/LayerArrayCreator.hpp
+++ b/Core/include/Acts/Tools/LayerArrayCreator.hpp
@@ -23,9 +23,9 @@
#endif
#include <algorithm>
-#include "ACTS/Tools/ILayerArrayCreator.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/Tools/ILayerArrayCreator.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Logger.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Tools/LayerCreator.hpp b/Core/include/Acts/Tools/LayerCreator.hpp
similarity index 97%
rename from Core/include/ACTS/Tools/LayerCreator.hpp
rename to Core/include/Acts/Tools/LayerCreator.hpp
index a1f0143ba..9e9af3f58 100644
--- a/Core/include/ACTS/Tools/LayerCreator.hpp
+++ b/Core/include/Acts/Tools/LayerCreator.hpp
@@ -14,11 +14,11 @@
#define ACTS_GEOMETRYTOOLS_LAYERCREATOR_H 1
#include <boost/optional.hpp>
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Utilities/ApproachDescriptor.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Utilities/ApproachDescriptor.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Logger.hpp"
#ifndef ACTS_LAYERCREATOR_TAKESMALLERBIGGER
#define ACTS_LAYERCREATOR_TAKESMALLERBIGGER
diff --git a/Core/include/ACTS/Tools/PassiveLayerBuilder.hpp b/Core/include/Acts/Tools/PassiveLayerBuilder.hpp
similarity index 97%
rename from Core/include/ACTS/Tools/PassiveLayerBuilder.hpp
rename to Core/include/Acts/Tools/PassiveLayerBuilder.hpp
index 18e8af431..011d762f2 100644
--- a/Core/include/ACTS/Tools/PassiveLayerBuilder.hpp
+++ b/Core/include/Acts/Tools/PassiveLayerBuilder.hpp
@@ -13,9 +13,9 @@
#ifndef ACTS_GEOMETRYTOOLS_PASSIVELAYERBUILDER_H
#define ACTS_GEOMETRYTOOLS_PASSIVELAYERBUILDER_H 1
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Tools/ILayerBuilder.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Tools/ILayerBuilder.hpp"
+#include "Acts/Utilities/Logger.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Tools/SurfaceArrayCreator.hpp b/Core/include/Acts/Tools/SurfaceArrayCreator.hpp
similarity index 98%
rename from Core/include/ACTS/Tools/SurfaceArrayCreator.hpp
rename to Core/include/Acts/Tools/SurfaceArrayCreator.hpp
index 8f750a99e..1b63ad37f 100644
--- a/Core/include/ACTS/Tools/SurfaceArrayCreator.hpp
+++ b/Core/include/Acts/Tools/SurfaceArrayCreator.hpp
@@ -15,13 +15,13 @@
#include <boost/none.hpp>
#include <boost/optional.hpp>
-#include "ACTS/Layers/ProtoLayer.hpp"
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Surfaces/SurfaceArray.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Logger.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Layers/ProtoLayer.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Surfaces/SurfaceArray.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/Units.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Tools/TrackingGeometryBuilder.hpp b/Core/include/Acts/Tools/TrackingGeometryBuilder.hpp
similarity index 93%
rename from Core/include/ACTS/Tools/TrackingGeometryBuilder.hpp
rename to Core/include/Acts/Tools/TrackingGeometryBuilder.hpp
index 14aa4c996..121899be8 100644
--- a/Core/include/ACTS/Tools/TrackingGeometryBuilder.hpp
+++ b/Core/include/Acts/Tools/TrackingGeometryBuilder.hpp
@@ -15,11 +15,11 @@
#include <list>
#include <memory>
-#include "ACTS/Tools/ITrackingGeometryBuilder.hpp"
-#include "ACTS/Tools/ITrackingVolumeBuilder.hpp"
-#include "ACTS/Tools/ITrackingVolumeHelper.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/Tools/ITrackingGeometryBuilder.hpp"
+#include "Acts/Tools/ITrackingVolumeBuilder.hpp"
+#include "Acts/Tools/ITrackingVolumeHelper.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Logger.hpp"
namespace Acts {
class TrackingGeometry;
diff --git a/Core/include/ACTS/Tools/TrackingVolumeArrayCreator.hpp b/Core/include/Acts/Tools/TrackingVolumeArrayCreator.hpp
similarity index 92%
rename from Core/include/ACTS/Tools/TrackingVolumeArrayCreator.hpp
rename to Core/include/Acts/Tools/TrackingVolumeArrayCreator.hpp
index 98a4e157c..320b84bc0 100644
--- a/Core/include/ACTS/Tools/TrackingVolumeArrayCreator.hpp
+++ b/Core/include/Acts/Tools/TrackingVolumeArrayCreator.hpp
@@ -14,10 +14,10 @@
#define ACTS_GEOMETRYTOOLS_TRACKINGVOLUMEARRAYCREATOR_H
#include <algorithm>
-#include "ACTS/Tools/ITrackingVolumeArrayCreator.hpp"
-#include "ACTS/Utilities/BinnedArray.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/Tools/ITrackingVolumeArrayCreator.hpp"
+#include "Acts/Utilities/BinnedArray.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Logger.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Utilities/ApproachDescriptor.hpp b/Core/include/Acts/Utilities/ApproachDescriptor.hpp
similarity index 96%
rename from Core/include/ACTS/Utilities/ApproachDescriptor.hpp
rename to Core/include/Acts/Utilities/ApproachDescriptor.hpp
index 5aaed94e7..34f8b2740 100644
--- a/Core/include/ACTS/Utilities/ApproachDescriptor.hpp
+++ b/Core/include/Acts/Utilities/ApproachDescriptor.hpp
@@ -14,8 +14,8 @@
#define ACTS_UTILITIES_APPROACHDESCRIPTOR_H 1
#include <vector>
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Intersection.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Intersection.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Utilities/BFieldMapUtils.hpp b/Core/include/Acts/Utilities/BFieldMapUtils.hpp
similarity index 98%
rename from Core/include/ACTS/Utilities/BFieldMapUtils.hpp
rename to Core/include/Acts/Utilities/BFieldMapUtils.hpp
index 649ea9db7..cf49f0bc1 100644
--- a/Core/include/ACTS/Utilities/BFieldMapUtils.hpp
+++ b/Core/include/Acts/Utilities/BFieldMapUtils.hpp
@@ -10,8 +10,8 @@
#define ACTFW_BFIELD_BFIELDMAPUTILS_HPP
#include <vector>
-#include "ACTS/MagneticField/InterpolatedBFieldMap.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/MagneticField/InterpolatedBFieldMap.hpp"
+#include "Acts/Utilities/Units.hpp"
/// Convenience functions to ease creation of and Acts::InterpolatedBFieldMap
/// and to avoid code duplication. Currently implemented for the two most common
diff --git a/Core/include/ACTS/Utilities/BinUtility.hpp b/Core/include/Acts/Utilities/BinUtility.hpp
similarity index 99%
rename from Core/include/ACTS/Utilities/BinUtility.hpp
rename to Core/include/Acts/Utilities/BinUtility.hpp
index 84770bbff..ba48abc34 100644
--- a/Core/include/ACTS/Utilities/BinUtility.hpp
+++ b/Core/include/Acts/Utilities/BinUtility.hpp
@@ -17,9 +17,9 @@
#include <iostream>
#include <memory>
#include <vector>
-#include "ACTS/Utilities/BinningData.hpp"
-#include "ACTS/Utilities/BinningType.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/BinningData.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Utilities/BinnedArray.hpp b/Core/include/Acts/Utilities/BinnedArray.hpp
similarity index 97%
rename from Core/include/ACTS/Utilities/BinnedArray.hpp
rename to Core/include/Acts/Utilities/BinnedArray.hpp
index ea98dc484..db3eb32f8 100644
--- a/Core/include/ACTS/Utilities/BinnedArray.hpp
+++ b/Core/include/Acts/Utilities/BinnedArray.hpp
@@ -15,8 +15,8 @@
#include <array>
#include <vector>
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Utilities/BinnedArrayXD.hpp b/Core/include/Acts/Utilities/BinnedArrayXD.hpp
similarity index 98%
rename from Core/include/ACTS/Utilities/BinnedArrayXD.hpp
rename to Core/include/Acts/Utilities/BinnedArrayXD.hpp
index cf0818015..0f4377942 100644
--- a/Core/include/ACTS/Utilities/BinnedArrayXD.hpp
+++ b/Core/include/Acts/Utilities/BinnedArrayXD.hpp
@@ -16,8 +16,8 @@
#include <array>
#include <iostream>
#include <vector>
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/BinnedArray.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/BinnedArray.hpp"
class MsgStream;
diff --git a/Core/include/ACTS/Utilities/BinningData.hpp b/Core/include/Acts/Utilities/BinningData.hpp
similarity index 99%
rename from Core/include/ACTS/Utilities/BinningData.hpp
rename to Core/include/Acts/Utilities/BinningData.hpp
index 37b7616de..75243cce5 100644
--- a/Core/include/ACTS/Utilities/BinningData.hpp
+++ b/Core/include/Acts/Utilities/BinningData.hpp
@@ -17,9 +17,9 @@
#include <memory>
#include <utility>
#include <vector>
-#include "ACTS/Utilities/BinningType.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Utilities/BinningType.hpp b/Core/include/Acts/Utilities/BinningType.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/BinningType.hpp
rename to Core/include/Acts/Utilities/BinningType.hpp
diff --git a/Core/include/ACTS/Utilities/Definitions.hpp b/Core/include/Acts/Utilities/Definitions.hpp
similarity index 95%
rename from Core/include/ACTS/Utilities/Definitions.hpp
rename to Core/include/Acts/Utilities/Definitions.hpp
index bb72c168a..696755386 100644
--- a/Core/include/ACTS/Utilities/Definitions.hpp
+++ b/Core/include/Acts/Utilities/Definitions.hpp
@@ -10,9 +10,9 @@
#define ACTS_Definitions_H
// API addons
-#define EIGEN_MATRIXBASE_PLUGIN "ACTS/Utilities/detail/MatrixBasePlugin.hpp"
-#define EIGEN_MATRIX_PLUGIN "ACTS/Utilities/detail/MatrixPlugin.hpp"
-#define EIGEN_TRANSFORM_PLUGIN "ACTS/Utilities/detail/TransformPlugin.hpp"
+#define EIGEN_MATRIXBASE_PLUGIN "Acts/Utilities/detail/MatrixBasePlugin.hpp"
+#define EIGEN_MATRIX_PLUGIN "Acts/Utilities/detail/MatrixPlugin.hpp"
+#define EIGEN_TRANSFORM_PLUGIN "Acts/Utilities/detail/TransformPlugin.hpp"
// for GNU: ignore this specific warning, otherwise just include Eigen/Dense
#if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER)
diff --git a/Core/include/ACTS/Utilities/GeometryID.hpp b/Core/include/Acts/Utilities/GeometryID.hpp
similarity index 99%
rename from Core/include/ACTS/Utilities/GeometryID.hpp
rename to Core/include/Acts/Utilities/GeometryID.hpp
index c79c1a962..c9e1c2abb 100644
--- a/Core/include/ACTS/Utilities/GeometryID.hpp
+++ b/Core/include/Acts/Utilities/GeometryID.hpp
@@ -14,7 +14,7 @@
#define ACTS_GEOMETRYUTILS_GEOMETRYID_H 1
#include <iostream>
-#include "ACTS/Utilities/Helpers.hpp"
+#include "Acts/Utilities/Helpers.hpp"
typedef uint64_t geo_id_value;
diff --git a/Core/include/ACTS/Utilities/GeometryObject.hpp b/Core/include/Acts/Utilities/GeometryObject.hpp
similarity index 95%
rename from Core/include/ACTS/Utilities/GeometryObject.hpp
rename to Core/include/Acts/Utilities/GeometryObject.hpp
index 37d0fd297..39b1bcd60 100644
--- a/Core/include/ACTS/Utilities/GeometryObject.hpp
+++ b/Core/include/Acts/Utilities/GeometryObject.hpp
@@ -13,9 +13,9 @@
#ifndef ACTS_GEOMETRYUTILS_GEOMETRYOBJECT_H
#define ACTS_GEOMETRYUTILS_GEOMETRYOBJECT_H
-#include "ACTS/Utilities/BinningType.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometryID.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometryID.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Utilities/GeometryObjectSorter.hpp b/Core/include/Acts/Utilities/GeometryObjectSorter.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/GeometryObjectSorter.hpp
rename to Core/include/Acts/Utilities/GeometryObjectSorter.hpp
diff --git a/Core/include/ACTS/Utilities/GeometrySignature.hpp b/Core/include/Acts/Utilities/GeometrySignature.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/GeometrySignature.hpp
rename to Core/include/Acts/Utilities/GeometrySignature.hpp
diff --git a/Core/include/ACTS/Utilities/GeometryStatics.hpp b/Core/include/Acts/Utilities/GeometryStatics.hpp
similarity index 97%
rename from Core/include/ACTS/Utilities/GeometryStatics.hpp
rename to Core/include/Acts/Utilities/GeometryStatics.hpp
index 6593c0bf1..19c54de2c 100644
--- a/Core/include/ACTS/Utilities/GeometryStatics.hpp
+++ b/Core/include/Acts/Utilities/GeometryStatics.hpp
@@ -13,7 +13,7 @@
#ifndef ACTS_GEOMETYRUTILS_GEOMETRYSTATICS_H
#define ACTS_GEOMETYRUTILS_GEOMETRYSTATICS_H 1
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
/// Define statics for Geometry in Tracking
///
diff --git a/Core/include/ACTS/Utilities/Helpers.hpp b/Core/include/Acts/Utilities/Helpers.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/Helpers.hpp
rename to Core/include/Acts/Utilities/Helpers.hpp
diff --git a/Core/include/ACTS/Utilities/IAxis.hpp b/Core/include/Acts/Utilities/IAxis.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/IAxis.hpp
rename to Core/include/Acts/Utilities/IAxis.hpp
diff --git a/Core/include/ACTS/Utilities/Identifier.hpp b/Core/include/Acts/Utilities/Identifier.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/Identifier.hpp
rename to Core/include/Acts/Utilities/Identifier.hpp
diff --git a/Core/include/ACTS/Utilities/InstanceFactory.hpp b/Core/include/Acts/Utilities/InstanceFactory.hpp
similarity index 89%
rename from Core/include/ACTS/Utilities/InstanceFactory.hpp
rename to Core/include/Acts/Utilities/InstanceFactory.hpp
index 48132a9a1..14d49ed8e 100644
--- a/Core/include/ACTS/Utilities/InstanceFactory.hpp
+++ b/Core/include/Acts/Utilities/InstanceFactory.hpp
@@ -11,19 +11,19 @@
#include <boost/functional/value_factory.hpp>
#include <map>
-#include "ACTS/Utilities/ThrowAssert.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/VariantData.hpp"
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/DiamondBounds.hpp"
-#include "ACTS/Surfaces/DiscBounds.hpp"
-#include "ACTS/Surfaces/DiscTrapezoidalBounds.hpp"
-#include "ACTS/Surfaces/EllipseBounds.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/TrapezoidBounds.hpp"
-#include "ACTS/Surfaces/TriangleBounds.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/DiamondBounds.hpp"
+#include "Acts/Surfaces/DiscBounds.hpp"
+#include "Acts/Surfaces/DiscTrapezoidalBounds.hpp"
+#include "Acts/Surfaces/EllipseBounds.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Surfaces/TriangleBounds.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Utilities/Interpolation.hpp b/Core/include/Acts/Utilities/Interpolation.hpp
similarity index 97%
rename from Core/include/ACTS/Utilities/Interpolation.hpp
rename to Core/include/Acts/Utilities/Interpolation.hpp
index 2056f292f..41edd7043 100644
--- a/Core/include/ACTS/Utilities/Interpolation.hpp
+++ b/Core/include/Acts/Utilities/Interpolation.hpp
@@ -10,8 +10,8 @@
#include <array>
#include <type_traits>
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/detail/interpolation_impl.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/detail/interpolation_impl.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Utilities/Intersection.hpp b/Core/include/Acts/Utilities/Intersection.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/Intersection.hpp
rename to Core/include/Acts/Utilities/Intersection.hpp
diff --git a/Core/include/ACTS/Utilities/Logger.hpp b/Core/include/Acts/Utilities/Logger.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/Logger.hpp
rename to Core/include/Acts/Utilities/Logger.hpp
diff --git a/Core/include/ACTS/Utilities/MaterialInteraction.hpp b/Core/include/Acts/Utilities/MaterialInteraction.hpp
similarity index 96%
rename from Core/include/ACTS/Utilities/MaterialInteraction.hpp
rename to Core/include/Acts/Utilities/MaterialInteraction.hpp
index d95534f88..caaf3b8b3 100644
--- a/Core/include/ACTS/Utilities/MaterialInteraction.hpp
+++ b/Core/include/Acts/Utilities/MaterialInteraction.hpp
@@ -9,9 +9,9 @@
#ifndef ACTS_EXTRAPOLATIONUTILS_MATERIALINTERACTION_H
#define ACTS_EXTRAPOLATIONUTILS_MATERIALINTERACTION_H 1
-#include "ACTS/EventData/ParticleDefinitions.hpp"
-#include "ACTS/Material/Material.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/EventData/ParticleDefinitions.hpp"
+#include "Acts/Material/Material.hpp"
+#include "Acts/Utilities/Definitions.hpp"
/// Collection of parametrizations used for
/// energy loss and scattering
diff --git a/Core/include/ACTS/Utilities/ParameterDefinitions.hpp b/Core/include/Acts/Utilities/ParameterDefinitions.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/ParameterDefinitions.hpp
rename to Core/include/Acts/Utilities/ParameterDefinitions.hpp
diff --git a/Core/include/ACTS/Utilities/ParameterTypes.hpp b/Core/include/Acts/Utilities/ParameterTypes.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/ParameterTypes.hpp
rename to Core/include/Acts/Utilities/ParameterTypes.hpp
diff --git a/Core/include/ACTS/Utilities/ThrowAssert.hpp b/Core/include/Acts/Utilities/ThrowAssert.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/ThrowAssert.hpp
rename to Core/include/Acts/Utilities/ThrowAssert.hpp
diff --git a/Core/include/ACTS/Utilities/Units.hpp b/Core/include/Acts/Utilities/Units.hpp
similarity index 94%
rename from Core/include/ACTS/Utilities/Units.hpp
rename to Core/include/Acts/Utilities/Units.hpp
index f5ae6f25e..9dfd5c4d6 100644
--- a/Core/include/ACTS/Utilities/Units.hpp
+++ b/Core/include/Acts/Utilities/Units.hpp
@@ -25,7 +25,7 @@ namespace Acts {
///
/// Examples:
/// @code
-/// #include "ACTS/include/Utilities/Units.hpp"
+/// #include "Acts/include/Utilities/Units.hpp"
/// using namespace Acts::units;
/// // specify input variables
/// double momentum = 2.5 * _GeV;
@@ -153,7 +153,7 @@ namespace units {
/// This function converts the given energy value from SI units to natural
/// units. Example:
/// @code
- /// #include "ACTS/include/Utilities/Units.hpp"
+ /// #include "Acts/include/Utilities/Units.hpp"
/// using namespace Acts::units;
///
/// double E_in_TeV = SI2Nat<ENERGY>(2.3 * _J) / _TeV;
@@ -170,7 +170,7 @@ namespace units {
/// This function converts the given energy value from natural units to SI
/// units. Example:
/// @code
- /// #include "ACTS/include/Utilities/Units.hpp"
+ /// #include "Acts/include/Utilities/Units.hpp"
/// using namespace Acts::units;
///
/// double E_in_Joule = Nat2SI<ENERGY>(2.3 * _TeV) / _J;
@@ -187,7 +187,7 @@ namespace units {
/// This function converts the given length value from SI units to natural
/// units. Example:
/// @code
- /// #include "ACTS/include/Utilities/Units.hpp"
+ /// #include "Acts/include/Utilities/Units.hpp"
/// using namespace Acts::units;
///
/// double l_per_MeV = SI2Nat<LENGTH>(3 * _um) * _MeV;
@@ -204,7 +204,7 @@ namespace units {
/// This function converts the given length value from natural units to SI
/// units. Example:
/// @code
- /// #include "ACTS/include/Utilities/Units.hpp"
+ /// #include "Acts/include/Utilities/Units.hpp"
/// using namespace Acts::units;
///
/// double l_in_m = Nat2SI<LENGTH>(1. / (2 * _TeV)) / _m;
@@ -221,7 +221,7 @@ namespace units {
/// This function converts the given momentum value from SI units to natural
/// units. Example:
/// @code
- /// #include "ACTS/include/Utilities/Units.hpp"
+ /// #include "Acts/include/Utilities/Units.hpp"
/// using namespace Acts::units;
///
/// double p_in_GeV = SI2Nat<MOMENTUM>(2 * _N * _s) / _GeV;
@@ -238,7 +238,7 @@ namespace units {
/// This function converts the given momentum value from natural units to SI
/// units. Example:
/// @code
- /// #include "ACTS/include/Utilities/Units.hpp"
+ /// #include "Acts/include/Utilities/Units.hpp"
/// using namespace Acts::units;
///
/// double p_in_Ns = Nat2SI<MOMENTUM>(132 * _GeV) / (_N * _s);
@@ -255,7 +255,7 @@ namespace units {
/// This function converts the given mass value from SI units to natural
/// units. Example:
/// @code
- /// #include "ACTS/include/Utilities/Units.hpp"
+ /// #include "Acts/include/Utilities/Units.hpp"
/// using namespace Acts::units;
///
/// double m_in_keV = SI2Nat<MASS>(2 * _g) / _keV;
@@ -272,7 +272,7 @@ namespace units {
/// This function converts the given mass value from natural units to SI
/// units. Example:
/// @code
- /// #include "ACTS/include/Utilities/Units.hpp"
+ /// #include "Acts/include/Utilities/Units.hpp"
/// using namespace Acts::units;
///
/// double higgs_in_kg= Nat2SI<MASS>(125 * _GeV) / _kg;
diff --git a/Core/include/ACTS/Utilities/VariantData.hpp b/Core/include/Acts/Utilities/VariantData.hpp
similarity index 99%
rename from Core/include/ACTS/Utilities/VariantData.hpp
rename to Core/include/Acts/Utilities/VariantData.hpp
index 27886ddca..b9de57277 100644
--- a/Core/include/ACTS/Utilities/VariantData.hpp
+++ b/Core/include/Acts/Utilities/VariantData.hpp
@@ -17,8 +17,8 @@
#include <sstream>
#include <vector>
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Utilities/VariantDataFwd.hpp b/Core/include/Acts/Utilities/VariantDataFwd.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/VariantDataFwd.hpp
rename to Core/include/Acts/Utilities/VariantDataFwd.hpp
diff --git a/Core/include/ACTS/Utilities/concept/AnyGrid.hpp b/Core/include/Acts/Utilities/concept/AnyGrid.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/concept/AnyGrid.hpp
rename to Core/include/Acts/Utilities/concept/AnyGrid.hpp
diff --git a/Core/include/ACTS/Utilities/detail/Axis.hpp b/Core/include/Acts/Utilities/detail/Axis.hpp
similarity index 99%
rename from Core/include/ACTS/Utilities/detail/Axis.hpp
rename to Core/include/Acts/Utilities/detail/Axis.hpp
index a5d22da15..517a8b7e9 100644
--- a/Core/include/ACTS/Utilities/detail/Axis.hpp
+++ b/Core/include/Acts/Utilities/detail/Axis.hpp
@@ -12,7 +12,7 @@
#include <cmath>
#include <set>
#include <vector>
-#include "ACTS/Utilities/IAxis.hpp"
+#include "Acts/Utilities/IAxis.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Utilities/detail/DefaultParameterDefinitions.hpp b/Core/include/Acts/Utilities/detail/DefaultParameterDefinitions.hpp
similarity index 97%
rename from Core/include/ACTS/Utilities/detail/DefaultParameterDefinitions.hpp
rename to Core/include/Acts/Utilities/detail/DefaultParameterDefinitions.hpp
index 8cca1da7b..46e799498 100644
--- a/Core/include/ACTS/Utilities/detail/DefaultParameterDefinitions.hpp
+++ b/Core/include/Acts/Utilities/detail/DefaultParameterDefinitions.hpp
@@ -13,7 +13,7 @@
#include <cmath>
// ACTS includes
-#include "ACTS/Utilities/ParameterTypes.hpp"
+#include "Acts/Utilities/ParameterTypes.hpp"
namespace Acts {
enum ParDef : unsigned int {
diff --git a/Core/include/ACTS/Utilities/detail/Grid.hpp b/Core/include/Acts/Utilities/detail/Grid.hpp
similarity index 99%
rename from Core/include/ACTS/Utilities/detail/Grid.hpp
rename to Core/include/Acts/Utilities/detail/Grid.hpp
index 29c37d71f..306edd421 100644
--- a/Core/include/ACTS/Utilities/detail/Grid.hpp
+++ b/Core/include/Acts/Utilities/detail/Grid.hpp
@@ -14,9 +14,9 @@
#include <tuple>
#include <type_traits>
#include <vector>
-#include "ACTS/Utilities/IAxis.hpp"
-#include "ACTS/Utilities/Interpolation.hpp"
-#include "ACTS/Utilities/detail/grid_helper.hpp"
+#include "Acts/Utilities/IAxis.hpp"
+#include "Acts/Utilities/Interpolation.hpp"
+#include "Acts/Utilities/detail/grid_helper.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Utilities/detail/MPL/all_of.hpp b/Core/include/Acts/Utilities/detail/MPL/all_of.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/MPL/all_of.hpp
rename to Core/include/Acts/Utilities/detail/MPL/all_of.hpp
diff --git a/Core/include/ACTS/Utilities/detail/MPL/any_of.hpp b/Core/include/Acts/Utilities/detail/MPL/any_of.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/MPL/any_of.hpp
rename to Core/include/Acts/Utilities/detail/MPL/any_of.hpp
diff --git a/Core/include/ACTS/Utilities/detail/MPL/are_sorted.hpp b/Core/include/Acts/Utilities/detail/MPL/are_sorted.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/MPL/are_sorted.hpp
rename to Core/include/Acts/Utilities/detail/MPL/are_sorted.hpp
diff --git a/Core/include/ACTS/Utilities/detail/MPL/are_within.hpp b/Core/include/Acts/Utilities/detail/MPL/are_within.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/MPL/are_within.hpp
rename to Core/include/Acts/Utilities/detail/MPL/are_within.hpp
diff --git a/Core/include/ACTS/Utilities/detail/MPL/at_index.hpp b/Core/include/Acts/Utilities/detail/MPL/at_index.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/MPL/at_index.hpp
rename to Core/include/Acts/Utilities/detail/MPL/at_index.hpp
diff --git a/Core/include/ACTS/Utilities/detail/MPL/boost_mpl_helper.hpp b/Core/include/Acts/Utilities/detail/MPL/boost_mpl_helper.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/MPL/boost_mpl_helper.hpp
rename to Core/include/Acts/Utilities/detail/MPL/boost_mpl_helper.hpp
diff --git a/Core/include/ACTS/Utilities/detail/MPL/get_position.hpp b/Core/include/Acts/Utilities/detail/MPL/get_position.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/MPL/get_position.hpp
rename to Core/include/Acts/Utilities/detail/MPL/get_position.hpp
diff --git a/Core/include/ACTS/Utilities/detail/MPL/has_duplicates.hpp b/Core/include/Acts/Utilities/detail/MPL/has_duplicates.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/MPL/has_duplicates.hpp
rename to Core/include/Acts/Utilities/detail/MPL/has_duplicates.hpp
diff --git a/Core/include/ACTS/Utilities/detail/MPL/is_contained.hpp b/Core/include/Acts/Utilities/detail/MPL/is_contained.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/MPL/is_contained.hpp
rename to Core/include/Acts/Utilities/detail/MPL/is_contained.hpp
diff --git a/Core/include/ACTS/Utilities/detail/MPL/type_collector.hpp b/Core/include/Acts/Utilities/detail/MPL/type_collector.hpp
similarity index 98%
rename from Core/include/ACTS/Utilities/detail/MPL/type_collector.hpp
rename to Core/include/Acts/Utilities/detail/MPL/type_collector.hpp
index 9b2934ad7..a81396cf0 100644
--- a/Core/include/ACTS/Utilities/detail/MPL/type_collector.hpp
+++ b/Core/include/Acts/Utilities/detail/MPL/type_collector.hpp
@@ -11,7 +11,7 @@
#include <boost/mpl/set.hpp>
#include <type_traits>
-#include "ACTS/Utilities/detail/MPL/boost_mpl_helper.hpp"
+#include "Acts/Utilities/detail/MPL/boost_mpl_helper.hpp"
namespace bm = boost::mpl;
#define HAS_TYPE(x) \
diff --git a/Core/include/ACTS/Utilities/detail/MatrixBasePlugin.hpp b/Core/include/Acts/Utilities/detail/MatrixBasePlugin.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/MatrixBasePlugin.hpp
rename to Core/include/Acts/Utilities/detail/MatrixBasePlugin.hpp
diff --git a/Core/include/ACTS/Utilities/detail/MatrixPlugin.hpp b/Core/include/Acts/Utilities/detail/MatrixPlugin.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/MatrixPlugin.hpp
rename to Core/include/Acts/Utilities/detail/MatrixPlugin.hpp
diff --git a/Core/include/ACTS/Utilities/detail/RealQuadraticEquation.hpp b/Core/include/Acts/Utilities/detail/RealQuadraticEquation.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/RealQuadraticEquation.hpp
rename to Core/include/Acts/Utilities/detail/RealQuadraticEquation.hpp
diff --git a/Core/include/ACTS/Utilities/detail/TransformPlugin.hpp b/Core/include/Acts/Utilities/detail/TransformPlugin.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/TransformPlugin.hpp
rename to Core/include/Acts/Utilities/detail/TransformPlugin.hpp
diff --git a/Core/include/ACTS/Utilities/detail/grid_helper.hpp b/Core/include/Acts/Utilities/detail/grid_helper.hpp
similarity index 99%
rename from Core/include/ACTS/Utilities/detail/grid_helper.hpp
rename to Core/include/Acts/Utilities/detail/grid_helper.hpp
index 419c9b6fb..0dd7fdc78 100644
--- a/Core/include/ACTS/Utilities/detail/grid_helper.hpp
+++ b/Core/include/Acts/Utilities/detail/grid_helper.hpp
@@ -11,7 +11,7 @@
#include <array>
#include <tuple>
#include <utility>
-#include "ACTS/Utilities/IAxis.hpp"
+#include "Acts/Utilities/IAxis.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Utilities/detail/interpolation_impl.hpp b/Core/include/Acts/Utilities/detail/interpolation_impl.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/interpolation_impl.hpp
rename to Core/include/Acts/Utilities/detail/interpolation_impl.hpp
diff --git a/Core/include/ACTS/Utilities/detail/periodic.hpp b/Core/include/Acts/Utilities/detail/periodic.hpp
similarity index 100%
rename from Core/include/ACTS/Utilities/detail/periodic.hpp
rename to Core/include/Acts/Utilities/detail/periodic.hpp
diff --git a/Core/include/ACTS/Volumes/AbstractVolume.hpp b/Core/include/Acts/Volumes/AbstractVolume.hpp
similarity index 95%
rename from Core/include/ACTS/Volumes/AbstractVolume.hpp
rename to Core/include/Acts/Volumes/AbstractVolume.hpp
index 640ad17de..586bf3cd9 100644
--- a/Core/include/ACTS/Volumes/AbstractVolume.hpp
+++ b/Core/include/Acts/Volumes/AbstractVolume.hpp
@@ -14,9 +14,9 @@
#define ACTS_VOLUMES_ABSTRACTVOLUME_H
#include <vector>
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Volumes/BoundarySurfaceT.hpp"
-#include "ACTS/Volumes/Volume.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Volumes/BoundarySurfaceT.hpp"
+#include "Acts/Volumes/Volume.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Volumes/BoundarySurfaceFace.hpp b/Core/include/Acts/Volumes/BoundarySurfaceFace.hpp
similarity index 100%
rename from Core/include/ACTS/Volumes/BoundarySurfaceFace.hpp
rename to Core/include/Acts/Volumes/BoundarySurfaceFace.hpp
diff --git a/Core/include/ACTS/Volumes/BoundarySurfaceT.hpp b/Core/include/Acts/Volumes/BoundarySurfaceT.hpp
similarity index 97%
rename from Core/include/ACTS/Volumes/BoundarySurfaceT.hpp
rename to Core/include/Acts/Volumes/BoundarySurfaceT.hpp
index 05aab1957..922de6dc7 100644
--- a/Core/include/ACTS/Volumes/BoundarySurfaceT.hpp
+++ b/Core/include/Acts/Volumes/BoundarySurfaceT.hpp
@@ -14,10 +14,10 @@
#define ACTS_VOLUMES_BOUNDARYSURFACET_H
#include <memory>
-#include "ACTS/Utilities/BinnedArray.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Volumes/BoundarySurfaceFace.hpp"
-#include "ACTS/Volumes/Volume.hpp"
+#include "Acts/Utilities/BinnedArray.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Volumes/BoundarySurfaceFace.hpp"
+#include "Acts/Volumes/Volume.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Volumes/CuboidVolumeBounds.hpp b/Core/include/Acts/Volumes/CuboidVolumeBounds.hpp
similarity index 98%
rename from Core/include/ACTS/Volumes/CuboidVolumeBounds.hpp
rename to Core/include/Acts/Volumes/CuboidVolumeBounds.hpp
index 6fac20d65..46a9fe270 100644
--- a/Core/include/ACTS/Volumes/CuboidVolumeBounds.hpp
+++ b/Core/include/Acts/Volumes/CuboidVolumeBounds.hpp
@@ -14,8 +14,8 @@
#define ACTS_VOLUMES_CUBOIDVOLUMESBOUNDS_H 1
#include <cmath>
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Volumes/VolumeBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Volumes/VolumeBounds.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Volumes/CylinderVolumeBounds.hpp b/Core/include/Acts/Volumes/CylinderVolumeBounds.hpp
similarity index 99%
rename from Core/include/ACTS/Volumes/CylinderVolumeBounds.hpp
rename to Core/include/Acts/Volumes/CylinderVolumeBounds.hpp
index d386f0dc0..0442ae645 100644
--- a/Core/include/ACTS/Volumes/CylinderVolumeBounds.hpp
+++ b/Core/include/Acts/Volumes/CylinderVolumeBounds.hpp
@@ -14,8 +14,8 @@
#define ACTS_VOLUMES_CYLINDERVOLUMESBOUNDS_H 1
#include <cmath>
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Volumes/VolumeBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Volumes/VolumeBounds.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Volumes/DoubleTrapezoidVolumeBounds.hpp b/Core/include/Acts/Volumes/DoubleTrapezoidVolumeBounds.hpp
similarity index 99%
rename from Core/include/ACTS/Volumes/DoubleTrapezoidVolumeBounds.hpp
rename to Core/include/Acts/Volumes/DoubleTrapezoidVolumeBounds.hpp
index 2e031c61c..9abe816e8 100644
--- a/Core/include/ACTS/Volumes/DoubleTrapezoidVolumeBounds.hpp
+++ b/Core/include/Acts/Volumes/DoubleTrapezoidVolumeBounds.hpp
@@ -13,8 +13,8 @@
#ifndef ACTS_VOLUMES_DOUBLETRAPEZOIDVOLUMESBOUNDS_H
#define ACTS_VOLUMES_DOUBLETRAPEZOIDVOLUMESBOUNDS_H 1
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Volumes/VolumeBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Volumes/VolumeBounds.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Volumes/TrapezoidVolumeBounds.hpp b/Core/include/Acts/Volumes/TrapezoidVolumeBounds.hpp
similarity index 98%
rename from Core/include/ACTS/Volumes/TrapezoidVolumeBounds.hpp
rename to Core/include/Acts/Volumes/TrapezoidVolumeBounds.hpp
index 916938a35..c4552fc41 100644
--- a/Core/include/ACTS/Volumes/TrapezoidVolumeBounds.hpp
+++ b/Core/include/Acts/Volumes/TrapezoidVolumeBounds.hpp
@@ -13,8 +13,8 @@
#ifndef ACTS_VOLUMES_TRAPEZOIDVOLUMESBOUNDS_H
#define ACTS_VOLUMES_TRAPEZOIDVOLUMESBOUNDS_H 1
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Volumes/VolumeBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Volumes/VolumeBounds.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Volumes/Volume.hpp b/Core/include/Acts/Volumes/Volume.hpp
similarity index 95%
rename from Core/include/ACTS/Volumes/Volume.hpp
rename to Core/include/Acts/Volumes/Volume.hpp
index fcf08b9d3..e48923435 100644
--- a/Core/include/ACTS/Volumes/Volume.hpp
+++ b/Core/include/Acts/Volumes/Volume.hpp
@@ -13,9 +13,9 @@
#define ACTS_VOLUMES_VOLUME_H 1
#include <memory>
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometryObject.hpp"
-#include "ACTS/Utilities/GeometryStatics.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometryObject.hpp"
+#include "Acts/Utilities/GeometryStatics.hpp"
namespace Acts {
diff --git a/Core/include/ACTS/Volumes/VolumeBounds.hpp b/Core/include/Acts/Volumes/VolumeBounds.hpp
similarity index 97%
rename from Core/include/ACTS/Volumes/VolumeBounds.hpp
rename to Core/include/Acts/Volumes/VolumeBounds.hpp
index 177c7074c..8143f2522 100644
--- a/Core/include/ACTS/Volumes/VolumeBounds.hpp
+++ b/Core/include/Acts/Volumes/VolumeBounds.hpp
@@ -16,8 +16,8 @@
#include <iomanip>
#include <iostream>
#include <memory>
-#include "ACTS/Utilities/BinningType.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
diff --git a/Core/src/Detector/DetachedTrackingVolume.cpp b/Core/src/Detector/DetachedTrackingVolume.cpp
index a1c8f175d..66a5c7150 100644
--- a/Core/src/Detector/DetachedTrackingVolume.cpp
+++ b/Core/src/Detector/DetachedTrackingVolume.cpp
@@ -11,9 +11,9 @@
///////////////////////////////////////////////////////////////////
// Geometry module
-#include "ACTS/Detector/DetachedTrackingVolume.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/Layers/Layer.hpp"
+#include "Acts/Detector/DetachedTrackingVolume.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/Layers/Layer.hpp"
Acts::DetachedTrackingVolume::DetachedTrackingVolume()
: m_name("undefined")
diff --git a/Core/src/Detector/GlueVolumesDescriptor.cpp b/Core/src/Detector/GlueVolumesDescriptor.cpp
index 776491920..4b3a5b4fe 100644
--- a/Core/src/Detector/GlueVolumesDescriptor.cpp
+++ b/Core/src/Detector/GlueVolumesDescriptor.cpp
@@ -10,8 +10,8 @@
// GlueVolumesDescriptor.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Detector/GlueVolumesDescriptor.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
+#include "Acts/Detector/GlueVolumesDescriptor.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
Acts::GlueVolumesDescriptor::GlueVolumesDescriptor(
const std::map<BoundarySurfaceFace,
diff --git a/Core/src/Detector/TrackingGeometry.cpp b/Core/src/Detector/TrackingGeometry.cpp
index f85b44550..fd99adb21 100644
--- a/Core/src/Detector/TrackingGeometry.cpp
+++ b/Core/src/Detector/TrackingGeometry.cpp
@@ -10,12 +10,12 @@
// TrackingGeometry.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Detector/TrackingGeometry.hpp"
-#include "ACTS/Detector/DetachedTrackingVolume.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Surfaces/PerigeeSurface.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
+#include "Acts/Detector/TrackingGeometry.hpp"
+#include "Acts/Detector/DetachedTrackingVolume.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Surfaces/PerigeeSurface.hpp"
+#include "Acts/Surfaces/Surface.hpp"
Acts::TrackingGeometry::TrackingGeometry(MutableTrackingVolumePtr highestVolume)
: m_world(highestVolume)
diff --git a/Core/src/Detector/TrackingVolume.cpp b/Core/src/Detector/TrackingVolume.cpp
index add559792..e084094c6 100644
--- a/Core/src/Detector/TrackingVolume.cpp
+++ b/Core/src/Detector/TrackingVolume.cpp
@@ -10,13 +10,13 @@
// TrackingVolume.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/Detector/DetachedTrackingVolume.hpp"
-#include "ACTS/Detector/GlueVolumesDescriptor.hpp"
-#include "ACTS/Material/Material.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Volumes/VolumeBounds.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/Detector/DetachedTrackingVolume.hpp"
+#include "Acts/Detector/GlueVolumesDescriptor.hpp"
+#include "Acts/Material/Material.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Volumes/VolumeBounds.hpp"
Acts::TrackingVolume::TrackingVolume()
: Volume()
diff --git a/Core/src/Digitization/CartesianSegmentation.cpp b/Core/src/Digitization/CartesianSegmentation.cpp
index 07e710fa5..c1f45bd43 100644
--- a/Core/src/Digitization/CartesianSegmentation.cpp
+++ b/Core/src/Digitization/CartesianSegmentation.cpp
@@ -10,10 +10,10 @@
// CartesianSegmentation.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Digitization/CartesianSegmentation.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Utilities/Helpers.hpp"
+#include "Acts/Digitization/CartesianSegmentation.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Utilities/Helpers.hpp"
Acts::CartesianSegmentation::CartesianSegmentation(
std::shared_ptr<const PlanarBounds> mBounds,
diff --git a/Core/src/Digitization/DigitizationModule.cpp b/Core/src/Digitization/DigitizationModule.cpp
index c675a7b1f..31bb955f0 100644
--- a/Core/src/Digitization/DigitizationModule.cpp
+++ b/Core/src/Digitization/DigitizationModule.cpp
@@ -10,7 +10,7 @@
// DigitizationModule.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Digitization/DigitizationModule.hpp"
+#include "Acts/Digitization/DigitizationModule.hpp"
Acts::DigitizationModule::DigitizationModule(
std::shared_ptr<const Segmentation> moduleSegmentation,
diff --git a/Core/src/Digitization/PlanarModuleStepper.cpp b/Core/src/Digitization/PlanarModuleStepper.cpp
index e32a71d76..a92f5dd52 100644
--- a/Core/src/Digitization/PlanarModuleStepper.cpp
+++ b/Core/src/Digitization/PlanarModuleStepper.cpp
@@ -10,11 +10,11 @@
// PlanarModuleStepper.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Digitization//PlanarModuleStepper.hpp"
-#include "ACTS/Digitization/DigitizationModule.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Intersection.hpp"
+#include "Acts/Digitization//PlanarModuleStepper.hpp"
+#include "Acts/Digitization/DigitizationModule.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Intersection.hpp"
Acts::PlanarModuleStepper::PlanarModuleStepper(
const Config& pmsConfig,
diff --git a/Core/src/Digitization/PolarSegmentation.cpp b/Core/src/Digitization/PolarSegmentation.cpp
index 4771fe3ac..31893d0d2 100644
--- a/Core/src/Digitization/PolarSegmentation.cpp
+++ b/Core/src/Digitization/PolarSegmentation.cpp
@@ -11,11 +11,11 @@
///////////////////////////////////////////////////////////////////
/*
-#include "ACTS/Digitization/PolarSegmentation.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/TrapezoidBounds.hpp"
-#include "ACTS/Utilities/Helpers.hpp"
+#include "Acts/Digitization/PolarSegmentation.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Utilities/Helpers.hpp"
Acts::TrapezoidSegmentation::TrapezoidSegmentation(
std::shared_ptr<const TrapezoidBounds> mBounds,
diff --git a/Core/src/EventData/NeutralParameters.cpp b/Core/src/EventData/NeutralParameters.cpp
index d5f667523..96f93a25e 100644
--- a/Core/src/EventData/NeutralParameters.cpp
+++ b/Core/src/EventData/NeutralParameters.cpp
@@ -6,7 +6,7 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#include "ACTS/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
namespace Acts {
template class SingleTrackParameters<NeutralPolicy>;
diff --git a/Core/src/EventData/TrackParameters.cpp b/Core/src/EventData/TrackParameters.cpp
index 502786d19..cedfb08df 100644
--- a/Core/src/EventData/TrackParameters.cpp
+++ b/Core/src/EventData/TrackParameters.cpp
@@ -6,7 +6,7 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#include "ACTS/EventData/TrackParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
namespace Acts {
template class SingleTrackParameters<ChargedPolicy>;
diff --git a/Core/src/EventData/TrackParametersBase.cpp b/Core/src/EventData/TrackParametersBase.cpp
index 4b7383bc7..21c371d63 100644
--- a/Core/src/EventData/TrackParametersBase.cpp
+++ b/Core/src/EventData/TrackParametersBase.cpp
@@ -10,7 +10,7 @@
#include <iomanip>
// ACTS include(s)
-#include "ACTS/EventData/TrackParametersBase.hpp"
+#include "Acts/EventData/TrackParametersBase.hpp"
namespace Acts {
std::ostream&
diff --git a/Core/src/EventData/TransportJacobian.cpp b/Core/src/EventData/TransportJacobian.cpp
index 7843959bb..bfd7329ba 100644
--- a/Core/src/EventData/TransportJacobian.cpp
+++ b/Core/src/EventData/TransportJacobian.cpp
@@ -10,7 +10,7 @@
// TransportJacobian.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/EventData/TransportJacobian.hpp"
+#include "Acts/EventData/TransportJacobian.hpp"
#include <iomanip>
#include <iostream>
diff --git a/Core/src/GeometryUtils/BinUtility.cpp b/Core/src/GeometryUtils/BinUtility.cpp
index 8f62df316..0bdd14565 100644
--- a/Core/src/GeometryUtils/BinUtility.cpp
+++ b/Core/src/GeometryUtils/BinUtility.cpp
@@ -11,7 +11,7 @@
///////////////////////////////////////////////////////////////////
// Trk
-#include "ACTS/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
// STD/STL
#include <iostream>
diff --git a/Core/src/GeometryUtils/GeometryID.cpp b/Core/src/GeometryUtils/GeometryID.cpp
index 4bd0126a9..7800ad9ce 100644
--- a/Core/src/GeometryUtils/GeometryID.cpp
+++ b/Core/src/GeometryUtils/GeometryID.cpp
@@ -10,7 +10,7 @@
// GeometryIDCalculator.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Utilities/GeometryID.hpp"
+#include "Acts/Utilities/GeometryID.hpp"
bool
Acts::operator<(const Acts::GeometryID& one, const Acts::GeometryID& two)
diff --git a/Core/src/Layers/ConeLayer.cpp b/Core/src/Layers/ConeLayer.cpp
index a1cd62ef8..d468a5dc2 100644
--- a/Core/src/Layers/ConeLayer.cpp
+++ b/Core/src/Layers/ConeLayer.cpp
@@ -10,10 +10,10 @@
// ConeLayer.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Layers/ConeLayer.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Surfaces/ConeBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Layers/ConeLayer.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Surfaces/ConeBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
Acts::ConeLayer::ConeLayer(std::shared_ptr<const Transform3D> transform,
std::shared_ptr<const ConeBounds> cbounds,
diff --git a/Core/src/Layers/CylinderLayer.cpp b/Core/src/Layers/CylinderLayer.cpp
index 2031d5371..7266194be 100644
--- a/Core/src/Layers/CylinderLayer.cpp
+++ b/Core/src/Layers/CylinderLayer.cpp
@@ -10,17 +10,17 @@
// CylinderLayer.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Layers/CylinderLayer.hpp"
-#include "ACTS/Layers/GenericApproachDescriptor.hpp"
-#include "ACTS/Material/SurfaceMaterial.hpp"
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/InstanceFactory.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Volumes/AbstractVolume.hpp"
-#include "ACTS/Volumes/BoundarySurfaceFace.hpp"
-#include "ACTS/Volumes/CylinderVolumeBounds.hpp"
+#include "Acts/Layers/CylinderLayer.hpp"
+#include "Acts/Layers/GenericApproachDescriptor.hpp"
+#include "Acts/Material/SurfaceMaterial.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/InstanceFactory.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Volumes/AbstractVolume.hpp"
+#include "Acts/Volumes/BoundarySurfaceFace.hpp"
+#include "Acts/Volumes/CylinderVolumeBounds.hpp"
Acts::CylinderLayer::CylinderLayer(
std::shared_ptr<const Transform3D> transform,
diff --git a/Core/src/Layers/DiscLayer.cpp b/Core/src/Layers/DiscLayer.cpp
index a92620377..a970ffcd8 100644
--- a/Core/src/Layers/DiscLayer.cpp
+++ b/Core/src/Layers/DiscLayer.cpp
@@ -10,18 +10,18 @@
// DiscLayer.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Layers/DiscLayer.hpp"
-#include "ACTS/Layers/GenericApproachDescriptor.hpp"
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Material/SurfaceMaterial.hpp"
-#include "ACTS/Surfaces/DiscBounds.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Volumes/AbstractVolume.hpp"
-#include "ACTS/Volumes/BoundarySurfaceFace.hpp"
-#include "ACTS/Volumes/CylinderVolumeBounds.hpp"
+#include "Acts/Layers/DiscLayer.hpp"
+#include "Acts/Layers/GenericApproachDescriptor.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Material/SurfaceMaterial.hpp"
+#include "Acts/Surfaces/DiscBounds.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Volumes/AbstractVolume.hpp"
+#include "Acts/Volumes/BoundarySurfaceFace.hpp"
+#include "Acts/Volumes/CylinderVolumeBounds.hpp"
Acts::DiscLayer::DiscLayer(std::shared_ptr<const Transform3D> transform,
std::shared_ptr<const DiscBounds> dbounds,
diff --git a/Core/src/Layers/Layer.cpp b/Core/src/Layers/Layer.cpp
index bd6c5941a..3c1cb2fc8 100644
--- a/Core/src/Layers/Layer.cpp
+++ b/Core/src/Layers/Layer.cpp
@@ -11,12 +11,12 @@
///////////////////////////////////////////////////////////////////
// Geometry module
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Material/SurfaceMaterial.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/ApproachDescriptor.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Material/SurfaceMaterial.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/ApproachDescriptor.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
Acts::Layer::Layer(std::unique_ptr<SurfaceArray> surfaceArray,
double thickness,
diff --git a/Core/src/Layers/NavigationLayer.cpp b/Core/src/Layers/NavigationLayer.cpp
index 28d25b395..5c91d9e81 100644
--- a/Core/src/Layers/NavigationLayer.cpp
+++ b/Core/src/Layers/NavigationLayer.cpp
@@ -10,10 +10,10 @@
// NavigationLayer.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Layers/NavigationLayer.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/InstanceFactory.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Layers/NavigationLayer.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/InstanceFactory.hpp"
+#include "Acts/Utilities/VariantData.hpp"
Acts::NavigationLayer::NavigationLayer(
std::unique_ptr<const Surface> surfaceRepresentation,
diff --git a/Core/src/Layers/PlaneLayer.cpp b/Core/src/Layers/PlaneLayer.cpp
index 89d460dde..b88f67dbd 100644
--- a/Core/src/Layers/PlaneLayer.cpp
+++ b/Core/src/Layers/PlaneLayer.cpp
@@ -11,11 +11,11 @@
///////////////////////////////////////////////////////////////////
// Geometry module
-#include "ACTS/Layers/PlaneLayer.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Layers/GenericApproachDescriptor.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Helpers.hpp"
+#include "Acts/Layers/PlaneLayer.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Layers/GenericApproachDescriptor.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Helpers.hpp"
Acts::PlaneLayer::PlaneLayer(std::shared_ptr<const Transform3D> transform,
std::shared_ptr<const PlanarBounds>& pbounds,
diff --git a/Core/src/Layers/ProtoLayer.cpp b/Core/src/Layers/ProtoLayer.cpp
index 80c0e87e8..4d5d9cb04 100644
--- a/Core/src/Layers/ProtoLayer.cpp
+++ b/Core/src/Layers/ProtoLayer.cpp
@@ -6,7 +6,7 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#include "ACTS/Layers/ProtoLayer.hpp"
+#include "Acts/Layers/ProtoLayer.hpp"
#include <algorithm>
namespace Acts {
diff --git a/Core/src/Material/BinnedSurfaceMaterial.cpp b/Core/src/Material/BinnedSurfaceMaterial.cpp
index 44a78ad0f..ff59e2292 100644
--- a/Core/src/Material/BinnedSurfaceMaterial.cpp
+++ b/Core/src/Material/BinnedSurfaceMaterial.cpp
@@ -10,8 +10,8 @@
// BinnedSurfaceMaterial.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Material/BinnedSurfaceMaterial.hpp"
-#include "ACTS/Material/MaterialProperties.hpp"
+#include "Acts/Material/BinnedSurfaceMaterial.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
Acts::BinnedSurfaceMaterial::BinnedSurfaceMaterial(
const BinUtility& binUtility,
diff --git a/Core/src/Material/HomogeneousSurfaceMaterial.cpp b/Core/src/Material/HomogeneousSurfaceMaterial.cpp
index 341a3fb84..312e0649f 100644
--- a/Core/src/Material/HomogeneousSurfaceMaterial.cpp
+++ b/Core/src/Material/HomogeneousSurfaceMaterial.cpp
@@ -10,8 +10,8 @@
// HomogeneousSurfaceMaterial.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Material/HomogeneousSurfaceMaterial.hpp"
-#include "ACTS/Material/MaterialProperties.hpp"
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
Acts::HomogeneousSurfaceMaterial::HomogeneousSurfaceMaterial(
const MaterialProperties& full,
diff --git a/Core/src/Material/MaterialProperties.cpp b/Core/src/Material/MaterialProperties.cpp
index 60e03eca9..91888faf1 100644
--- a/Core/src/Material/MaterialProperties.cpp
+++ b/Core/src/Material/MaterialProperties.cpp
@@ -10,7 +10,7 @@
// MaterialProperties.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Material/MaterialProperties.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
#include <climits>
Acts::MaterialProperties::MaterialProperties()
diff --git a/Core/src/Material/SurfaceMaterialProxy.cpp b/Core/src/Material/SurfaceMaterialProxy.cpp
index 9a176cb94..4cc167f2b 100644
--- a/Core/src/Material/SurfaceMaterialProxy.cpp
+++ b/Core/src/Material/SurfaceMaterialProxy.cpp
@@ -10,7 +10,7 @@
// SurfaceMaterialProxy.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Material/SurfaceMaterialProxy.hpp"
+#include "Acts/Material/SurfaceMaterialProxy.hpp"
Acts::SurfaceMaterialProxy::SurfaceMaterialProxy()
: SurfaceMaterial(), m_binUtility(nullptr)
diff --git a/Core/src/Surfaces/ConeBounds.cpp b/Core/src/Surfaces/ConeBounds.cpp
index cce0a04b4..438bbfb3b 100644
--- a/Core/src/Surfaces/ConeBounds.cpp
+++ b/Core/src/Surfaces/ConeBounds.cpp
@@ -10,15 +10,15 @@
// ConeBounds.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Surfaces/ConeBounds.hpp"
+#include "Acts/Surfaces/ConeBounds.hpp"
#include <cmath>
#include <iomanip>
#include <iostream>
#include <limits>
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Utilities/detail/periodic.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Utilities/detail/periodic.hpp"
Acts::ConeBounds::ConeBounds(double alpha,
bool symm,
diff --git a/Core/src/Surfaces/ConeSurface.cpp b/Core/src/Surfaces/ConeSurface.cpp
index a966ca34b..50f6752fa 100644
--- a/Core/src/Surfaces/ConeSurface.cpp
+++ b/Core/src/Surfaces/ConeSurface.cpp
@@ -10,16 +10,16 @@
// ConeSurface.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Surfaces/ConeSurface.hpp"
+#include "Acts/Surfaces/ConeSurface.hpp"
#include <cassert>
#include <cmath>
#include <iomanip>
#include <iostream>
-#include "ACTS/Utilities/ThrowAssert.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Utilities/detail/RealQuadraticEquation.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Utilities/detail/RealQuadraticEquation.hpp"
Acts::ConeSurface::ConeSurface(const ConeSurface& other)
: GeometryObject(), Surface(other), m_bounds(other.m_bounds)
diff --git a/Core/src/Surfaces/CylinderBounds.cpp b/Core/src/Surfaces/CylinderBounds.cpp
index 6ad646b07..9e5e9c09b 100644
--- a/Core/src/Surfaces/CylinderBounds.cpp
+++ b/Core/src/Surfaces/CylinderBounds.cpp
@@ -10,14 +10,14 @@
// CylinderBounds.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
#include <cmath>
#include <iomanip>
#include <iostream>
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Utilities/detail/periodic.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Utilities/detail/periodic.hpp"
Acts::CylinderBounds::CylinderBounds(double radius, double halfZ)
: CylinderBounds(radius, 0, M_PI, halfZ)
diff --git a/Core/src/Surfaces/CylinderSurface.cpp b/Core/src/Surfaces/CylinderSurface.cpp
index d35fd09db..6903d220f 100644
--- a/Core/src/Surfaces/CylinderSurface.cpp
+++ b/Core/src/Surfaces/CylinderSurface.cpp
@@ -10,16 +10,16 @@
// CylinderSurface.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
#include <cassert>
#include <cmath>
#include <iomanip>
#include <iostream>
-#include "ACTS/Utilities/ThrowAssert.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Utilities/detail/RealQuadraticEquation.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Utilities/detail/RealQuadraticEquation.hpp"
Acts::CylinderSurface::CylinderSurface(const CylinderSurface& other)
: GeometryObject(), Surface(other), m_bounds(other.m_bounds)
diff --git a/Core/src/Surfaces/DiamondBounds.cpp b/Core/src/Surfaces/DiamondBounds.cpp
index f0e87c7c7..47c8568f4 100644
--- a/Core/src/Surfaces/DiamondBounds.cpp
+++ b/Core/src/Surfaces/DiamondBounds.cpp
@@ -10,9 +10,9 @@
// DiamondBounds.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Surfaces/DiamondBounds.hpp"
-#include "ACTS/Utilities/ThrowAssert.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/DiamondBounds.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/VariantData.hpp"
#include <cmath>
#include <iomanip>
diff --git a/Core/src/Surfaces/DiscSurface.cpp b/Core/src/Surfaces/DiscSurface.cpp
index 7b0494456..955abb1d5 100644
--- a/Core/src/Surfaces/DiscSurface.cpp
+++ b/Core/src/Surfaces/DiscSurface.cpp
@@ -10,19 +10,19 @@
// DiscSurface.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
#include <cmath>
#include <iomanip>
#include <iostream>
-#include "ACTS/Surfaces/DiscTrapezoidalBounds.hpp"
-#include "ACTS/Surfaces/InfiniteBounds.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/InstanceFactory.hpp"
-#include "ACTS/Utilities/ThrowAssert.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/DiscTrapezoidalBounds.hpp"
+#include "Acts/Surfaces/InfiniteBounds.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/InstanceFactory.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/VariantData.hpp"
Acts::DiscSurface::DiscSurface(const DiscSurface& other)
: GeometryObject(), Surface(other), m_bounds(other.m_bounds)
diff --git a/Core/src/Surfaces/DiscTrapezoidalBounds.cpp b/Core/src/Surfaces/DiscTrapezoidalBounds.cpp
index bfa593f99..2a550c217 100644
--- a/Core/src/Surfaces/DiscTrapezoidalBounds.cpp
+++ b/Core/src/Surfaces/DiscTrapezoidalBounds.cpp
@@ -10,14 +10,14 @@
// DiscTrapezoidalBounds.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Surfaces/DiscTrapezoidalBounds.hpp"
+#include "Acts/Surfaces/DiscTrapezoidalBounds.hpp"
#include <cmath>
#include <iomanip>
#include <iostream>
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Utilities/detail/periodic.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Utilities/detail/periodic.hpp"
Acts::DiscTrapezoidalBounds::DiscTrapezoidalBounds(double minhalfx,
double maxhalfx,
diff --git a/Core/src/Surfaces/EllipseBounds.cpp b/Core/src/Surfaces/EllipseBounds.cpp
index 5c5c1074d..09f7dcbb0 100644
--- a/Core/src/Surfaces/EllipseBounds.cpp
+++ b/Core/src/Surfaces/EllipseBounds.cpp
@@ -10,14 +10,14 @@
// EllipseBounds.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Surfaces/EllipseBounds.hpp"
+#include "Acts/Surfaces/EllipseBounds.hpp"
#include <cmath>
#include <iomanip>
#include <iostream>
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Utilities/detail/periodic.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Utilities/detail/periodic.hpp"
Acts::EllipseBounds::EllipseBounds(double minRadius0,
double minRadius1,
diff --git a/Core/src/Surfaces/InfinitieBounds.cpp b/Core/src/Surfaces/InfinitieBounds.cpp
index 2d8d2e50c..c0c3d3e08 100644
--- a/Core/src/Surfaces/InfinitieBounds.cpp
+++ b/Core/src/Surfaces/InfinitieBounds.cpp
@@ -6,8 +6,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#include "ACTS/Surfaces/InfiniteBounds.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/InfiniteBounds.hpp"
+#include "Acts/Utilities/VariantData.hpp"
Acts::variant_data
Acts::InfiniteBounds::toVariantData() const
diff --git a/Core/src/Surfaces/LineBounds.cpp b/Core/src/Surfaces/LineBounds.cpp
index 019d793f2..f1764f78b 100644
--- a/Core/src/Surfaces/LineBounds.cpp
+++ b/Core/src/Surfaces/LineBounds.cpp
@@ -10,8 +10,8 @@
// LineBounds.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Surfaces/LineBounds.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/LineBounds.hpp"
+#include "Acts/Utilities/VariantData.hpp"
#include <iomanip>
#include <iostream>
diff --git a/Core/src/Surfaces/LineSurface.cpp b/Core/src/Surfaces/LineSurface.cpp
index 1d1fcc951..209bfb98c 100644
--- a/Core/src/Surfaces/LineSurface.cpp
+++ b/Core/src/Surfaces/LineSurface.cpp
@@ -10,14 +10,14 @@
// LineSurface.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Surfaces/LineSurface.hpp"
+#include "Acts/Surfaces/LineSurface.hpp"
#include <cmath>
#include <iomanip>
#include <iostream>
-#include "ACTS/Utilities/ThrowAssert.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/VariantData.hpp"
Acts::LineSurface::LineSurface(std::shared_ptr<const Transform3D> htrans,
double radius,
diff --git a/Core/src/Surfaces/PerigeeSurface.cpp b/Core/src/Surfaces/PerigeeSurface.cpp
index 61cae0e67..e885857d5 100644
--- a/Core/src/Surfaces/PerigeeSurface.cpp
+++ b/Core/src/Surfaces/PerigeeSurface.cpp
@@ -10,8 +10,8 @@
// PerigeeSurface.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Surfaces/PerigeeSurface.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/PerigeeSurface.hpp"
+#include "Acts/Utilities/VariantData.hpp"
#include <iomanip>
#include <iostream>
diff --git a/Core/src/Surfaces/PlaneSurface.cpp b/Core/src/Surfaces/PlaneSurface.cpp
index 937175fe2..a3e580109 100644
--- a/Core/src/Surfaces/PlaneSurface.cpp
+++ b/Core/src/Surfaces/PlaneSurface.cpp
@@ -10,19 +10,19 @@
// PlaneSurface.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
#include <cmath>
#include <iomanip>
#include <iostream>
-#include "ACTS/Surfaces/InfiniteBounds.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Utilities/Identifier.hpp"
-#include "ACTS/Utilities/ThrowAssert.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/InfiniteBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Utilities/Identifier.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/VariantData.hpp"
-#include "ACTS/Utilities/InstanceFactory.hpp"
+#include "Acts/Utilities/InstanceFactory.hpp"
Acts::PlaneSurface::PlaneSurface(const PlaneSurface& other)
: GeometryObject(), Surface(other), m_bounds(other.m_bounds)
diff --git a/Core/src/Surfaces/RadialBounds.cpp b/Core/src/Surfaces/RadialBounds.cpp
index 4cd8d2e04..2bf39e36e 100644
--- a/Core/src/Surfaces/RadialBounds.cpp
+++ b/Core/src/Surfaces/RadialBounds.cpp
@@ -10,14 +10,14 @@
// RadialBounds.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Surfaces/RadialBounds.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
#include <cmath>
#include <iomanip>
#include <iostream>
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Utilities/detail/periodic.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Utilities/detail/periodic.hpp"
Acts::RadialBounds::RadialBounds(double minrad, double maxrad, double hphisec)
: RadialBounds(minrad, maxrad, 0, hphisec)
diff --git a/Core/src/Surfaces/RectangleBounds.cpp b/Core/src/Surfaces/RectangleBounds.cpp
index 66e8b3bfd..cd4c0c0f1 100644
--- a/Core/src/Surfaces/RectangleBounds.cpp
+++ b/Core/src/Surfaces/RectangleBounds.cpp
@@ -10,9 +10,9 @@
// RectangleBounds.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Utilities/ThrowAssert.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/VariantData.hpp"
#include <cmath>
#include <iomanip>
diff --git a/Core/src/Surfaces/StrawSurface.cpp b/Core/src/Surfaces/StrawSurface.cpp
index fabec1b23..bea3f2e48 100644
--- a/Core/src/Surfaces/StrawSurface.cpp
+++ b/Core/src/Surfaces/StrawSurface.cpp
@@ -10,14 +10,14 @@
// StrawSurface.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Surfaces/StrawSurface.hpp"
+#include "Acts/Surfaces/StrawSurface.hpp"
#include <iomanip>
#include <iostream>
-#include "ACTS/Surfaces/InfiniteBounds.hpp"
-#include "ACTS/Utilities/Identifier.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/InfiniteBounds.hpp"
+#include "Acts/Utilities/Identifier.hpp"
+#include "Acts/Utilities/VariantData.hpp"
Acts::StrawSurface::StrawSurface(std::shared_ptr<const Transform3D> htrans,
double radius,
diff --git a/Core/src/Surfaces/Surface.cpp b/Core/src/Surfaces/Surface.cpp
index c755b6dba..f887ecb24 100644
--- a/Core/src/Surfaces/Surface.cpp
+++ b/Core/src/Surfaces/Surface.cpp
@@ -10,7 +10,7 @@
// Surface.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Surfaces/Surface.hpp"
+#include "Acts/Surfaces/Surface.hpp"
#include <iomanip>
#include <iostream>
diff --git a/Core/src/Surfaces/SurfaceArray.cpp b/Core/src/Surfaces/SurfaceArray.cpp
index 880e96c89..1c8077858 100644
--- a/Core/src/Surfaces/SurfaceArray.cpp
+++ b/Core/src/Surfaces/SurfaceArray.cpp
@@ -6,12 +6,12 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#include "ACTS/Surfaces/SurfaceArray.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/InstanceFactory.hpp"
-#include "ACTS/Utilities/ThrowAssert.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/SurfaceArray.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/InstanceFactory.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/VariantData.hpp"
// implementation for pure virtual destructor of ISurfaceGridLookup
Acts::SurfaceArray::ISurfaceGridLookup::~ISurfaceGridLookup()
diff --git a/Core/src/Surfaces/TrapezoidBounds.cpp b/Core/src/Surfaces/TrapezoidBounds.cpp
index 1e30ef0a8..a664b9909 100644
--- a/Core/src/Surfaces/TrapezoidBounds.cpp
+++ b/Core/src/Surfaces/TrapezoidBounds.cpp
@@ -10,12 +10,12 @@
// TrapezoidBounds.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
#include <cmath>
#include <iomanip>
#include <iostream>
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Utilities/VariantData.hpp"
Acts::TrapezoidBounds::TrapezoidBounds(double minhalex,
double maxhalex,
diff --git a/Core/src/Surfaces/TriangleBounds.cpp b/Core/src/Surfaces/TriangleBounds.cpp
index e8c66df31..846bae3e1 100644
--- a/Core/src/Surfaces/TriangleBounds.cpp
+++ b/Core/src/Surfaces/TriangleBounds.cpp
@@ -10,8 +10,8 @@
// TriangleBounds.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Surfaces/TriangleBounds.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/TriangleBounds.hpp"
+#include "Acts/Utilities/VariantData.hpp"
#include <iomanip>
#include <iostream>
diff --git a/Core/src/Tools/CylinderVolumeBuilder.cpp b/Core/src/Tools/CylinderVolumeBuilder.cpp
index 593a2803e..f4abbea26 100644
--- a/Core/src/Tools/CylinderVolumeBuilder.cpp
+++ b/Core/src/Tools/CylinderVolumeBuilder.cpp
@@ -10,15 +10,15 @@
// CylinderVolumeBuilder.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Tools/CylinderVolumeBuilder.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/Layers/CylinderLayer.hpp"
-#include "ACTS/Layers/DiscLayer.hpp"
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Tools/ITrackingVolumeHelper.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Volumes/CylinderVolumeBounds.hpp"
+#include "Acts/Tools/CylinderVolumeBuilder.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/Layers/CylinderLayer.hpp"
+#include "Acts/Layers/DiscLayer.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Tools/ITrackingVolumeHelper.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Volumes/CylinderVolumeBounds.hpp"
Acts::CylinderVolumeBuilder::CylinderVolumeBuilder(
const Acts::CylinderVolumeBuilder::Config& cvbConfig,
diff --git a/Core/src/Tools/CylinderVolumeHelper.cpp b/Core/src/Tools/CylinderVolumeHelper.cpp
index 5c162667c..4b201bc3c 100644
--- a/Core/src/Tools/CylinderVolumeHelper.cpp
+++ b/Core/src/Tools/CylinderVolumeHelper.cpp
@@ -10,23 +10,23 @@
// CylinderVolumeHelper.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Tools/CylinderVolumeHelper.hpp"
+#include "Acts/Tools/CylinderVolumeHelper.hpp"
#include <cmath>
-#include "ACTS/Detector/GlueVolumesDescriptor.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/Layers/CylinderLayer.hpp"
-#include "ACTS/Layers/DiscLayer.hpp"
-#include "ACTS/Material/BinnedSurfaceMaterial.hpp"
-#include "ACTS/Material/Material.hpp"
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Tools/ILayerArrayCreator.hpp"
-#include "ACTS/Tools/ITrackingVolumeArrayCreator.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Volumes/AbstractVolume.hpp"
-#include "ACTS/Volumes/BoundarySurfaceT.hpp"
-#include "ACTS/Volumes/CylinderVolumeBounds.hpp"
+#include "Acts/Detector/GlueVolumesDescriptor.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/Layers/CylinderLayer.hpp"
+#include "Acts/Layers/DiscLayer.hpp"
+#include "Acts/Material/BinnedSurfaceMaterial.hpp"
+#include "Acts/Material/Material.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Tools/ILayerArrayCreator.hpp"
+#include "Acts/Tools/ITrackingVolumeArrayCreator.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Volumes/AbstractVolume.hpp"
+#include "Acts/Volumes/BoundarySurfaceT.hpp"
+#include "Acts/Volumes/CylinderVolumeBounds.hpp"
Acts::CylinderVolumeHelper::CylinderVolumeHelper(
const Acts::CylinderVolumeHelper::Config& cvhConfig,
diff --git a/Core/src/Tools/LayerArrayCreator.cpp b/Core/src/Tools/LayerArrayCreator.cpp
index 82b03ecf4..33368dd79 100644
--- a/Core/src/Tools/LayerArrayCreator.cpp
+++ b/Core/src/Tools/LayerArrayCreator.cpp
@@ -10,22 +10,22 @@
// LayerArrayCreator.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Tools/LayerArrayCreator.hpp"
+#include "Acts/Tools/LayerArrayCreator.hpp"
#include <cmath>
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Layers/NavigationLayer.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Surfaces/DiscBounds.hpp"
-#include "ACTS/Surfaces/DiscSurface.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/SurfaceBounds.hpp"
-#include "ACTS/Surfaces/TrapezoidBounds.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/BinnedArrayXD.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometryObjectSorter.hpp"
-#include "ACTS/Utilities/GeometryStatics.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Layers/NavigationLayer.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/DiscBounds.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/SurfaceBounds.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/BinnedArrayXD.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometryObjectSorter.hpp"
+#include "Acts/Utilities/GeometryStatics.hpp"
std::unique_ptr<const Acts::LayerArray>
Acts::LayerArrayCreator::layerArray(const LayerVector& layersInput,
diff --git a/Core/src/Tools/LayerCreator.cpp b/Core/src/Tools/LayerCreator.cpp
index 4c8cac559..6cd6d6511 100644
--- a/Core/src/Tools/LayerCreator.cpp
+++ b/Core/src/Tools/LayerCreator.cpp
@@ -10,17 +10,17 @@
// LayerCreator.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Tools/LayerCreator.hpp"
+#include "Acts/Tools/LayerCreator.hpp"
#include <cmath>
#include <set>
-#include "ACTS/Layers/CylinderLayer.hpp"
-#include "ACTS/Layers/DiscLayer.hpp"
-#include "ACTS/Layers/ProtoLayer.hpp"
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Layers/CylinderLayer.hpp"
+#include "Acts/Layers/DiscLayer.hpp"
+#include "Acts/Layers/ProtoLayer.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
Acts::LayerCreator::LayerCreator(const Acts::LayerCreator::Config& lcConfig,
std::unique_ptr<const Logger> logger)
diff --git a/Core/src/Tools/PassiveLayerBuilder.cpp b/Core/src/Tools/PassiveLayerBuilder.cpp
index ea7663e70..ed745cf0a 100644
--- a/Core/src/Tools/PassiveLayerBuilder.cpp
+++ b/Core/src/Tools/PassiveLayerBuilder.cpp
@@ -10,14 +10,14 @@
// PassiveLayerBuilder.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Tools/PassiveLayerBuilder.hpp"
-#include "ACTS/Layers/CylinderLayer.hpp"
-#include "ACTS/Layers/DiscLayer.hpp"
-#include "ACTS/Material/HomogeneousSurfaceMaterial.hpp"
-#include "ACTS/Material/MaterialProperties.hpp"
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Tools/PassiveLayerBuilder.hpp"
+#include "Acts/Layers/CylinderLayer.hpp"
+#include "Acts/Layers/DiscLayer.hpp"
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
Acts::PassiveLayerBuilder::PassiveLayerBuilder(
const PassiveLayerBuilder::Config& plConfig,
diff --git a/Core/src/Tools/SurfaceArrayCreator.cpp b/Core/src/Tools/SurfaceArrayCreator.cpp
index 4f1e32839..d9ea9ed5d 100644
--- a/Core/src/Tools/SurfaceArrayCreator.cpp
+++ b/Core/src/Tools/SurfaceArrayCreator.cpp
@@ -10,17 +10,17 @@
// SurfaceArrayCreator.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
#include <algorithm>
#include <cmath>
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Surfaces/SurfaceArray.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/BinnedArrayXD.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Units.hpp"
-#include "ACTS/Utilities/detail/Axis.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Surfaces/SurfaceArray.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/BinnedArrayXD.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
+#include "Acts/Utilities/detail/Axis.hpp"
std::unique_ptr<Acts::SurfaceArray>
Acts::SurfaceArrayCreator::surfaceArrayOnCylinder(
diff --git a/Core/src/Tools/TrackingGeometryBuilder.cpp b/Core/src/Tools/TrackingGeometryBuilder.cpp
index 6369077e4..807262748 100644
--- a/Core/src/Tools/TrackingGeometryBuilder.cpp
+++ b/Core/src/Tools/TrackingGeometryBuilder.cpp
@@ -10,12 +10,12 @@
// TrackingGeometryBuilder.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Tools/TrackingGeometryBuilder.hpp"
-#include "ACTS/Detector/TrackingGeometry.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/Tools/ITrackingVolumeBuilder.hpp"
-#include "ACTS/Tools/ITrackingVolumeHelper.hpp"
-#include "ACTS/Volumes/CylinderVolumeBounds.hpp"
+#include "Acts/Tools/TrackingGeometryBuilder.hpp"
+#include "Acts/Detector/TrackingGeometry.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/Tools/ITrackingVolumeBuilder.hpp"
+#include "Acts/Tools/ITrackingVolumeHelper.hpp"
+#include "Acts/Volumes/CylinderVolumeBounds.hpp"
Acts::TrackingGeometryBuilder::TrackingGeometryBuilder(
const Acts::TrackingGeometryBuilder::Config& cgbConfig,
diff --git a/Core/src/Tools/TrackingVolumeArrayCreator.cpp b/Core/src/Tools/TrackingVolumeArrayCreator.cpp
index f78d6b769..86050b13d 100644
--- a/Core/src/Tools/TrackingVolumeArrayCreator.cpp
+++ b/Core/src/Tools/TrackingVolumeArrayCreator.cpp
@@ -10,13 +10,13 @@
// TrackingVolumeArrayCreator.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Tools/TrackingVolumeArrayCreator.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/BinnedArrayXD.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometryObjectSorter.hpp"
-#include "ACTS/Volumes/VolumeBounds.hpp"
+#include "Acts/Tools/TrackingVolumeArrayCreator.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/BinnedArrayXD.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometryObjectSorter.hpp"
+#include "Acts/Volumes/VolumeBounds.hpp"
std::shared_ptr<const Acts::TrackingVolumeArray>
Acts::TrackingVolumeArrayCreator::trackingVolumeArray(
diff --git a/Core/src/Utilities/BFieldMapUtils.cpp b/Core/src/Utilities/BFieldMapUtils.cpp
index c5849a4b9..68760bc2f 100644
--- a/Core/src/Utilities/BFieldMapUtils.cpp
+++ b/Core/src/Utilities/BFieldMapUtils.cpp
@@ -6,10 +6,10 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#include "ACTS/Utilities/BFieldMapUtils.hpp"
+#include "Acts/Utilities/BFieldMapUtils.hpp"
#include <iostream>
-#include "ACTS/Utilities/detail/Axis.hpp"
-#include "ACTS/Utilities/detail/Grid.hpp"
+#include "Acts/Utilities/detail/Axis.hpp"
+#include "Acts/Utilities/detail/Grid.hpp"
Acts::InterpolatedBFieldMap::FieldMapper<2, 2> Acts::fieldMapperRZ(
std::function<size_t(std::array<size_t, 2> binsRZ,
diff --git a/Core/src/Utilities/Logger.cpp b/Core/src/Utilities/Logger.cpp
index 8e6374e3e..a212ae24f 100644
--- a/Core/src/Utilities/Logger.cpp
+++ b/Core/src/Utilities/Logger.cpp
@@ -6,7 +6,7 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/Utilities/Logger.hpp"
namespace Acts {
diff --git a/Core/src/Utilities/MaterialInteraction.cpp b/Core/src/Utilities/MaterialInteraction.cpp
index 48cba3413..e29b9994a 100644
--- a/Core/src/Utilities/MaterialInteraction.cpp
+++ b/Core/src/Utilities/MaterialInteraction.cpp
@@ -6,7 +6,7 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#include "ACTS/Utilities/MaterialInteraction.hpp"
+#include "Acts/Utilities/MaterialInteraction.hpp"
namespace Acts {
diff --git a/Core/src/Utilities/Units.cpp b/Core/src/Utilities/Units.cpp
index c8982f2e2..bde5296f6 100644
--- a/Core/src/Utilities/Units.cpp
+++ b/Core/src/Utilities/Units.cpp
@@ -6,7 +6,7 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Utilities/Units.hpp"
namespace Acts {
diff --git a/Core/src/Volumes/AbstractVolume.cpp b/Core/src/Volumes/AbstractVolume.cpp
index 3f53de7d1..ea1a4f660 100644
--- a/Core/src/Volumes/AbstractVolume.cpp
+++ b/Core/src/Volumes/AbstractVolume.cpp
@@ -10,11 +10,11 @@
// AbstractVolume.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Volumes/AbstractVolume.hpp"
+#include "Acts/Volumes/AbstractVolume.hpp"
#include <iostream>
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Volumes/BoundarySurfaceT.hpp"
-#include "ACTS/Volumes/VolumeBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Volumes/BoundarySurfaceT.hpp"
+#include "Acts/Volumes/VolumeBounds.hpp"
Acts::AbstractVolume::AbstractVolume(
std::shared_ptr<const Transform3D> htrans,
diff --git a/Core/src/Volumes/CuboidVolumeBounds.cpp b/Core/src/Volumes/CuboidVolumeBounds.cpp
index 767d826a0..72e595345 100644
--- a/Core/src/Volumes/CuboidVolumeBounds.cpp
+++ b/Core/src/Volumes/CuboidVolumeBounds.cpp
@@ -10,12 +10,12 @@
// CuboidVolumeBounds.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Volumes/CuboidVolumeBounds.hpp"
+#include "Acts/Volumes/CuboidVolumeBounds.hpp"
#include <cmath>
#include <iostream>
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
Acts::CuboidVolumeBounds::CuboidVolumeBounds()
: VolumeBounds(), m_valueStore(bv_length, 0.)
diff --git a/Core/src/Volumes/CylinderVolumeBounds.cpp b/Core/src/Volumes/CylinderVolumeBounds.cpp
index 8844aee7c..9672c504a 100644
--- a/Core/src/Volumes/CylinderVolumeBounds.cpp
+++ b/Core/src/Volumes/CylinderVolumeBounds.cpp
@@ -10,15 +10,15 @@
// CylinderVolumeBounds.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Volumes/CylinderVolumeBounds.hpp"
+#include "Acts/Volumes/CylinderVolumeBounds.hpp"
#include <cmath>
#include <iostream>
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Surfaces/DiscSurface.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
const double Acts::CylinderVolumeBounds::s_numericalStable = 10e-2;
diff --git a/Core/src/Volumes/DoubleTrapezoidVolumeBounds.cpp b/Core/src/Volumes/DoubleTrapezoidVolumeBounds.cpp
index 900b296ae..a357476db 100644
--- a/Core/src/Volumes/DoubleTrapezoidVolumeBounds.cpp
+++ b/Core/src/Volumes/DoubleTrapezoidVolumeBounds.cpp
@@ -10,13 +10,13 @@
// DoubleTrapezoidVolumeBounds.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Volumes/DoubleTrapezoidVolumeBounds.hpp"
+#include "Acts/Volumes/DoubleTrapezoidVolumeBounds.hpp"
#include <cmath>
#include <iomanip>
#include <iostream>
-#include "ACTS/Surfaces/DiamondBounds.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/DiamondBounds.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
Acts::DoubleTrapezoidVolumeBounds::DoubleTrapezoidVolumeBounds()
: VolumeBounds(), m_valueStore(bv_length, 0.)
diff --git a/Core/src/Volumes/TrapezoidVolumeBounds.cpp b/Core/src/Volumes/TrapezoidVolumeBounds.cpp
index 0c37ea1df..551f70d7f 100644
--- a/Core/src/Volumes/TrapezoidVolumeBounds.cpp
+++ b/Core/src/Volumes/TrapezoidVolumeBounds.cpp
@@ -10,14 +10,14 @@
// TrapezoidVolumeBounds.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Volumes/TrapezoidVolumeBounds.hpp"
+#include "Acts/Volumes/TrapezoidVolumeBounds.hpp"
#include <cmath>
#include <iomanip>
#include <iostream>
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/TrapezoidBounds.hpp"
-#include "ACTS/Utilities/GeometryStatics.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Utilities/GeometryStatics.hpp"
Acts::TrapezoidVolumeBounds::TrapezoidVolumeBounds()
: VolumeBounds(), m_valueStore(bv_length, 0.)
diff --git a/Core/src/Volumes/Volume.cpp b/Core/src/Volumes/Volume.cpp
index 435f8b9de..b2e2e0b88 100644
--- a/Core/src/Volumes/Volume.cpp
+++ b/Core/src/Volumes/Volume.cpp
@@ -10,9 +10,9 @@
// Volume.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Volumes/Volume.hpp"
+#include "Acts/Volumes/Volume.hpp"
#include <iostream>
-#include "ACTS/Volumes/VolumeBounds.hpp"
+#include "Acts/Volumes/VolumeBounds.hpp"
Acts::Volume::Volume()
: GeometryObject()
diff --git a/Core/src/Volumes/VolumeBounds.cpp b/Core/src/Volumes/VolumeBounds.cpp
index 2827728fb..d8d0eb111 100644
--- a/Core/src/Volumes/VolumeBounds.cpp
+++ b/Core/src/Volumes/VolumeBounds.cpp
@@ -10,7 +10,7 @@
// VolumeBounds.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Volumes/VolumeBounds.hpp"
+#include "Acts/Volumes/VolumeBounds.hpp"
/**Overload of << operator for std::ostream for debug output*/
std::ostream&
diff --git a/Examples/src/CustomDefaultLogger.cpp b/Examples/src/CustomDefaultLogger.cpp
index bde2f1a4c..7df33c993 100644
--- a/Examples/src/CustomDefaultLogger.cpp
+++ b/Examples/src/CustomDefaultLogger.cpp
@@ -8,7 +8,7 @@
#include <algorithm>
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/Utilities/Logger.hpp"
namespace Acts {
diff --git a/IntegrationTests/ATLSeedingIntegrationTest.cpp b/IntegrationTests/ATLSeedingIntegrationTest.cpp
index 3ffbd206a..e5ace5c32 100644
--- a/IntegrationTests/ATLSeedingIntegrationTest.cpp
+++ b/IntegrationTests/ATLSeedingIntegrationTest.cpp
@@ -7,7 +7,7 @@
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include <algorithm>
-#include "ACTS/Seeding/ATL_Seedmaker.hpp"
+#include "Acts/Seeding/ATL_Seedmaker.hpp"
#define BOOST_TEST_MODULE SeedmakerIntegrationTest
#include <boost/test/included/unit_test.hpp>
diff --git a/IntegrationTests/PropagationTests.cpp b/IntegrationTests/PropagationTests.cpp
index 07952b280..7e608d961 100644
--- a/IntegrationTests/PropagationTests.cpp
+++ b/IntegrationTests/PropagationTests.cpp
@@ -16,20 +16,20 @@
#include <cmath>
#include <boost/test/data/test_case.hpp>
-#include "ACTS/ACTSVersion.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/RungeKuttaEngine.hpp"
-#include "ACTS/Extrapolation/Wrapper.hpp"
-#include "ACTS/MagneticField/ConstantBField.hpp"
-#include "ACTS/Propagator/AtlasStepper.hpp"
-#include "ACTS/Propagator/EigenStepper.hpp"
-#include "ACTS/Propagator/Propagator.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Surfaces/DiscSurface.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/StrawSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/ActsVersion.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/RungeKuttaEngine.hpp"
+#include "Acts/Extrapolation/Wrapper.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/Propagator/AtlasStepper.hpp"
+#include "Acts/Propagator/EigenStepper.hpp"
+#include "Acts/Propagator/Propagator.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/StrawSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
#include "PropagationTestHelper.hpp"
namespace bdata = boost::unit_test::data;
diff --git a/IntegrationTests/PropagationTestsAtlasField.cpp b/IntegrationTests/PropagationTestsAtlasField.cpp
index ba7525762..ca07a07b9 100644
--- a/IntegrationTests/PropagationTestsAtlasField.cpp
+++ b/IntegrationTests/PropagationTestsAtlasField.cpp
@@ -13,24 +13,24 @@
// leave blank
#include <boost/test/data/test_case.hpp>
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/RungeKuttaEngine.hpp"
-#include "ACTS/Extrapolation/Wrapper.hpp"
-#include "ACTS/MagneticField/InterpolatedBFieldMap.hpp"
-#include "ACTS/MagneticField/SharedBFieldMap.hpp"
-#include "ACTS/MagneticField/concept/AnyFieldLookup.hpp"
-#include "ACTS/Propagator/AtlasStepper.hpp"
-#include "ACTS/Propagator/EigenStepper.hpp"
-#include "ACTS/Propagator/Propagator.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Surfaces/DiscSurface.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/StrawSurface.hpp"
-#include "ACTS/Utilities/BFieldMapUtils.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Units.hpp"
-#include "ACTS/Utilities/detail/Axis.hpp"
-#include "ACTS/Utilities/detail/Grid.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/RungeKuttaEngine.hpp"
+#include "Acts/Extrapolation/Wrapper.hpp"
+#include "Acts/MagneticField/InterpolatedBFieldMap.hpp"
+#include "Acts/MagneticField/SharedBFieldMap.hpp"
+#include "Acts/MagneticField/concept/AnyFieldLookup.hpp"
+#include "Acts/Propagator/AtlasStepper.hpp"
+#include "Acts/Propagator/EigenStepper.hpp"
+#include "Acts/Propagator/Propagator.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/StrawSurface.hpp"
+#include "Acts/Utilities/BFieldMapUtils.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
+#include "Acts/Utilities/detail/Axis.hpp"
+#include "Acts/Utilities/detail/Grid.hpp"
#include "PropagationTestHelper.hpp"
namespace bdata = boost::unit_test::data;
diff --git a/IntegrationTests/covariance_validation_fixture.hpp b/IntegrationTests/covariance_validation_fixture.hpp
index 7a82fab8f..6a8f40315 100644
--- a/IntegrationTests/covariance_validation_fixture.hpp
+++ b/IntegrationTests/covariance_validation_fixture.hpp
@@ -10,9 +10,9 @@
#define ACTS_COVARIANCE_VALIDATION_FIXTURE_HPP 1
#include <array>
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/Surface.hpp"
namespace Acts {
diff --git a/Legacy/include/ACTS/Extrapolation/ExtrapolationCell.hpp b/Legacy/include/Acts/Extrapolation/ExtrapolationCell.hpp
similarity index 98%
rename from Legacy/include/ACTS/Extrapolation/ExtrapolationCell.hpp
rename to Legacy/include/Acts/Extrapolation/ExtrapolationCell.hpp
index f4bb1d5ab..968c70d9f 100644
--- a/Legacy/include/ACTS/Extrapolation/ExtrapolationCell.hpp
+++ b/Legacy/include/Acts/Extrapolation/ExtrapolationCell.hpp
@@ -13,13 +13,13 @@
#ifndef ACTS_EXTRAPOLATIONUTILS_EXTRAPOLATIONCELL_H
#define ACTS_EXTRAPOLATIONUTILS_EXTRAPOLATIONCELL_H 1
-#include "ACTS/EventData/ParticleDefinitions.hpp"
-#include "ACTS/EventData/TransportJacobian.hpp"
-#include "ACTS/Extrapolation/MaterialUpdateMode.hpp"
-#include "ACTS/Material/MaterialProperties.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometrySignature.hpp"
+#include "Acts/EventData/ParticleDefinitions.hpp"
+#include "Acts/EventData/TransportJacobian.hpp"
+#include "Acts/Extrapolation/MaterialUpdateMode.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometrySignature.hpp"
#ifndef ACTS_EXTRAPOLATIONUTILSS_CHECKPATHMACRO
#define ACTS_EXTRAPOLATIONUTILSS_CHECKPATHMACRO 1
@@ -603,6 +603,6 @@ public:
};
} // end of namespace
-#include "ACTS/Extrapolation/detail/ExtrapolationCell.ipp"
+#include "Acts/Extrapolation/detail/ExtrapolationCell.ipp"
#endif // TRKEXUTILS_SOLUTIONSELECTOR_H
diff --git a/Legacy/include/ACTS/Extrapolation/ExtrapolationEngine.hpp b/Legacy/include/Acts/Extrapolation/ExtrapolationEngine.hpp
similarity index 92%
rename from Legacy/include/ACTS/Extrapolation/ExtrapolationEngine.hpp
rename to Legacy/include/Acts/Extrapolation/ExtrapolationEngine.hpp
index 499823b6f..f747a110f 100644
--- a/Legacy/include/ACTS/Extrapolation/ExtrapolationEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/ExtrapolationEngine.hpp
@@ -13,14 +13,14 @@
#ifndef ACTS_EXTRAPOLATION_EXTRAPOLATIONENGINE_H
#define ACTS_EXTRAPOLATION_EXTRAPOLATIONENGINE_H 1
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
-#include "ACTS/Extrapolation/IExtrapolationEngine.hpp"
-#include "ACTS/Extrapolation/INavigationEngine.hpp"
-#include "ACTS/Extrapolation/IPropagationEngine.hpp"
-#include "ACTS/Extrapolation/detail/ExtrapolationMacros.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Extrapolation/IExtrapolationEngine.hpp"
+#include "Acts/Extrapolation/INavigationEngine.hpp"
+#include "Acts/Extrapolation/IPropagationEngine.hpp"
+#include "Acts/Extrapolation/detail/ExtrapolationMacros.hpp"
+#include "Acts/Utilities/Logger.hpp"
namespace Acts {
@@ -192,6 +192,6 @@ ExtrapolationEngine::getConfiguration() const
} // end of namespace
-#include "ACTS/Extrapolation/detail/ExtrapolationEngine.ipp"
+#include "Acts/Extrapolation/detail/ExtrapolationEngine.ipp"
#endif // ACTS_EXTRAPOLATION_EXTRAPOLATIONENGINE_H
diff --git a/Legacy/include/ACTS/Extrapolation/IExtrapolationEngine.hpp b/Legacy/include/Acts/Extrapolation/IExtrapolationEngine.hpp
similarity index 92%
rename from Legacy/include/ACTS/Extrapolation/IExtrapolationEngine.hpp
rename to Legacy/include/Acts/Extrapolation/IExtrapolationEngine.hpp
index fc0b9945e..38606de1e 100644
--- a/Legacy/include/ACTS/Extrapolation/IExtrapolationEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/IExtrapolationEngine.hpp
@@ -13,10 +13,10 @@
#ifndef ACTS_EXTRAPOLATION_IEXTRAPOLATIONENGINE_H
#define ACTS_EXTRAPOLATION_IEXTRAPOLATIONENGINE_H 1
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
-#include "ACTS/Utilities/GeometrySignature.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Utilities/GeometrySignature.hpp"
namespace Acts {
diff --git a/Legacy/include/ACTS/Extrapolation/IMaterialEffectsEngine.hpp b/Legacy/include/Acts/Extrapolation/IMaterialEffectsEngine.hpp
similarity index 91%
rename from Legacy/include/ACTS/Extrapolation/IMaterialEffectsEngine.hpp
rename to Legacy/include/Acts/Extrapolation/IMaterialEffectsEngine.hpp
index 0a1ee4f01..72295f091 100644
--- a/Legacy/include/ACTS/Extrapolation/IMaterialEffectsEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/IMaterialEffectsEngine.hpp
@@ -13,11 +13,11 @@
#ifndef ACTS_EXTRAPOLATION_IMATERIALEFFECTSENGINE_H
#define ACTS_EXTRAPOLATION_IMATERIALEFFECTSENGINE_H 1
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
-#include "ACTS/Extrapolation/MaterialUpdateMode.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Extrapolation/MaterialUpdateMode.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
diff --git a/Legacy/include/ACTS/Extrapolation/IMultipleScatteringUpdator.hpp b/Legacy/include/Acts/Extrapolation/IMultipleScatteringUpdator.hpp
similarity index 96%
rename from Legacy/include/ACTS/Extrapolation/IMultipleScatteringUpdator.hpp
rename to Legacy/include/Acts/Extrapolation/IMultipleScatteringUpdator.hpp
index d8d5f857e..08c813aa3 100644
--- a/Legacy/include/ACTS/Extrapolation/IMultipleScatteringUpdator.hpp
+++ b/Legacy/include/Acts/Extrapolation/IMultipleScatteringUpdator.hpp
@@ -13,7 +13,7 @@
#ifndef ACTS_EXTRAPOLATIONIN_IMULTIPLESCATTERINGUPDATOR_H
#define ACTS_EXTRAPOLATIONIN_IMULTIPLESCATTERINGUPDATOR_H 1
-#include "ACTS/EventData/ParticleDefinitions.hpp"
+#include "Acts/EventData/ParticleDefinitions.hpp"
namespace Acts {
diff --git a/Legacy/include/ACTS/Extrapolation/INavigationEngine.hpp b/Legacy/include/Acts/Extrapolation/INavigationEngine.hpp
similarity index 95%
rename from Legacy/include/ACTS/Extrapolation/INavigationEngine.hpp
rename to Legacy/include/Acts/Extrapolation/INavigationEngine.hpp
index b57b82f10..b900d2c2a 100644
--- a/Legacy/include/ACTS/Extrapolation/INavigationEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/INavigationEngine.hpp
@@ -13,9 +13,9 @@
#ifndef ACTS_EXTRAPOLATION_INAVIGATIONENGINE_H
#define ACTS_EXTRAPOLATION_INAVIGATIONENGINE_H
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
namespace Acts {
diff --git a/Legacy/include/ACTS/Extrapolation/IPropagationEngine.hpp b/Legacy/include/Acts/Extrapolation/IPropagationEngine.hpp
similarity index 96%
rename from Legacy/include/ACTS/Extrapolation/IPropagationEngine.hpp
rename to Legacy/include/Acts/Extrapolation/IPropagationEngine.hpp
index 55e05269f..f334833fc 100644
--- a/Legacy/include/ACTS/Extrapolation/IPropagationEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/IPropagationEngine.hpp
@@ -13,9 +13,9 @@
#ifndef ACTS_EXTRAPOLATION_IPROPAGATIONENGINE_H
#define ACTS_EXTRAPOLATION_IPROPAGATIONENGINE_H 1
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
namespace Acts {
diff --git a/Legacy/include/ACTS/Extrapolation/MaterialEffectsEngine.hpp b/Legacy/include/Acts/Extrapolation/MaterialEffectsEngine.hpp
similarity index 92%
rename from Legacy/include/ACTS/Extrapolation/MaterialEffectsEngine.hpp
rename to Legacy/include/Acts/Extrapolation/MaterialEffectsEngine.hpp
index 0630affd6..4e46188c6 100644
--- a/Legacy/include/ACTS/Extrapolation/MaterialEffectsEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/MaterialEffectsEngine.hpp
@@ -13,14 +13,14 @@
#ifndef ACTS_EXTRAPOLATION_MATERIALEFFECTSENGINE_H
#define ACTS_EXTRAPOLATION_MATERIALEFFECTSENGINE_H 1
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
-#include "ACTS/Extrapolation/IMaterialEffectsEngine.hpp"
-#include "ACTS/Extrapolation/MaterialUpdateMode.hpp"
-#include "ACTS/Extrapolation/detail/ExtrapolationMacros.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Extrapolation/IMaterialEffectsEngine.hpp"
+#include "Acts/Extrapolation/MaterialUpdateMode.hpp"
+#include "Acts/Extrapolation/detail/ExtrapolationMacros.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Logger.hpp"
namespace Acts {
diff --git a/Legacy/include/ACTS/Extrapolation/MaterialUpdateMode.hpp b/Legacy/include/Acts/Extrapolation/MaterialUpdateMode.hpp
similarity index 100%
rename from Legacy/include/ACTS/Extrapolation/MaterialUpdateMode.hpp
rename to Legacy/include/Acts/Extrapolation/MaterialUpdateMode.hpp
diff --git a/Legacy/include/ACTS/Extrapolation/RungeKuttaEngine.hpp b/Legacy/include/Acts/Extrapolation/RungeKuttaEngine.hpp
similarity index 95%
rename from Legacy/include/ACTS/Extrapolation/RungeKuttaEngine.hpp
rename to Legacy/include/Acts/Extrapolation/RungeKuttaEngine.hpp
index 180a6ea5c..299b3c9d2 100644
--- a/Legacy/include/ACTS/Extrapolation/RungeKuttaEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/RungeKuttaEngine.hpp
@@ -13,19 +13,19 @@
#ifndef ACTS_EXTRAPOLATION_RUNGEKUTAENGINE_H
#define ACTS_EXTRAPOLATION_RUNGEKUTAENGINE_H 1
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
-#include "ACTS/Extrapolation/IPropagationEngine.hpp"
-#include "ACTS/Extrapolation/detail/ExtrapolationMacros.hpp"
-#include "ACTS/Extrapolation/detail/RungeKuttaUtils.hpp"
-#include "ACTS/MagneticField/ConstantBField.hpp"
-#include "ACTS/Surfaces/BoundaryCheck.hpp"
-#include "ACTS/Surfaces/ConeSurface.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Extrapolation/IPropagationEngine.hpp"
+#include "Acts/Extrapolation/detail/ExtrapolationMacros.hpp"
+#include "Acts/Extrapolation/detail/RungeKuttaUtils.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/Surfaces/BoundaryCheck.hpp"
+#include "Acts/Surfaces/ConeSurface.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Logger.hpp"
namespace Acts {
@@ -385,6 +385,6 @@ private:
////////////////////////////////////////////////////////////////////////////////
// Templated method
////////////////////////////////////////////////////////////////////////////////
-#include "ACTS/Extrapolation/detail/RungeKuttaEngine.ipp"
+#include "Acts/Extrapolation/detail/RungeKuttaEngine.ipp"
#endif // ACTS_EXTRAPOLATION_RUNGEKUTAENGINE_H
diff --git a/Legacy/include/ACTS/Extrapolation/StaticEngine.hpp b/Legacy/include/Acts/Extrapolation/StaticEngine.hpp
similarity index 93%
rename from Legacy/include/ACTS/Extrapolation/StaticEngine.hpp
rename to Legacy/include/Acts/Extrapolation/StaticEngine.hpp
index 5b8479f44..4051551cb 100644
--- a/Legacy/include/ACTS/Extrapolation/StaticEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/StaticEngine.hpp
@@ -18,15 +18,15 @@
#define OH_CHECKFOUND(object) (object ? "found" : "not found")
#endif
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
-#include "ACTS/Extrapolation/IExtrapolationEngine.hpp"
-#include "ACTS/Extrapolation/IMaterialEffectsEngine.hpp"
-#include "ACTS/Extrapolation/INavigationEngine.hpp"
-#include "ACTS/Extrapolation/IPropagationEngine.hpp"
-#include "ACTS/Extrapolation/detail/ExtrapolationMacros.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Extrapolation/IExtrapolationEngine.hpp"
+#include "Acts/Extrapolation/IMaterialEffectsEngine.hpp"
+#include "Acts/Extrapolation/INavigationEngine.hpp"
+#include "Acts/Extrapolation/IPropagationEngine.hpp"
+#include "Acts/Extrapolation/detail/ExtrapolationMacros.hpp"
+#include "Acts/Utilities/Logger.hpp"
namespace Acts {
@@ -240,6 +240,6 @@ StaticEngine::getConfiguration() const
} // end of namespace
-#include "ACTS/Extrapolation/detail/StaticEngine.ipp"
+#include "Acts/Extrapolation/detail/StaticEngine.ipp"
#endif // ACTS_EXTRAPOLATION_STATICENGINE_H
diff --git a/Legacy/include/ACTS/Extrapolation/StaticNavigationEngine.hpp b/Legacy/include/Acts/Extrapolation/StaticNavigationEngine.hpp
similarity index 92%
rename from Legacy/include/ACTS/Extrapolation/StaticNavigationEngine.hpp
rename to Legacy/include/Acts/Extrapolation/StaticNavigationEngine.hpp
index cdfd349c7..b5802590f 100644
--- a/Legacy/include/ACTS/Extrapolation/StaticNavigationEngine.hpp
+++ b/Legacy/include/Acts/Extrapolation/StaticNavigationEngine.hpp
@@ -13,15 +13,15 @@
#ifndef ACTS_EXTRAPOLATION_STATICNAVIGATIONENGINE_H
#define ACTS_EXTRAPOLATION_STATICNAVIGATIONENGINE_H 1
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
-#include "ACTS/Extrapolation/IMaterialEffectsEngine.hpp"
-#include "ACTS/Extrapolation/INavigationEngine.hpp"
-#include "ACTS/Extrapolation/IPropagationEngine.hpp"
-#include "ACTS/Extrapolation/detail/ExtrapolationMacros.hpp"
-#include "ACTS/Utilities/Logger.hpp"
-#include "ACTS/Volumes/BoundarySurfaceT.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Extrapolation/IMaterialEffectsEngine.hpp"
+#include "Acts/Extrapolation/INavigationEngine.hpp"
+#include "Acts/Extrapolation/IPropagationEngine.hpp"
+#include "Acts/Extrapolation/detail/ExtrapolationMacros.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Volumes/BoundarySurfaceT.hpp"
namespace Acts {
@@ -192,6 +192,6 @@ StaticNavigationEngine::getConfiguration() const
} // end of namespace
-#include "ACTS/Extrapolation/detail/StaticNavigationEngine.ipp"
+#include "Acts/Extrapolation/detail/StaticNavigationEngine.ipp"
#endif // ACTS_EXTRAPOLATION_STATICNAVIGATIONENGINE_H
diff --git a/Legacy/include/ACTS/Extrapolation/Wrapper.hpp b/Legacy/include/Acts/Extrapolation/Wrapper.hpp
similarity index 96%
rename from Legacy/include/ACTS/Extrapolation/Wrapper.hpp
rename to Legacy/include/Acts/Extrapolation/Wrapper.hpp
index c68147c81..24ee83d24 100644
--- a/Legacy/include/ACTS/Extrapolation/Wrapper.hpp
+++ b/Legacy/include/Acts/Extrapolation/Wrapper.hpp
@@ -12,14 +12,14 @@
#include <cmath>
#include <limits>
#include <memory>
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
-#include "ACTS/Propagator/AbortList.hpp"
-#include "ACTS/Propagator/ActionList.hpp"
-#include "ACTS/Propagator/Propagator.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Propagator/AbortList.hpp"
+#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/Propagator.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Utilities/Units.hpp"
namespace Acts {
diff --git a/Legacy/include/ACTS/Extrapolation/detail/ExtrapolationCell.ipp b/Legacy/include/Acts/Extrapolation/detail/ExtrapolationCell.ipp
similarity index 100%
rename from Legacy/include/ACTS/Extrapolation/detail/ExtrapolationCell.ipp
rename to Legacy/include/Acts/Extrapolation/detail/ExtrapolationCell.ipp
diff --git a/Legacy/include/ACTS/Extrapolation/detail/ExtrapolationEngine.ipp b/Legacy/include/Acts/Extrapolation/detail/ExtrapolationEngine.ipp
similarity index 98%
rename from Legacy/include/ACTS/Extrapolation/detail/ExtrapolationEngine.ipp
rename to Legacy/include/Acts/Extrapolation/detail/ExtrapolationEngine.ipp
index a9f796191..12a7459ce 100644
--- a/Legacy/include/ACTS/Extrapolation/detail/ExtrapolationEngine.ipp
+++ b/Legacy/include/Acts/Extrapolation/detail/ExtrapolationEngine.ipp
@@ -12,10 +12,10 @@
#include <iomanip>
#include <iostream>
-#include "ACTS/Detector/TrackingGeometry.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
+#include "Acts/Detector/TrackingGeometry.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Surfaces/Surface.hpp"
template <class T>
Acts::ExtrapolationCode
diff --git a/Legacy/include/ACTS/Extrapolation/detail/ExtrapolationMacros.hpp b/Legacy/include/Acts/Extrapolation/detail/ExtrapolationMacros.hpp
similarity index 100%
rename from Legacy/include/ACTS/Extrapolation/detail/ExtrapolationMacros.hpp
rename to Legacy/include/Acts/Extrapolation/detail/ExtrapolationMacros.hpp
diff --git a/Legacy/include/ACTS/Extrapolation/detail/RungeKuttaEngine.ipp b/Legacy/include/Acts/Extrapolation/detail/RungeKuttaEngine.ipp
similarity index 99%
rename from Legacy/include/ACTS/Extrapolation/detail/RungeKuttaEngine.ipp
rename to Legacy/include/Acts/Extrapolation/detail/RungeKuttaEngine.ipp
index be6dd7d34..78ac8baf6 100644
--- a/Legacy/include/ACTS/Extrapolation/detail/RungeKuttaEngine.ipp
+++ b/Legacy/include/Acts/Extrapolation/detail/RungeKuttaEngine.ipp
@@ -7,14 +7,14 @@
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include <cmath>
-#include "ACTS/EventData/TransportJacobian.hpp"
-#include "ACTS/EventData/detail/coordinate_transformations.hpp"
-#include "ACTS/Surfaces/DiscSurface.hpp"
-#include "ACTS/Surfaces/PerigeeSurface.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/StrawSurface.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/EventData/TransportJacobian.hpp"
+#include "Acts/EventData/detail/coordinate_transformations.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/PerigeeSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/StrawSurface.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Units.hpp"
template <class MagneticField>
template <class T>
diff --git a/Legacy/include/ACTS/Extrapolation/detail/RungeKuttaUtils.hpp b/Legacy/include/Acts/Extrapolation/detail/RungeKuttaUtils.hpp
similarity index 98%
rename from Legacy/include/ACTS/Extrapolation/detail/RungeKuttaUtils.hpp
rename to Legacy/include/Acts/Extrapolation/detail/RungeKuttaUtils.hpp
index b46ad5ee6..71b742f4b 100644
--- a/Legacy/include/ACTS/Extrapolation/detail/RungeKuttaUtils.hpp
+++ b/Legacy/include/Acts/Extrapolation/detail/RungeKuttaUtils.hpp
@@ -16,9 +16,9 @@
#include <limits>
#include <map>
#include <vector>
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Surfaces/BoundaryCheck.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Surfaces/BoundaryCheck.hpp"
namespace Acts {
diff --git a/Legacy/include/ACTS/Extrapolation/detail/StaticEngine.ipp b/Legacy/include/Acts/Extrapolation/detail/StaticEngine.ipp
similarity index 98%
rename from Legacy/include/ACTS/Extrapolation/detail/StaticEngine.ipp
rename to Legacy/include/Acts/Extrapolation/detail/StaticEngine.ipp
index 7a567a693..a937f5aa1 100644
--- a/Legacy/include/ACTS/Extrapolation/detail/StaticEngine.ipp
+++ b/Legacy/include/Acts/Extrapolation/detail/StaticEngine.ipp
@@ -12,13 +12,13 @@
#include <iomanip>
#include <iostream>
-#include "ACTS/Detector/TrackingGeometry.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/Extrapolation/IMaterialEffectsEngine.hpp"
-#include "ACTS/Extrapolation/INavigationEngine.hpp"
-#include "ACTS/Extrapolation/IPropagationEngine.hpp"
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
+#include "Acts/Detector/TrackingGeometry.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/Extrapolation/IMaterialEffectsEngine.hpp"
+#include "Acts/Extrapolation/INavigationEngine.hpp"
+#include "Acts/Extrapolation/IPropagationEngine.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Surfaces/Surface.hpp"
template <class T>
Acts::ExtrapolationCode
diff --git a/Legacy/include/ACTS/Extrapolation/detail/StaticNavigationEngine.ipp b/Legacy/include/Acts/Extrapolation/detail/StaticNavigationEngine.ipp
similarity index 98%
rename from Legacy/include/ACTS/Extrapolation/detail/StaticNavigationEngine.ipp
rename to Legacy/include/Acts/Extrapolation/detail/StaticNavigationEngine.ipp
index db7dbb243..254d00872 100644
--- a/Legacy/include/ACTS/Extrapolation/detail/StaticNavigationEngine.ipp
+++ b/Legacy/include/Acts/Extrapolation/detail/StaticNavigationEngine.ipp
@@ -10,12 +10,12 @@
// StaticNavigationEngine.ipp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Detector/TrackingGeometry.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/Extrapolation/IMaterialEffectsEngine.hpp"
-#include "ACTS/Extrapolation/IPropagationEngine.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Volumes/BoundarySurfaceT.hpp"
+#include "Acts/Detector/TrackingGeometry.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/Extrapolation/IMaterialEffectsEngine.hpp"
+#include "Acts/Extrapolation/IPropagationEngine.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Volumes/BoundarySurfaceT.hpp"
template <class T>
Acts::ExtrapolationCode
diff --git a/Legacy/include/ACTS/Propagator/AtlasStepper.hpp b/Legacy/include/Acts/Propagator/AtlasStepper.hpp
similarity index 99%
rename from Legacy/include/ACTS/Propagator/AtlasStepper.hpp
rename to Legacy/include/Acts/Propagator/AtlasStepper.hpp
index a75784bea..1e0a61616 100644
--- a/Legacy/include/ACTS/Propagator/AtlasStepper.hpp
+++ b/Legacy/include/Acts/Propagator/AtlasStepper.hpp
@@ -10,10 +10,10 @@
#define ACTS_ATLAS_STEPPER_HPP
#include <cmath>
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/MagneticField/concept/AnyFieldLookup.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/MagneticField/concept/AnyFieldLookup.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Units.hpp"
// This is based original stepper code from the ATLAS RungeKuttePropagagor
namespace Acts {
diff --git a/Legacy/include/ACTS/Seeding/ATL_Seedmaker.hpp b/Legacy/include/Acts/Seeding/ATL_Seedmaker.hpp
similarity index 98%
rename from Legacy/include/ACTS/Seeding/ATL_Seedmaker.hpp
rename to Legacy/include/Acts/Seeding/ATL_Seedmaker.hpp
index 9512a911a..71dbf3057 100644
--- a/Legacy/include/ACTS/Seeding/ATL_Seedmaker.hpp
+++ b/Legacy/include/Acts/Seeding/ATL_Seedmaker.hpp
@@ -20,8 +20,8 @@
#include <utility>
#include <vector>
-#include "ACTS/Seeding/InternalSeed.hpp"
-#include "ACTS/Seeding/SPForSeed.hpp"
+#include "Acts/Seeding/InternalSeed.hpp"
+#include "Acts/Seeding/SPForSeed.hpp"
namespace Acts {
namespace Seeding {
@@ -331,6 +331,6 @@ namespace Seeding {
};
} // end of Seeding namespace
} // end of Acts namespace
-#include "ACTS/Seeding/ATL_Seedmaker.ipp"
+#include "Acts/Seeding/ATL_Seedmaker.ipp"
#endif // ATL_Seedmaker_hpp
diff --git a/Legacy/include/ACTS/Seeding/ATL_Seedmaker.ipp b/Legacy/include/Acts/Seeding/ATL_Seedmaker.ipp
similarity index 100%
rename from Legacy/include/ACTS/Seeding/ATL_Seedmaker.ipp
rename to Legacy/include/Acts/Seeding/ATL_Seedmaker.ipp
diff --git a/Legacy/include/ACTS/Seeding/InternalSeed.hpp b/Legacy/include/Acts/Seeding/InternalSeed.hpp
similarity index 98%
rename from Legacy/include/ACTS/Seeding/InternalSeed.hpp
rename to Legacy/include/Acts/Seeding/InternalSeed.hpp
index 7f4abc749..1d76b2643 100644
--- a/Legacy/include/ACTS/Seeding/InternalSeed.hpp
+++ b/Legacy/include/Acts/Seeding/InternalSeed.hpp
@@ -13,8 +13,8 @@
#ifndef InternalSeed_h
#define InternalSeed_h
-#include "ACTS/Seeding/SPForSeed.hpp"
-#include "ACTS/Seeding/Seed.hpp"
+#include "Acts/Seeding/SPForSeed.hpp"
+#include "Acts/Seeding/Seed.hpp"
namespace Acts {
namespace Seeding {
diff --git a/Legacy/include/ACTS/Seeding/SPForSeed.hpp b/Legacy/include/Acts/Seeding/SPForSeed.hpp
similarity index 100%
rename from Legacy/include/ACTS/Seeding/SPForSeed.hpp
rename to Legacy/include/Acts/Seeding/SPForSeed.hpp
diff --git a/Legacy/include/ACTS/Seeding/Seed.hpp b/Legacy/include/Acts/Seeding/Seed.hpp
similarity index 100%
rename from Legacy/include/ACTS/Seeding/Seed.hpp
rename to Legacy/include/Acts/Seeding/Seed.hpp
diff --git a/Legacy/src/Extrapolation/ExtrapolationCell.cpp b/Legacy/src/Extrapolation/ExtrapolationCell.cpp
index 6d9f992ea..485d372f7 100644
--- a/Legacy/src/Extrapolation/ExtrapolationCell.cpp
+++ b/Legacy/src/Extrapolation/ExtrapolationCell.cpp
@@ -10,7 +10,7 @@
// ExtrapolationCell.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
const std::vector<std::string> Acts::ExtrapolationCode::s_ecodeNames
= {"Unset",
diff --git a/Legacy/src/Extrapolation/ExtrapolationEngine.cpp b/Legacy/src/Extrapolation/ExtrapolationEngine.cpp
index eaa5bd75b..f36ff11c8 100644
--- a/Legacy/src/Extrapolation/ExtrapolationEngine.cpp
+++ b/Legacy/src/Extrapolation/ExtrapolationEngine.cpp
@@ -10,7 +10,7 @@
// ExtrapolationEngine.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Extrapolation/ExtrapolationEngine.hpp"
+#include "Acts/Extrapolation/ExtrapolationEngine.hpp"
// constructor
Acts::ExtrapolationEngine::ExtrapolationEngine(
diff --git a/Legacy/src/Extrapolation/MaterialEffectsEngine.cpp b/Legacy/src/Extrapolation/MaterialEffectsEngine.cpp
index 879090ae7..f212ca6c5 100644
--- a/Legacy/src/Extrapolation/MaterialEffectsEngine.cpp
+++ b/Legacy/src/Extrapolation/MaterialEffectsEngine.cpp
@@ -10,11 +10,11 @@
// MaterialEffectsEngine.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Extrapolation/MaterialEffectsEngine.hpp"
+#include "Acts/Extrapolation/MaterialEffectsEngine.hpp"
#include <sstream>
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Material/SurfaceMaterial.hpp"
-#include "ACTS/Utilities/MaterialInteraction.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Material/SurfaceMaterial.hpp"
+#include "Acts/Utilities/MaterialInteraction.hpp"
// constructor
Acts::MaterialEffectsEngine::MaterialEffectsEngine(
diff --git a/Legacy/src/Extrapolation/RungeKuttaUtils.cpp b/Legacy/src/Extrapolation/RungeKuttaUtils.cpp
index a20644106..ebc702992 100644
--- a/Legacy/src/Extrapolation/RungeKuttaUtils.cpp
+++ b/Legacy/src/Extrapolation/RungeKuttaUtils.cpp
@@ -10,14 +10,14 @@
// RungeKuttaUtils.cpp , ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Extrapolation/detail/RungeKuttaUtils.hpp"
+#include "Acts/Extrapolation/detail/RungeKuttaUtils.hpp"
#include <cmath>
-#include "ACTS/Surfaces/ConeSurface.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Surfaces/DiscSurface.hpp"
-#include "ACTS/Surfaces/PerigeeSurface.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/StrawSurface.hpp"
+#include "Acts/Surfaces/ConeSurface.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/PerigeeSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/StrawSurface.hpp"
#ifndef __USE_GNU
void
diff --git a/Legacy/src/Extrapolation/StaticEngine.cpp b/Legacy/src/Extrapolation/StaticEngine.cpp
index 614b69ce9..0e80af5be 100644
--- a/Legacy/src/Extrapolation/StaticEngine.cpp
+++ b/Legacy/src/Extrapolation/StaticEngine.cpp
@@ -13,7 +13,7 @@
// STL
#include <sstream>
// Extrapolation module
-#include "ACTS/Extrapolation/StaticEngine.hpp"
+#include "Acts/Extrapolation/StaticEngine.hpp"
// constructor
Acts::StaticEngine::StaticEngine(const Acts::StaticEngine::Config& seConfig,
diff --git a/Legacy/src/Extrapolation/StaticNavigationEngine.cpp b/Legacy/src/Extrapolation/StaticNavigationEngine.cpp
index c58b2d270..a3d1cfe3f 100644
--- a/Legacy/src/Extrapolation/StaticNavigationEngine.cpp
+++ b/Legacy/src/Extrapolation/StaticNavigationEngine.cpp
@@ -13,7 +13,7 @@
// STL
#include <sstream>
// Extrapolation module
-#include "ACTS/Extrapolation/StaticNavigationEngine.hpp"
+#include "Acts/Extrapolation/StaticNavigationEngine.hpp"
// constructor
Acts::StaticNavigationEngine::StaticNavigationEngine(
diff --git a/Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/ActsExtension.hpp b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ActsExtension.hpp
similarity index 98%
rename from Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/ActsExtension.hpp
rename to Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ActsExtension.hpp
index 4713e2ce9..63d0eede0 100644
--- a/Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/ActsExtension.hpp
+++ b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ActsExtension.hpp
@@ -13,12 +13,12 @@
#ifndef ACTS_DD4HEPDETECTORELEMENT_ACTSEXTENSION_H
#define ACTS_DD4HEPDETECTORELEMENT_ACTSEXTENSION_H 1
-#include <ACTS/Plugins/DD4hepPlugins/IActsExtension.hpp>
+#include "Acts/Plugins/DD4hepPlugins/IActsExtension.hpp"
#include <vector>
-#include "ACTS/Digitization/CartesianSegmentation.hpp"
-#include "ACTS/Digitization/DigitizationModule.hpp"
-#include "ACTS/Material/SurfaceMaterial.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
+#include "Acts/Digitization/CartesianSegmentation.hpp"
+#include "Acts/Digitization/DigitizationModule.hpp"
+#include "Acts/Material/SurfaceMaterial.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
#include "DD4hep/CartesianGridXY.h"
#include "DD4hep/Detector.h"
#include "DD4hep/Objects.h"
diff --git a/Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp
similarity index 97%
rename from Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp
rename to Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp
index 6784ba6d5..6f84834a5 100644
--- a/Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp
+++ b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp
@@ -9,12 +9,12 @@
#ifndef ACTS_DD4HEPPLUGIN_CONVERTDD4HEPDETECTOR_H
#define ACTS_DD4HEPPLUGIN_CONVERTDD4HEPDETECTOR_H 1
-#include "ACTS/Detector/TrackingGeometry.hpp"
-#include "ACTS/Tools/CylinderVolumeBuilder.hpp"
-#include "ACTS/Tools/CylinderVolumeHelper.hpp"
-#include "ACTS/Utilities/BinningType.hpp"
-#include "ACTS/Utilities/Logger.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Detector/TrackingGeometry.hpp"
+#include "Acts/Tools/CylinderVolumeBuilder.hpp"
+#include "Acts/Tools/CylinderVolumeHelper.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/Units.hpp"
#include "DD4hep/DetElement.h"
namespace Acts {
diff --git a/Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/DD4hepDetElement.hpp b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepDetElement.hpp
similarity index 98%
rename from Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/DD4hepDetElement.hpp
rename to Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepDetElement.hpp
index 2a6db2471..aa1c76d1f 100644
--- a/Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/DD4hepDetElement.hpp
+++ b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepDetElement.hpp
@@ -13,7 +13,7 @@
#ifndef ACTS_DD4HEPDETECTORELEMENT_DD4HEPDETELEMENT_H
#define ACTS_DD4HEPDETECTORELEMENT_DD4HEPDETELEMENT_H 1
-#include "ACTS/Plugins/TGeoPlugins/TGeoDetectorElement.hpp"
+#include "Acts/Plugins/TGeoPlugins/TGeoDetectorElement.hpp"
#include "DD4hep/DetElement.h"
namespace Acts {
diff --git a/Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp
similarity index 96%
rename from Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp
rename to Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp
index c7b20aaba..3505cdce2 100644
--- a/Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp
+++ b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp
@@ -9,12 +9,12 @@
#ifndef ACTS_DD4HEPPLUGIN_DD4HEPLAYERBUILDER_H
#define ACTS_DD4HEPPLUGIN_DD4HEPLAYERBUILDER_H 1
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Tools/ILayerBuilder.hpp"
-#include "ACTS/Tools/LayerCreator.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Tools/ILayerBuilder.hpp"
+#include "Acts/Tools/LayerCreator.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Logger.hpp"
class TGeoMatrix;
diff --git a/Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/IActsExtension.hpp b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/IActsExtension.hpp
similarity index 99%
rename from Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/IActsExtension.hpp
rename to Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/IActsExtension.hpp
index 9edd67076..26382b958 100644
--- a/Plugins/DD4hepPlugin/include/ACTS/Plugins/DD4hepPlugins/IActsExtension.hpp
+++ b/Plugins/DD4hepPlugin/include/Acts/Plugins/DD4hepPlugins/IActsExtension.hpp
@@ -16,7 +16,7 @@
// Algebra
#include <memory>
#include <vector>
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace dd4hep {
class DetElement;
diff --git a/Plugins/DD4hepPlugin/src/ActsExtension.cpp b/Plugins/DD4hepPlugin/src/ActsExtension.cpp
index c4b7d11f0..7364ace0e 100644
--- a/Plugins/DD4hepPlugin/src/ActsExtension.cpp
+++ b/Plugins/DD4hepPlugin/src/ActsExtension.cpp
@@ -6,15 +6,15 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#include "ACTS/Plugins/DD4hepPlugins/ActsExtension.hpp"
+#include "Acts/Plugins/DD4hepPlugins/ActsExtension.hpp"
#include <boost/algorithm/string.hpp>
-#include "ACTS/Digitization/CartesianSegmentation.hpp"
-#include "ACTS/Digitization/DigitizationModule.hpp"
-#include "ACTS/Material/HomogeneousSurfaceMaterial.hpp"
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/TrapezoidBounds.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Digitization/CartesianSegmentation.hpp"
+#include "Acts/Digitization/DigitizationModule.hpp"
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Utilities/Units.hpp"
#include "DD4hep/CartesianGridXY.h"
std::shared_ptr<const Acts::DigitizationModule>
diff --git a/Plugins/DD4hepPlugin/src/ConvertDD4hepDetector.cpp b/Plugins/DD4hepPlugin/src/ConvertDD4hepDetector.cpp
index e9d0f1173..c341e9a4d 100644
--- a/Plugins/DD4hepPlugin/src/ConvertDD4hepDetector.cpp
+++ b/Plugins/DD4hepPlugin/src/ConvertDD4hepDetector.cpp
@@ -6,18 +6,18 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#include "ACTS/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp"
+#include "Acts/Plugins/DD4hepPlugins/ConvertDD4hepDetector.hpp"
#include <list>
#include <stdexcept>
-#include "ACTS/Material/MaterialProperties.hpp"
-#include "ACTS/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp"
-#include "ACTS/Plugins/DD4hepPlugins/IActsExtension.hpp"
-#include "ACTS/Tools/LayerArrayCreator.hpp"
-#include "ACTS/Tools/LayerCreator.hpp"
-#include "ACTS/Tools/PassiveLayerBuilder.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Tools/TrackingGeometryBuilder.hpp"
-#include "ACTS/Tools/TrackingVolumeArrayCreator.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
+#include "Acts/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp"
+#include "Acts/Plugins/DD4hepPlugins/IActsExtension.hpp"
+#include "Acts/Tools/LayerArrayCreator.hpp"
+#include "Acts/Tools/LayerCreator.hpp"
+#include "Acts/Tools/PassiveLayerBuilder.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Tools/TrackingGeometryBuilder.hpp"
+#include "Acts/Tools/TrackingVolumeArrayCreator.hpp"
#include "TGeoManager.h"
namespace Acts {
diff --git a/Plugins/DD4hepPlugin/src/DD4hepDetectorElement.cpp b/Plugins/DD4hepPlugin/src/DD4hepDetectorElement.cpp
index f9b93cc80..9932ed19b 100644
--- a/Plugins/DD4hepPlugin/src/DD4hepDetectorElement.cpp
+++ b/Plugins/DD4hepPlugin/src/DD4hepDetectorElement.cpp
@@ -6,13 +6,13 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#include "ACTS/Digitization/CartesianSegmentation.hpp"
-#include "ACTS/Digitization/DigitizationModule.hpp"
-#include "ACTS/Plugins/DD4hepPlugins/DD4hepDetElement.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Surfaces/TrapezoidBounds.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Digitization/CartesianSegmentation.hpp"
+#include "Acts/Digitization/DigitizationModule.hpp"
+#include "Acts/Plugins/DD4hepPlugins/DD4hepDetElement.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Utilities/Units.hpp"
#include "DD4hep/CartesianGridXY.h"
Acts::DD4hepDetElement::DD4hepDetElement(
diff --git a/Plugins/DD4hepPlugin/src/DD4hepLayerBuilder.cpp b/Plugins/DD4hepPlugin/src/DD4hepLayerBuilder.cpp
index 2b62b9c22..5b3e9fb02 100644
--- a/Plugins/DD4hepPlugin/src/DD4hepLayerBuilder.cpp
+++ b/Plugins/DD4hepPlugin/src/DD4hepLayerBuilder.cpp
@@ -6,29 +6,29 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#include "ACTS/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp"
-#include "ACTS/Layers/CylinderLayer.hpp"
-#include "ACTS/Layers/DiscLayer.hpp"
-#include "ACTS/Layers/GenericApproachDescriptor.hpp"
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Layers/ProtoLayer.hpp"
-#include "ACTS/Material/SurfaceMaterialProxy.hpp"
-#include "ACTS/Plugins/DD4hepPlugins/DD4hepDetElement.hpp"
-#include "ACTS/Plugins/DD4hepPlugins/IActsExtension.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Surfaces/SurfaceArray.hpp"
-#include "ACTS/Tools/LayerCreator.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/BinnedArrayXD.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Plugins/DD4hepPlugins/DD4hepLayerBuilder.hpp"
+#include "Acts/Layers/CylinderLayer.hpp"
+#include "Acts/Layers/DiscLayer.hpp"
+#include "Acts/Layers/GenericApproachDescriptor.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Layers/ProtoLayer.hpp"
+#include "Acts/Material/SurfaceMaterialProxy.hpp"
+#include "Acts/Plugins/DD4hepPlugins/DD4hepDetElement.hpp"
+#include "Acts/Plugins/DD4hepPlugins/IActsExtension.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Surfaces/SurfaceArray.hpp"
+#include "Acts/Tools/LayerCreator.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/BinnedArrayXD.hpp"
+#include "Acts/Utilities/Units.hpp"
#include "DD4hep/Detector.h"
#include "TGeoManager.h"
#include "TGeoMatrix.h"
#include <boost/algorithm/string.hpp>
-#include "ACTS/Material/HomogeneousSurfaceMaterial.hpp"
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
Acts::DD4hepLayerBuilder::DD4hepLayerBuilder(
const Acts::DD4hepLayerBuilder::Config& config,
diff --git a/Plugins/Geant4Plugin/include/ACTS/Plugins/Geant4Plugins/Geant4DetectorElement.hpp b/Plugins/Geant4Plugin/include/Acts/Plugins/Geant4Plugins/Geant4DetectorElement.hpp
similarity index 100%
rename from Plugins/Geant4Plugin/include/ACTS/Plugins/Geant4Plugins/Geant4DetectorElement.hpp
rename to Plugins/Geant4Plugin/include/Acts/Plugins/Geant4Plugins/Geant4DetectorElement.hpp
diff --git a/Plugins/JsonPlugin/include/ACTS/Plugins/JsonPlugin/FromJson.hpp b/Plugins/JsonPlugin/include/Acts/Plugins/JsonPlugin/FromJson.hpp
similarity index 93%
rename from Plugins/JsonPlugin/include/ACTS/Plugins/JsonPlugin/FromJson.hpp
rename to Plugins/JsonPlugin/include/Acts/Plugins/JsonPlugin/FromJson.hpp
index 504434ecb..e33fdbe4e 100644
--- a/Plugins/JsonPlugin/include/ACTS/Plugins/JsonPlugin/FromJson.hpp
+++ b/Plugins/JsonPlugin/include/Acts/Plugins/JsonPlugin/FromJson.hpp
@@ -9,7 +9,7 @@
#ifndef ACTS_PLUGINS_JSONPLUGIN_JSONLOADER_H
#define ACTS_PLUGINS_JSONPLUGIN_JSONLOADER_H
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
#include "lib/json.hpp"
namespace Acts {
diff --git a/Plugins/JsonPlugin/include/ACTS/Plugins/JsonPlugin/lib/json.hpp b/Plugins/JsonPlugin/include/Acts/Plugins/JsonPlugin/lib/json.hpp
similarity index 100%
rename from Plugins/JsonPlugin/include/ACTS/Plugins/JsonPlugin/lib/json.hpp
rename to Plugins/JsonPlugin/include/Acts/Plugins/JsonPlugin/lib/json.hpp
diff --git a/Plugins/JsonPlugin/src/FromJson.cpp b/Plugins/JsonPlugin/src/FromJson.cpp
index 1ea12030d..1cdfdf242 100644
--- a/Plugins/JsonPlugin/src/FromJson.cpp
+++ b/Plugins/JsonPlugin/src/FromJson.cpp
@@ -6,11 +6,11 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#include "ACTS/Plugins/JsonPlugin/lib/json.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Plugins/JsonPlugin/lib/json.hpp"
+#include "Acts/Utilities/VariantData.hpp"
-#include "ACTS/Plugins/JsonPlugin/FromJson.hpp"
-#include "ACTS/Utilities/ThrowAssert.hpp"
+#include "Acts/Plugins/JsonPlugin/FromJson.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
using json = nlohmann::json;
diff --git a/Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp
similarity index 90%
rename from Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp
rename to Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp
index e31b79d4d..1d3b4c063 100644
--- a/Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp
+++ b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp
@@ -13,9 +13,9 @@
#ifndef ACTS_MATERIALPLUGINS_ASSIGNEDMATERIALSTEPS_H
#define ACTS_MATERIALPLUGINS_ASSIGNEDMATERIALSTEPS_H
-#include "ACTS/Plugins/MaterialPlugins/MaterialStep.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/GeometryID.hpp"
+#include "Acts/Plugins/MaterialPlugins/MaterialStep.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometryID.hpp"
namespace Acts {
diff --git a/Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/MaterialMapper.hpp b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialMapper.hpp
similarity index 93%
rename from Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/MaterialMapper.hpp
rename to Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialMapper.hpp
index 122c4aa7d..83f03898b 100644
--- a/Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/MaterialMapper.hpp
+++ b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialMapper.hpp
@@ -15,13 +15,13 @@
#include <map>
#include <utility>
-#include "ACTS/Extrapolation/IExtrapolationEngine.hpp"
-#include "ACTS/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp"
-#include "ACTS/Plugins/MaterialPlugins/MaterialStep.hpp"
-#include "ACTS/Plugins/MaterialPlugins/MaterialTrack.hpp"
-#include "ACTS/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/Extrapolation/IExtrapolationEngine.hpp"
+#include "Acts/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp"
+#include "Acts/Plugins/MaterialPlugins/MaterialStep.hpp"
+#include "Acts/Plugins/MaterialPlugins/MaterialTrack.hpp"
+#include "Acts/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Logger.hpp"
namespace Acts {
diff --git a/Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/MaterialStep.hpp b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialStep.hpp
similarity index 97%
rename from Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/MaterialStep.hpp
rename to Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialStep.hpp
index 551843f0d..e7edbf1a5 100644
--- a/Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/MaterialStep.hpp
+++ b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialStep.hpp
@@ -14,10 +14,10 @@
#define ACTS_MATERIALPLUGINS_MATERIALSTEP_H
#include <memory>
-#include "ACTS/Material/MaterialProperties.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
#if !defined(__CLING__)
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
#endif
namespace Acts {
diff --git a/Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/MaterialTrack.hpp b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialTrack.hpp
similarity index 98%
rename from Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/MaterialTrack.hpp
rename to Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialTrack.hpp
index e9d10fc61..bbd77abb1 100644
--- a/Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/MaterialTrack.hpp
+++ b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/MaterialTrack.hpp
@@ -14,7 +14,7 @@
#define ACTS_MATERIALPLUGINS_MATERIALTRACK_H
#include <vector>
-#include "ACTS/Plugins/MaterialPlugins/MaterialStep.hpp"
+#include "Acts/Plugins/MaterialPlugins/MaterialStep.hpp"
namespace Acts {
diff --git a/Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp
similarity index 93%
rename from Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp
rename to Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp
index 290c6623a..42e581b09 100644
--- a/Plugins/MaterialPlugin/include/ACTS/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp
+++ b/Plugins/MaterialPlugin/include/Acts/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp
@@ -13,11 +13,11 @@
#ifndef ACTS_MATERIALPLUGINS_SURFACEMATERIALRECORD_H
#define ACTS_MATERIALPLUGINS_SURFACEMATERIALRECORD_H
-#include "ACTS/Material/BinnedSurfaceMaterial.hpp"
-#include "ACTS/Material/MaterialProperties.hpp"
-#include "ACTS/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp"
-#include "ACTS/Plugins/MaterialPlugins/MaterialStep.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
+#include "Acts/Material/BinnedSurfaceMaterial.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
+#include "Acts/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp"
+#include "Acts/Plugins/MaterialPlugins/MaterialStep.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
namespace Acts {
diff --git a/Plugins/MaterialPlugin/src/MaterialMapper.cpp b/Plugins/MaterialPlugin/src/MaterialMapper.cpp
index 4e35ef960..23b22577e 100644
--- a/Plugins/MaterialPlugin/src/MaterialMapper.cpp
+++ b/Plugins/MaterialPlugin/src/MaterialMapper.cpp
@@ -10,24 +10,24 @@
// MaterialMapper.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Plugins/MaterialPlugins/MaterialMapper.hpp"
+#include "Acts/Plugins/MaterialPlugins/MaterialMapper.hpp"
#include <climits>
-#include "ACTS/Detector/TrackingGeometry.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
-#include "ACTS/Layers/Layer.hpp"
-#include "ACTS/Material/BinnedSurfaceMaterial.hpp"
-#include "ACTS/Material/SurfaceMaterial.hpp"
-#include "ACTS/Material/SurfaceMaterialProxy.hpp"
-#include "ACTS/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp"
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/GeometryObjectSorter.hpp"
-#include "ACTS/Utilities/Helpers.hpp"
+#include "Acts/Detector/TrackingGeometry.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Layers/Layer.hpp"
+#include "Acts/Material/BinnedSurfaceMaterial.hpp"
+#include "Acts/Material/SurfaceMaterial.hpp"
+#include "Acts/Material/SurfaceMaterialProxy.hpp"
+#include "Acts/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/GeometryObjectSorter.hpp"
+#include "Acts/Utilities/Helpers.hpp"
Acts::MaterialMapper::MaterialMapper(const Config& cfg,
std::unique_ptr<const Logger> log)
diff --git a/Plugins/MaterialPlugin/src/MaterialStep.cpp b/Plugins/MaterialPlugin/src/MaterialStep.cpp
index bc521c3f0..137b6ba3c 100644
--- a/Plugins/MaterialPlugin/src/MaterialStep.cpp
+++ b/Plugins/MaterialPlugin/src/MaterialStep.cpp
@@ -10,7 +10,7 @@
// MaterialStep.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Plugins/MaterialPlugins/MaterialStep.hpp"
+#include "Acts/Plugins/MaterialPlugins/MaterialStep.hpp"
Acts::MaterialStep::MaterialStep()
: m_position(Position()), m_material(), m_geoID(0)
diff --git a/Plugins/MaterialPlugin/src/MaterialTrack.cpp b/Plugins/MaterialPlugin/src/MaterialTrack.cpp
index b1243f58c..e7fa1d13d 100644
--- a/Plugins/MaterialPlugin/src/MaterialTrack.cpp
+++ b/Plugins/MaterialPlugin/src/MaterialTrack.cpp
@@ -10,7 +10,7 @@
// MaterialTrack.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Plugins/MaterialPlugins/MaterialTrack.hpp"
+#include "Acts/Plugins/MaterialPlugins/MaterialTrack.hpp"
Acts::MaterialTrack::MaterialTrack(const MaterialStep::Position& startPos,
double theta,
diff --git a/Plugins/MaterialPlugin/src/SurfaceMaterialRecord.cpp b/Plugins/MaterialPlugin/src/SurfaceMaterialRecord.cpp
index 89969c388..1a73fa0c0 100644
--- a/Plugins/MaterialPlugin/src/SurfaceMaterialRecord.cpp
+++ b/Plugins/MaterialPlugin/src/SurfaceMaterialRecord.cpp
@@ -10,8 +10,8 @@
// SurfaceMaterialRecord.cpp, ACTS project
///////////////////////////////////////////////////////////////////
-#include "ACTS/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
+#include "Acts/Plugins/MaterialPlugins/SurfaceMaterialRecord.hpp"
+#include "Acts/Surfaces/Surface.hpp"
Acts::SurfaceMaterialRecord::SurfaceMaterialRecord(const Surface& surface,
const BinUtility& binUtility)
diff --git a/Plugins/TGeoPlugin/include/ACTS/Plugins/TGeoPlugins/TGeoDetectorElement.hpp b/Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoDetectorElement.hpp
similarity index 99%
rename from Plugins/TGeoPlugin/include/ACTS/Plugins/TGeoPlugins/TGeoDetectorElement.hpp
rename to Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoDetectorElement.hpp
index 7b727cdfd..d31168a44 100644
--- a/Plugins/TGeoPlugin/include/ACTS/Plugins/TGeoPlugins/TGeoDetectorElement.hpp
+++ b/Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoDetectorElement.hpp
@@ -14,7 +14,7 @@
#define ACTS_TGEODETECTORELEMENT_TGEODETECTORELEMENT 1
#include <iostream>
-#include "ACTS/Detector/DetectorElementBase.hpp"
+#include "Acts/Detector/DetectorElementBase.hpp"
#include "TGeoManager.h"
namespace Acts {
diff --git a/Plugins/TGeoPlugin/include/ACTS/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp b/Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp
similarity index 96%
rename from Plugins/TGeoPlugin/include/ACTS/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp
rename to Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp
index 849b6d681..ec9d680d9 100644
--- a/Plugins/TGeoPlugin/include/ACTS/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp
+++ b/Plugins/TGeoPlugin/include/Acts/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp
@@ -13,10 +13,10 @@
#ifndef ACTS_TGEOPLUGINS_TGEOLAYERBUILDER_H
#define ACTS_TGEOPLUGINS_TGEOLAYERBUILDER_H
-#include "ACTS/Tools/ILayerBuilder.hpp"
-#include "ACTS/Tools/LayerCreator.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/Tools/ILayerBuilder.hpp"
+#include "Acts/Tools/LayerCreator.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Logger.hpp"
class TGeoMatrix;
class TGeoVolume;
diff --git a/Plugins/TGeoPlugin/src/TGeoDetectorElement.cpp b/Plugins/TGeoPlugin/src/TGeoDetectorElement.cpp
index 5ff25c1ac..38b6a316a 100644
--- a/Plugins/TGeoPlugin/src/TGeoDetectorElement.cpp
+++ b/Plugins/TGeoPlugin/src/TGeoDetectorElement.cpp
@@ -6,19 +6,19 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#include "ACTS/Plugins/TGeoPlugins/TGeoDetectorElement.hpp"
+#include "Acts/Plugins/TGeoPlugins/TGeoDetectorElement.hpp"
#include <boost/algorithm/string.hpp>
#include <iostream>
-#include "ACTS/Digitization/DigitizationModule.hpp"
-#include "ACTS/Material/SurfaceMaterial.hpp"
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Surfaces/DiscSurface.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/TrapezoidBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Digitization/DigitizationModule.hpp"
+#include "Acts/Material/SurfaceMaterial.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
#include "TGeoBBox.h"
#include "TGeoTrd2.h"
#include "TGeoTube.h"
diff --git a/Plugins/TGeoPlugin/src/TGeoLayerBuilder.cpp b/Plugins/TGeoPlugin/src/TGeoLayerBuilder.cpp
index 429c4a788..d9ef55c6e 100644
--- a/Plugins/TGeoPlugin/src/TGeoLayerBuilder.cpp
+++ b/Plugins/TGeoPlugin/src/TGeoLayerBuilder.cpp
@@ -6,10 +6,10 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#include "ACTS/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp"
+#include "Acts/Plugins/TGeoPlugins/TGeoLayerBuilder.hpp"
#include <stdio.h>
-#include "ACTS/Layers/ProtoLayer.hpp"
-#include "ACTS/Plugins/TGeoPlugins/TGeoDetectorElement.hpp"
+#include "Acts/Layers/ProtoLayer.hpp"
+#include "Acts/Plugins/TGeoPlugins/TGeoDetectorElement.hpp"
#include "TGeoManager.h"
#include "TGeoMatrix.h"
diff --git a/Tests/Detector/GeometryCreation.hpp b/Tests/Detector/GeometryCreation.hpp
index 0834ece51..d440b7fb7 100644
--- a/Tests/Detector/GeometryCreation.hpp
+++ b/Tests/Detector/GeometryCreation.hpp
@@ -6,15 +6,15 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#include "ACTS/Detector/TrackingGeometry.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/Layers/CylinderLayer.hpp"
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/BinnedArrayXD.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Volumes/CylinderVolumeBounds.hpp"
+#include "Acts/Detector/TrackingGeometry.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/Layers/CylinderLayer.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/BinnedArrayXD.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Volumes/CylinderVolumeBounds.hpp"
namespace Acts {
diff --git a/Tests/Detector/TrackingGeometryClosureTests.cpp b/Tests/Detector/TrackingGeometryClosureTests.cpp
index a9ba31dd3..98c60a7e2 100644
--- a/Tests/Detector/TrackingGeometryClosureTests.cpp
+++ b/Tests/Detector/TrackingGeometryClosureTests.cpp
@@ -9,8 +9,8 @@
/// Boost include(s)
#define BOOST_TEST_MODULE GeometryID Tests
#include <boost/test/included/unit_test.hpp>
-#include "ACTS/Utilities/Helpers.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Utilities/Helpers.hpp"
+#include "Acts/Utilities/Units.hpp"
#include "GeometryCreation.hpp"
namespace Acts {
diff --git a/Tests/Detector/TrackingGeometryGeoIDTests.cpp b/Tests/Detector/TrackingGeometryGeoIDTests.cpp
index 95a18bb8f..06e38c126 100644
--- a/Tests/Detector/TrackingGeometryGeoIDTests.cpp
+++ b/Tests/Detector/TrackingGeometryGeoIDTests.cpp
@@ -9,8 +9,8 @@
/// Boost include(s)
#define BOOST_TEST_MODULE GeometryID Tests
#include <boost/test/included/unit_test.hpp>
-#include "ACTS/Detector/TrackingGeometry.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Detector/TrackingGeometry.hpp"
+#include "Acts/Utilities/Units.hpp"
#include "GeometryCreation.hpp"
namespace Acts {
diff --git a/Tests/EventData/BoundParametersTests.cpp b/Tests/EventData/BoundParametersTests.cpp
index bf247d777..797685d86 100644
--- a/Tests/EventData/BoundParametersTests.cpp
+++ b/Tests/EventData/BoundParametersTests.cpp
@@ -12,19 +12,19 @@
// leave blank as
#include <boost/test/data/test_case.hpp>
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Surfaces/DiscSurface.hpp"
-#include "ACTS/Surfaces/PerigeeSurface.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/StrawSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Units.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/PerigeeSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/StrawSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
+#include "Acts/Utilities/VariantData.hpp"
#include "ParametersTestHelper.hpp"
namespace bdata = boost::unit_test::data;
@@ -456,4 +456,4 @@ namespace Test {
!= &(n_ataLine_from_global.referenceSurface()));
}
}
-}
\ No newline at end of file
+}
diff --git a/Tests/EventData/CurvilinearParametersTests.cpp b/Tests/EventData/CurvilinearParametersTests.cpp
index 435ea1111..d7a333173 100644
--- a/Tests/EventData/CurvilinearParametersTests.cpp
+++ b/Tests/EventData/CurvilinearParametersTests.cpp
@@ -8,9 +8,9 @@
#define BOOST_TEST_MODULE CurvilinearParameters Tests
#include <boost/test/included/unit_test.hpp>
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Utilities/Definitions.hpp"
#include "ParametersTestHelper.hpp"
namespace Acts {
diff --git a/Tests/EventData/MeasurementTests.cpp b/Tests/EventData/MeasurementTests.cpp
index cfcaefbbb..b50615cd9 100644
--- a/Tests/EventData/MeasurementTests.cpp
+++ b/Tests/EventData/MeasurementTests.cpp
@@ -11,9 +11,9 @@
#include <boost/test/included/unit_test.hpp>
// ACTS include(s)
-#include "ACTS/EventData/Measurement.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
+#include "Acts/EventData/Measurement.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
namespace Acts {
namespace Test {
diff --git a/Tests/EventData/ParameterSetTests.cpp b/Tests/EventData/ParameterSetTests.cpp
index 287217ddb..14dbe90ee 100644
--- a/Tests/EventData/ParameterSetTests.cpp
+++ b/Tests/EventData/ParameterSetTests.cpp
@@ -12,8 +12,8 @@
#define BOOST_TEST_MODULE ParameterSet Tests
#include <boost/test/included/unit_test.hpp>
-#include "ACTS/EventData/ParameterSet.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/EventData/ParameterSet.hpp"
+#include "Acts/Utilities/Definitions.hpp"
using namespace Acts::detail;
///
diff --git a/Tests/EventData/ParametersTestHelper.hpp b/Tests/EventData/ParametersTestHelper.hpp
index 5d6d9fbcc..b5acc2acf 100644
--- a/Tests/EventData/ParametersTestHelper.hpp
+++ b/Tests/EventData/ParametersTestHelper.hpp
@@ -10,7 +10,7 @@
#define ACTS_TESTS_EVENTDATA_PARAMETERTESTHELPER_H
#include <boost/test/included/unit_test.hpp>
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
namespace Test {
@@ -40,4 +40,4 @@ namespace Test {
}
}
-#endif
\ No newline at end of file
+#endif
diff --git a/Tests/Extrapolation/ExtrapolationCellTests.cpp b/Tests/Extrapolation/ExtrapolationCellTests.cpp
index 92ed8e3d1..87f9b4a4e 100644
--- a/Tests/Extrapolation/ExtrapolationCellTests.cpp
+++ b/Tests/Extrapolation/ExtrapolationCellTests.cpp
@@ -9,11 +9,11 @@
/// Boost include(s)
#define BOOST_TEST_MODULE ExtrapolationCell Tests
#include <boost/test/included/unit_test.hpp>
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
-#include "ACTS/Material/Material.hpp"
-#include "ACTS/Material/MaterialProperties.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Material/Material.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
+#include "Acts/Utilities/Units.hpp"
namespace Acts {
diff --git a/Tests/Fitter/GainMatrixTests.cpp b/Tests/Fitter/GainMatrixTests.cpp
index 0ed0d7bfe..9538b3831 100644
--- a/Tests/Fitter/GainMatrixTests.cpp
+++ b/Tests/Fitter/GainMatrixTests.cpp
@@ -18,11 +18,11 @@
#include <boost/test/included/unit_test.hpp>
// ATS include(s)
-#include "ACTS/EventData/Measurement.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Fitter/KalmanUpdator.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
+#include "Acts/EventData/Measurement.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Fitter/KalmanUpdator.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
namespace Acts {
namespace Test {
diff --git a/Tests/Fitter/KalmanFilterTestUtils.hpp b/Tests/Fitter/KalmanFilterTestUtils.hpp
index 667a95a87..d3cadb14a 100644
--- a/Tests/Fitter/KalmanFilterTestUtils.hpp
+++ b/Tests/Fitter/KalmanFilterTestUtils.hpp
@@ -15,22 +15,22 @@
#include <memory>
#include <random>
#include <vector>
-#include "ACTS/Detector/TrackingGeometry.hpp"
-#include "ACTS/EventData/Measurement.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
-#include "ACTS/Extrapolation/ExtrapolationEngine.hpp"
-#include "ACTS/Extrapolation/IExtrapolationEngine.hpp"
-#include "ACTS/Extrapolation/MaterialEffectsEngine.hpp"
-#include "ACTS/Extrapolation/RungeKuttaEngine.hpp"
-#include "ACTS/Extrapolation/StaticEngine.hpp"
-#include "ACTS/Extrapolation/StaticNavigationEngine.hpp"
-#include "ACTS/Fitter/KalmanFitter.hpp"
-#include "ACTS/Fitter/KalmanUpdator.hpp"
-#include "ACTS/MagneticField/ConstantBField.hpp"
-#include "ACTS/Surfaces/PerigeeSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Logger.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Detector/TrackingGeometry.hpp"
+#include "Acts/EventData/Measurement.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Extrapolation/ExtrapolationEngine.hpp"
+#include "Acts/Extrapolation/IExtrapolationEngine.hpp"
+#include "Acts/Extrapolation/MaterialEffectsEngine.hpp"
+#include "Acts/Extrapolation/RungeKuttaEngine.hpp"
+#include "Acts/Extrapolation/StaticEngine.hpp"
+#include "Acts/Extrapolation/StaticNavigationEngine.hpp"
+#include "Acts/Fitter/KalmanFitter.hpp"
+#include "Acts/Fitter/KalmanUpdator.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/Surfaces/PerigeeSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/Units.hpp"
// shorthands
using namespace Acts;
diff --git a/Tests/Fitter/KalmanFilterTests.cpp b/Tests/Fitter/KalmanFilterTests.cpp
index 17915a1ce..cdbfbbe31 100644
--- a/Tests/Fitter/KalmanFilterTests.cpp
+++ b/Tests/Fitter/KalmanFilterTests.cpp
@@ -14,20 +14,20 @@
#include <boost/test/included/unit_test.hpp>
// ATS include(s)
-#include "ACTS/Detector/TrackingGeometry.hpp"
-#include "ACTS/Detector/TrackingVolume.hpp"
-#include "ACTS/EventData/Measurement.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Fitter/KalmanUpdator.hpp"
-#include "ACTS/Layers/CylinderLayer.hpp"
-#include "ACTS/Material/Material.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Tools/LayerArrayCreator.hpp"
-#include "ACTS/Tools/LayerCreator.hpp"
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/BinnedArrayXD.hpp"
-#include "ACTS/Utilities/ParameterDefinitions.hpp"
-#include "ACTS/Volumes/CylinderVolumeBounds.hpp"
+#include "Acts/Detector/TrackingGeometry.hpp"
+#include "Acts/Detector/TrackingVolume.hpp"
+#include "Acts/EventData/Measurement.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Fitter/KalmanUpdator.hpp"
+#include "Acts/Layers/CylinderLayer.hpp"
+#include "Acts/Material/Material.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Tools/LayerArrayCreator.hpp"
+#include "Acts/Tools/LayerCreator.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/BinnedArrayXD.hpp"
+#include "Acts/Utilities/ParameterDefinitions.hpp"
+#include "Acts/Volumes/CylinderVolumeBounds.hpp"
#include "KalmanFilterTestUtils.hpp"
diff --git a/Tests/Json/FromJsonTests.cpp b/Tests/Json/FromJsonTests.cpp
index 1f14fedc3..4aa8b00ff 100644
--- a/Tests/Json/FromJsonTests.cpp
+++ b/Tests/Json/FromJsonTests.cpp
@@ -11,17 +11,17 @@
#include <climits>
#include <fstream>
-#include "ACTS/Layers/DiscLayer.hpp"
-#include "ACTS/Layers/ProtoLayer.hpp"
-#include "ACTS/Plugins/JsonPlugin/lib/json.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Tools/LayerCreator.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
-
-#include "ACTS/Plugins/JsonPlugin/FromJson.hpp"
+#include "Acts/Layers/DiscLayer.hpp"
+#include "Acts/Layers/ProtoLayer.hpp"
+#include "Acts/Plugins/JsonPlugin/lib/json.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Tools/LayerCreator.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+
+#include "Acts/Plugins/JsonPlugin/FromJson.hpp"
namespace Acts {
diff --git a/Tests/Layers/ConeLayerTests.cpp b/Tests/Layers/ConeLayerTests.cpp
index d93b5ad9d..708b1d705 100644
--- a/Tests/Layers/ConeLayerTests.cpp
+++ b/Tests/Layers/ConeLayerTests.cpp
@@ -18,13 +18,13 @@
// leave blank line
//#include <limits>
-#include "ACTS/Layers/ConeLayer.hpp"
-#include "ACTS/Surfaces/ConeBounds.hpp"
-//#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/EventData/SingleTrackParameters.hpp"
-#include "ACTS/Layers/GenericApproachDescriptor.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Volumes/CuboidVolumeBounds.hpp"
+#include "Acts/Layers/ConeLayer.hpp"
+#include "Acts/Surfaces/ConeBounds.hpp"
+//#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/EventData/SingleTrackParameters.hpp"
+#include "Acts/Layers/GenericApproachDescriptor.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Volumes/CuboidVolumeBounds.hpp"
#include "LayerStub.hpp"
using boost::test_tools::output_test_stream;
diff --git a/Tests/Layers/CylinderLayerTests.cpp b/Tests/Layers/CylinderLayerTests.cpp
index bd2c1db2f..c2fe04063 100644
--- a/Tests/Layers/CylinderLayerTests.cpp
+++ b/Tests/Layers/CylinderLayerTests.cpp
@@ -18,14 +18,14 @@
// leave blank line
//#include <limits>
-#include "ACTS/Layers/CylinderLayer.hpp"
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-//#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/EventData/SingleTrackParameters.hpp"
-#include "ACTS/Layers/GenericApproachDescriptor.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Volumes/CuboidVolumeBounds.hpp"
+#include "Acts/Layers/CylinderLayer.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+//#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/EventData/SingleTrackParameters.hpp"
+#include "Acts/Layers/GenericApproachDescriptor.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Volumes/CuboidVolumeBounds.hpp"
#include "LayerStub.hpp"
using boost::test_tools::output_test_stream;
diff --git a/Tests/Layers/DiscLayerTests.cpp b/Tests/Layers/DiscLayerTests.cpp
index 51ada50c2..cecc5df9c 100644
--- a/Tests/Layers/DiscLayerTests.cpp
+++ b/Tests/Layers/DiscLayerTests.cpp
@@ -18,15 +18,15 @@
// leave blank line
//#include <limits>
-#include "ACTS/Layers/DiscLayer.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-//#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/EventData/SingleTrackParameters.hpp"
-#include "ACTS/Layers/GenericApproachDescriptor.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Volumes/CuboidVolumeBounds.hpp"
-#include "ACTS/Volumes/CylinderVolumeBounds.hpp"
+#include "Acts/Layers/DiscLayer.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+//#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/EventData/SingleTrackParameters.hpp"
+#include "Acts/Layers/GenericApproachDescriptor.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Volumes/CuboidVolumeBounds.hpp"
+#include "Acts/Volumes/CylinderVolumeBounds.hpp"
#include "LayerStub.hpp"
using boost::test_tools::output_test_stream;
diff --git a/Tests/Layers/GenericApproachDescriptorTests.cpp b/Tests/Layers/GenericApproachDescriptorTests.cpp
index 330c6edb7..a9496cb64 100644
--- a/Tests/Layers/GenericApproachDescriptorTests.cpp
+++ b/Tests/Layers/GenericApproachDescriptorTests.cpp
@@ -18,8 +18,8 @@
// leave blank line
#include "../Surfaces/SurfaceStub.hpp"
-#include "ACTS/Layers/GenericApproachDescriptor.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Layers/GenericApproachDescriptor.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
#include "LayerStub.hpp"
using boost::test_tools::output_test_stream;
diff --git a/Tests/Layers/LayerStub.hpp b/Tests/Layers/LayerStub.hpp
index 297ef4dc5..a026714c8 100644
--- a/Tests/Layers/LayerStub.hpp
+++ b/Tests/Layers/LayerStub.hpp
@@ -9,7 +9,7 @@
#define ACTS_TEST_LAYERSTUB 1
#include "../Surfaces/SurfaceStub.hpp"
-#include "ACTS/Layers/Layer.hpp"
+#include "Acts/Layers/Layer.hpp"
namespace Acts {
/// Layer derived class stub
diff --git a/Tests/Layers/LayerTests.cpp b/Tests/Layers/LayerTests.cpp
index 86415fe53..f2e0a4093 100644
--- a/Tests/Layers/LayerTests.cpp
+++ b/Tests/Layers/LayerTests.cpp
@@ -18,12 +18,12 @@
// leave blank line
//#include <limits>
-#include "ACTS/Layers/Layer.hpp"
-//#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/EventData/SingleTrackParameters.hpp"
-#include "ACTS/Layers/GenericApproachDescriptor.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Volumes/CuboidVolumeBounds.hpp"
+#include "Acts/Layers/Layer.hpp"
+//#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/EventData/SingleTrackParameters.hpp"
+#include "Acts/Layers/GenericApproachDescriptor.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Volumes/CuboidVolumeBounds.hpp"
#include "LayerStub.hpp"
using boost::test_tools::output_test_stream;
diff --git a/Tests/Layers/NavigationLayerTests.cpp b/Tests/Layers/NavigationLayerTests.cpp
index ed5d2cfd3..ecba4aa1b 100644
--- a/Tests/Layers/NavigationLayerTests.cpp
+++ b/Tests/Layers/NavigationLayerTests.cpp
@@ -18,13 +18,13 @@
// leave blank line
//#include <limits>
-#include "ACTS/Layers/NavigationLayer.hpp"
-//#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Volumes/CuboidVolumeBounds.hpp"
+#include "Acts/Layers/NavigationLayer.hpp"
+//#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Volumes/CuboidVolumeBounds.hpp"
#include "LayerStub.hpp"
using boost::test_tools::output_test_stream;
diff --git a/Tests/Layers/PlaneLayerTests.cpp b/Tests/Layers/PlaneLayerTests.cpp
index cf76422b1..8a8ef8254 100644
--- a/Tests/Layers/PlaneLayerTests.cpp
+++ b/Tests/Layers/PlaneLayerTests.cpp
@@ -18,13 +18,13 @@
// leave blank line
//#include <limits>
-#include "ACTS/Layers/PlaneLayer.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-//#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/EventData/SingleTrackParameters.hpp"
-#include "ACTS/Layers/GenericApproachDescriptor.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Volumes/CuboidVolumeBounds.hpp"
+#include "Acts/Layers/PlaneLayer.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+//#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/EventData/SingleTrackParameters.hpp"
+#include "Acts/Layers/GenericApproachDescriptor.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Volumes/CuboidVolumeBounds.hpp"
#include "LayerStub.hpp"
using boost::test_tools::output_test_stream;
diff --git a/Tests/Layers/ProtoLayerTests.cpp b/Tests/Layers/ProtoLayerTests.cpp
index 38f535306..9975ab255 100644
--- a/Tests/Layers/ProtoLayerTests.cpp
+++ b/Tests/Layers/ProtoLayerTests.cpp
@@ -12,7 +12,7 @@
#include <boost/test/data/test_case.hpp>
#include <cmath>
-#include "ACTS/Layers/ProtoLayer.hpp"
+#include "Acts/Layers/ProtoLayer.hpp"
namespace Acts {
diff --git a/Tests/MagneticField/ConstantBFieldTests.cpp b/Tests/MagneticField/ConstantBFieldTests.cpp
index 9b0347309..03ea388e0 100644
--- a/Tests/MagneticField/ConstantBFieldTests.cpp
+++ b/Tests/MagneticField/ConstantBFieldTests.cpp
@@ -12,9 +12,9 @@
// clang-format off
#include <boost/test/included/unit_test.hpp>
#include <boost/test/data/test_case.hpp>
-#include "ACTS/MagneticField/ConstantBField.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
// clang-format on
namespace bdata = boost::unit_test::data;
diff --git a/Tests/MagneticField/InterpolatedBFieldMapTests.cpp b/Tests/MagneticField/InterpolatedBFieldMapTests.cpp
index 2967b8ad9..bbaf670e1 100644
--- a/Tests/MagneticField/InterpolatedBFieldMapTests.cpp
+++ b/Tests/MagneticField/InterpolatedBFieldMapTests.cpp
@@ -10,9 +10,9 @@
#define BOOST_TEST_MODULE Mapped magnetic field tests
#include <boost/test/included/unit_test.hpp>
-#include "ACTS/MagneticField/InterpolatedBFieldMap.hpp"
-#include "ACTS/Utilities/detail/Axis.hpp"
-#include "ACTS/Utilities/detail/Grid.hpp"
+#include "Acts/MagneticField/InterpolatedBFieldMap.hpp"
+#include "Acts/Utilities/detail/Axis.hpp"
+#include "Acts/Utilities/detail/Grid.hpp"
namespace tt = boost::test_tools;
diff --git a/Tests/Material/MaterialPropertiesTests.cpp b/Tests/Material/MaterialPropertiesTests.cpp
index d71d0e46d..543980893 100644
--- a/Tests/Material/MaterialPropertiesTests.cpp
+++ b/Tests/Material/MaterialPropertiesTests.cpp
@@ -10,7 +10,7 @@
#define BOOST_TEST_MODULE Material Tests
#include <boost/test/included/unit_test.hpp>
#include <climits>
-#include "ACTS/Material/MaterialProperties.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
namespace Acts {
diff --git a/Tests/Material/MaterialTests.cpp b/Tests/Material/MaterialTests.cpp
index 5e2868952..c0643ccfc 100644
--- a/Tests/Material/MaterialTests.cpp
+++ b/Tests/Material/MaterialTests.cpp
@@ -10,7 +10,7 @@
#define BOOST_TEST_MODULE Material Tests
#include <boost/test/included/unit_test.hpp>
#include <climits>
-#include "ACTS/Material/Material.hpp"
+#include "Acts/Material/Material.hpp"
namespace Acts {
diff --git a/Tests/MaterialMapping/MaterialMappingTests.cpp b/Tests/MaterialMapping/MaterialMappingTests.cpp
index 5665687ea..88a0c7f9e 100644
--- a/Tests/MaterialMapping/MaterialMappingTests.cpp
+++ b/Tests/MaterialMapping/MaterialMappingTests.cpp
@@ -10,10 +10,10 @@
#define BOOST_TEST_MODULE MaterialMapper Tests
#include <boost/test/included/unit_test.hpp>
#include <climits>
-#include "ACTS/Material/MaterialProperties.hpp"
-#include "ACTS/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp"
-#include "ACTS/Plugins/MaterialPlugins/MaterialMapper.hpp"
-#include "ACTS/Plugins/MaterialPlugins/MaterialStep.hpp"
+#include "Acts/Material/MaterialProperties.hpp"
+#include "Acts/Plugins/MaterialPlugins/AssignedMaterialSteps.hpp"
+#include "Acts/Plugins/MaterialPlugins/MaterialMapper.hpp"
+#include "Acts/Plugins/MaterialPlugins/MaterialStep.hpp"
namespace Acts {
diff --git a/Tests/Propagator/AbortListTests.cpp b/Tests/Propagator/AbortListTests.cpp
index 31404b6a4..5300bdef4 100644
--- a/Tests/Propagator/AbortListTests.cpp
+++ b/Tests/Propagator/AbortListTests.cpp
@@ -18,11 +18,11 @@
#include <boost/test/output_test_stream.hpp>
// leave blank line
-#include "ACTS/Propagator/AbortList.hpp"
-#include "ACTS/Propagator/detail/Extendable.hpp"
-#include "ACTS/Propagator/detail/standard_abort_conditions.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Propagator/AbortList.hpp"
+#include "Acts/Propagator/detail/Extendable.hpp"
+#include "Acts/Propagator/detail/standard_abort_conditions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
namespace bdata = boost::unit_test::data;
namespace tt = boost::test_tools;
@@ -88,4 +88,4 @@ namespace Test {
}
} // namespace Test
-} // namespace Acts
\ No newline at end of file
+} // namespace Acts
diff --git a/Tests/Propagator/ActionListTests.cpp b/Tests/Propagator/ActionListTests.cpp
index c82c7eb46..80dccdec1 100644
--- a/Tests/Propagator/ActionListTests.cpp
+++ b/Tests/Propagator/ActionListTests.cpp
@@ -18,15 +18,15 @@
#include <boost/test/output_test_stream.hpp>
// leave blank line
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/MagneticField/ConstantBField.hpp"
-#include "ACTS/Propagator/ActionList.hpp"
-#include "ACTS/Propagator/EigenStepper.hpp"
-#include "ACTS/Propagator/Propagator.hpp"
-#include "ACTS/Propagator/detail/standard_abort_conditions.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/EigenStepper.hpp"
+#include "Acts/Propagator/Propagator.hpp"
+#include "Acts/Propagator/detail/standard_abort_conditions.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
namespace bdata = boost::unit_test::data;
namespace tt = boost::test_tools;
@@ -156,4 +156,4 @@ namespace Test {
}
} // namespace Test
-} // namespace Acts
\ No newline at end of file
+} // namespace Acts
diff --git a/Tests/Propagator/AtlasPropagatorBenchmark.cpp b/Tests/Propagator/AtlasPropagatorBenchmark.cpp
index b83750c1d..54bc5831d 100644
--- a/Tests/Propagator/AtlasPropagatorBenchmark.cpp
+++ b/Tests/Propagator/AtlasPropagatorBenchmark.cpp
@@ -8,12 +8,12 @@
#include <boost/program_options.hpp>
#include <iostream>
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/RungeKuttaEngine.hpp"
-#include "ACTS/MagneticField/ConstantBField.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Utilities/Logger.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/RungeKuttaEngine.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/Units.hpp"
namespace po = boost::program_options;
using namespace Acts;
diff --git a/Tests/Propagator/AtlasStepperBenchmark.cpp b/Tests/Propagator/AtlasStepperBenchmark.cpp
index 476dfe469..85d6ca5b2 100644
--- a/Tests/Propagator/AtlasStepperBenchmark.cpp
+++ b/Tests/Propagator/AtlasStepperBenchmark.cpp
@@ -8,12 +8,12 @@
#include <boost/program_options.hpp>
#include <iostream>
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/MagneticField/ConstantBField.hpp"
-#include "ACTS/Propagator/AtlasStepper.hpp"
-#include "ACTS/Propagator/Propagator.hpp"
-#include "ACTS/Utilities/Logger.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/Propagator/AtlasStepper.hpp"
+#include "Acts/Propagator/Propagator.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/Units.hpp"
namespace po = boost::program_options;
using namespace Acts;
diff --git a/Tests/Propagator/EigenStepperBenchmark.cpp b/Tests/Propagator/EigenStepperBenchmark.cpp
index 23929cc17..599b2682e 100644
--- a/Tests/Propagator/EigenStepperBenchmark.cpp
+++ b/Tests/Propagator/EigenStepperBenchmark.cpp
@@ -8,12 +8,12 @@
#include <boost/program_options.hpp>
#include <iostream>
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/MagneticField/ConstantBField.hpp"
-#include "ACTS/Propagator/EigenStepper.hpp"
-#include "ACTS/Propagator/Propagator.hpp"
-#include "ACTS/Utilities/Logger.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/Propagator/EigenStepper.hpp"
+#include "Acts/Propagator/Propagator.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/Units.hpp"
namespace po = boost::program_options;
using namespace Acts;
diff --git a/Tests/Propagator/ExtendableTests.cpp b/Tests/Propagator/ExtendableTests.cpp
index dc99b693c..1d299351d 100644
--- a/Tests/Propagator/ExtendableTests.cpp
+++ b/Tests/Propagator/ExtendableTests.cpp
@@ -18,7 +18,7 @@
#include <boost/test/output_test_stream.hpp>
// leave blank line
-#include "ACTS/Propagator/detail/Extendable.hpp"
+#include "Acts/Propagator/detail/Extendable.hpp"
namespace bdata = boost::unit_test::data;
namespace tt = boost::test_tools;
@@ -58,4 +58,4 @@ namespace Test {
}
} // namespace Test
-} // namespace Acts
\ No newline at end of file
+} // namespace Acts
diff --git a/Tests/Propagator/JacobianTests.cpp b/Tests/Propagator/JacobianTests.cpp
index 1e5148e7d..03417515a 100644
--- a/Tests/Propagator/JacobianTests.cpp
+++ b/Tests/Propagator/JacobianTests.cpp
@@ -18,16 +18,16 @@
#include <boost/test/output_test_stream.hpp>
// leave blank line
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/detail/RungeKuttaUtils.hpp"
-#include "ACTS/MagneticField/ConstantBField.hpp"
-#include "ACTS/Propagator/AtlasStepper.hpp"
-#include "ACTS/Propagator/EigenStepper.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Surfaces/DiscSurface.hpp"
-#include "ACTS/Surfaces/PerigeeSurface.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/StrawSurface.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/detail/RungeKuttaUtils.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/Propagator/AtlasStepper.hpp"
+#include "Acts/Propagator/EigenStepper.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/PerigeeSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/StrawSurface.hpp"
namespace bdata = boost::unit_test::data;
namespace tt = boost::test_tools;
diff --git a/Tests/Propagator/PropagatorTests.cpp b/Tests/Propagator/PropagatorTests.cpp
index 514f78525..82b709d63 100644
--- a/Tests/Propagator/PropagatorTests.cpp
+++ b/Tests/Propagator/PropagatorTests.cpp
@@ -18,15 +18,15 @@
#include <boost/test/output_test_stream.hpp>
// leave blank line
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/MagneticField/ConstantBField.hpp"
-#include "ACTS/Propagator/ActionList.hpp"
-#include "ACTS/Propagator/EigenStepper.hpp"
-#include "ACTS/Propagator/Propagator.hpp"
-#include "ACTS/Propagator/detail/standard_abort_conditions.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/EigenStepper.hpp"
+#include "Acts/Propagator/Propagator.hpp"
+#include "Acts/Propagator/detail/standard_abort_conditions.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
namespace bdata = boost::unit_test::data;
namespace tt = boost::test_tools;
diff --git a/Tests/Propagator/RungeKuttaEngineTests.cpp b/Tests/Propagator/RungeKuttaEngineTests.cpp
index bc885e78e..36e0938c9 100644
--- a/Tests/Propagator/RungeKuttaEngineTests.cpp
+++ b/Tests/Propagator/RungeKuttaEngineTests.cpp
@@ -18,17 +18,17 @@
#include <boost/test/output_test_stream.hpp>
// leave blank line
-#include "ACTS/EventData/NeutralParameters.hpp"
-#include "ACTS/EventData/TrackParameters.hpp"
-#include "ACTS/Extrapolation/ExtrapolationCell.hpp"
-#include "ACTS/Extrapolation/RungeKuttaEngine.hpp"
-#include "ACTS/MagneticField/ConstantBField.hpp"
-#include "ACTS/MagneticField/InterpolatedBFieldMap.hpp"
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Surfaces/PerigeeSurface.hpp"
-#include "ACTS/Utilities/Units.hpp"
-#include "ACTS/Utilities/detail/Axis.hpp"
-#include "ACTS/Utilities/detail/Grid.hpp"
+#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Extrapolation/ExtrapolationCell.hpp"
+#include "Acts/Extrapolation/RungeKuttaEngine.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/MagneticField/InterpolatedBFieldMap.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/PerigeeSurface.hpp"
+#include "Acts/Utilities/Units.hpp"
+#include "Acts/Utilities/detail/Axis.hpp"
+#include "Acts/Utilities/detail/Grid.hpp"
namespace bdata = boost::unit_test::data;
namespace tt = boost::test_tools;
diff --git a/Tests/Seeding/SeedingTests.cpp b/Tests/Seeding/SeedingTests.cpp
index b9df8f54d..54f74ef54 100644
--- a/Tests/Seeding/SeedingTests.cpp
+++ b/Tests/Seeding/SeedingTests.cpp
@@ -11,9 +11,9 @@
#define BOOST_TEST_MODULE Seeding Tests
#include <boost/test/included/unit_test.hpp>
-#include "ACTS/Seeding/BarrelSeedFinder.hpp"
-#include "ACTS/Seeding/SpacePoint.hpp"
-#include "ACTS/Seeding/TrackSeed.hpp"
+#include "Acts/Seeding/BarrelSeedFinder.hpp"
+#include "Acts/Seeding/SpacePoint.hpp"
+#include "Acts/Seeding/TrackSeed.hpp"
#include "SeedingTestsCommon.hpp"
using namespace Acts::Seeding;
diff --git a/Tests/Seeding/SeedingTestsCommon.hpp b/Tests/Seeding/SeedingTestsCommon.hpp
index 0d4210d3b..454c12630 100644
--- a/Tests/Seeding/SeedingTestsCommon.hpp
+++ b/Tests/Seeding/SeedingTestsCommon.hpp
@@ -10,8 +10,8 @@
#include <iostream>
-#include "ACTS/Seeding/SpacePoint.hpp"
-#include "ACTS/Seeding/TrackSeed.hpp"
+#include "Acts/Seeding/SpacePoint.hpp"
+#include "Acts/Seeding/TrackSeed.hpp"
/// Construct barrel layer w/ n points equidistant in phi.
///
diff --git a/Tests/Seeding/SeedingToolsTests.cpp b/Tests/Seeding/SeedingToolsTests.cpp
index 663696f38..1b0a2647e 100644
--- a/Tests/Seeding/SeedingToolsTests.cpp
+++ b/Tests/Seeding/SeedingToolsTests.cpp
@@ -14,9 +14,9 @@
#include <boost/test/data/test_case.hpp>
// clang-format on
-#include "ACTS/Seeding/SpacePoint.hpp"
-#include "ACTS/Seeding/detail/cyclic_range.hpp"
-#include "ACTS/Seeding/detail/geometry.hpp"
+#include "Acts/Seeding/SpacePoint.hpp"
+#include "Acts/Seeding/detail/cyclic_range.hpp"
+#include "Acts/Seeding/detail/geometry.hpp"
#include "SeedingTestsCommon.hpp"
namespace data = boost::unit_test::data;
diff --git a/Tests/Surfaces/BoundaryCheckBenchmark.cpp b/Tests/Surfaces/BoundaryCheckBenchmark.cpp
index 3e011dacc..aed01017d 100644
--- a/Tests/Surfaces/BoundaryCheckBenchmark.cpp
+++ b/Tests/Surfaces/BoundaryCheckBenchmark.cpp
@@ -13,9 +13,9 @@
#include <random>
#include <vector>
-#include <ACTS/Surfaces/BoundaryCheck.hpp>
-#include <ACTS/Utilities/Definitions.hpp>
-#include <ACTS/Utilities/Units.hpp>
+#include "Acts/Surfaces/BoundaryCheck.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
using namespace Acts;
diff --git a/Tests/Surfaces/BoundaryCheckTests.cpp b/Tests/Surfaces/BoundaryCheckTests.cpp
index 15c791f65..9f157e0dc 100644
--- a/Tests/Surfaces/BoundaryCheckTests.cpp
+++ b/Tests/Surfaces/BoundaryCheckTests.cpp
@@ -17,9 +17,9 @@
#include <boost/test/output_test_stream.hpp>
// leave blank line
-#include "ACTS/Surfaces/BoundaryCheck.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Surfaces/BoundaryCheck.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Units.hpp"
namespace Acts {
namespace Test {
diff --git a/Tests/Surfaces/ConeBoundsTests.cpp b/Tests/Surfaces/ConeBoundsTests.cpp
index b4242b491..43e46c342 100644
--- a/Tests/Surfaces/ConeBoundsTests.cpp
+++ b/Tests/Surfaces/ConeBoundsTests.cpp
@@ -18,9 +18,9 @@
// leave blank line
//
-#include "ACTS/Surfaces/ConeBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/ConeBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
//
#include <limits>
diff --git a/Tests/Surfaces/ConeSurfaceTests.cpp b/Tests/Surfaces/ConeSurfaceTests.cpp
index eb446838a..4b6704bde 100644
--- a/Tests/Surfaces/ConeSurfaceTests.cpp
+++ b/Tests/Surfaces/ConeSurfaceTests.cpp
@@ -19,10 +19,10 @@
//
#include <limits>
-#include "ACTS/Surfaces/ConeSurface.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/ConeSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
namespace tt = boost::test_tools;
using boost::test_tools::output_test_stream;
diff --git a/Tests/Surfaces/CylinderBoundsTests.cpp b/Tests/Surfaces/CylinderBoundsTests.cpp
index dbace02f2..d06b9e47a 100644
--- a/Tests/Surfaces/CylinderBoundsTests.cpp
+++ b/Tests/Surfaces/CylinderBoundsTests.cpp
@@ -18,9 +18,9 @@
// leave blank line
//
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
//
#include <limits>
diff --git a/Tests/Surfaces/CylinderSurfaceTests.cpp b/Tests/Surfaces/CylinderSurfaceTests.cpp
index 4676ff1f5..a7b35ae07 100644
--- a/Tests/Surfaces/CylinderSurfaceTests.cpp
+++ b/Tests/Surfaces/CylinderSurfaceTests.cpp
@@ -19,10 +19,10 @@
//
#include <limits>
-#include "ACTS/Surfaces/CylinderSurface.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
#include "DetectorElementStub.hpp"
namespace tt = boost::test_tools;
diff --git a/Tests/Surfaces/DetectorElementStub.hpp b/Tests/Surfaces/DetectorElementStub.hpp
index e318e6aea..613b7a462 100644
--- a/Tests/Surfaces/DetectorElementStub.hpp
+++ b/Tests/Surfaces/DetectorElementStub.hpp
@@ -14,14 +14,14 @@
#define ACTS_TEST_DetectorElementStub_DetectorElementStub 1
// Algebra and Identifier
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Identifier.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Identifier.hpp"
// Geometry module
-#include "ACTS/Detector/DetectorElementBase.hpp"
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
+#include "Acts/Detector/DetectorElementBase.hpp"
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
#include "LineSurfaceStub.hpp"
-//#include "ACTS/Surfaces/DiscSurface.hpp"
+//#include "Acts/Surfaces/DiscSurface.hpp"
namespace Acts {
diff --git a/Tests/Surfaces/DiamondBoundsTests.cpp b/Tests/Surfaces/DiamondBoundsTests.cpp
index 39769a395..54a8ec031 100644
--- a/Tests/Surfaces/DiamondBoundsTests.cpp
+++ b/Tests/Surfaces/DiamondBoundsTests.cpp
@@ -18,10 +18,10 @@
// leave blank
//
-#include "ACTS/Surfaces/DiamondBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/ThrowAssert.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/DiamondBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+#include "Acts/Utilities/VariantData.hpp"
//
#include <limits>
diff --git a/Tests/Surfaces/DiscSurfaceTests.cpp b/Tests/Surfaces/DiscSurfaceTests.cpp
index 3b418630a..31a5b4e8c 100644
--- a/Tests/Surfaces/DiscSurfaceTests.cpp
+++ b/Tests/Surfaces/DiscSurfaceTests.cpp
@@ -18,12 +18,12 @@
// leave blank line
//
-#include "ACTS/Material/HomogeneousSurfaceMaterial.hpp"
-#include "ACTS/Surfaces/DiscSurface.hpp"
-#include "ACTS/Surfaces/DiscTrapezoidalBounds.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/DiscTrapezoidalBounds.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
//
#include "DetectorElementStub.hpp"
//
diff --git a/Tests/Surfaces/DiscTrapezoidalBoundsTests.cpp b/Tests/Surfaces/DiscTrapezoidalBoundsTests.cpp
index e3612a00f..fe4e6dbad 100644
--- a/Tests/Surfaces/DiscTrapezoidalBoundsTests.cpp
+++ b/Tests/Surfaces/DiscTrapezoidalBoundsTests.cpp
@@ -18,9 +18,9 @@
// leave blank
//
-#include "ACTS/Surfaces/DiscTrapezoidalBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/DiscTrapezoidalBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
#include <limits>
diff --git a/Tests/Surfaces/EllipseBoundsTests.cpp b/Tests/Surfaces/EllipseBoundsTests.cpp
index e7b82272b..cb0f94a3b 100644
--- a/Tests/Surfaces/EllipseBoundsTests.cpp
+++ b/Tests/Surfaces/EllipseBoundsTests.cpp
@@ -18,9 +18,9 @@
// leave blank
//
-#include "ACTS/Surfaces/EllipseBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/EllipseBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
//
#include <limits>
diff --git a/Tests/Surfaces/InfiniteBoundsTests.cpp b/Tests/Surfaces/InfiniteBoundsTests.cpp
index ab6dcd4cd..27efb9179 100644
--- a/Tests/Surfaces/InfiniteBoundsTests.cpp
+++ b/Tests/Surfaces/InfiniteBoundsTests.cpp
@@ -18,8 +18,8 @@
// leave blank line
//
-#include "ACTS/Surfaces/InfiniteBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Surfaces/InfiniteBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
diff --git a/Tests/Surfaces/LineBoundsTests.cpp b/Tests/Surfaces/LineBoundsTests.cpp
index ea53ebf69..4449877c6 100644
--- a/Tests/Surfaces/LineBoundsTests.cpp
+++ b/Tests/Surfaces/LineBoundsTests.cpp
@@ -18,8 +18,8 @@
// leave blank line
//
-#include "ACTS/Surfaces/LineBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Surfaces/LineBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace Acts {
diff --git a/Tests/Surfaces/LineSurfaceStub.hpp b/Tests/Surfaces/LineSurfaceStub.hpp
index ed2bf5383..476821f18 100644
--- a/Tests/Surfaces/LineSurfaceStub.hpp
+++ b/Tests/Surfaces/LineSurfaceStub.hpp
@@ -9,9 +9,9 @@
#define ACTS_TESTS_SURFACES_LINESURFACESTUB 1
//
-#include "ACTS/Surfaces/LineSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantDataFwd.hpp"
+#include "Acts/Surfaces/LineSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantDataFwd.hpp"
//
//
#include <limits>
diff --git a/Tests/Surfaces/LineSurfaceTests.cpp b/Tests/Surfaces/LineSurfaceTests.cpp
index c4e675d8a..87dd05ee4 100644
--- a/Tests/Surfaces/LineSurfaceTests.cpp
+++ b/Tests/Surfaces/LineSurfaceTests.cpp
@@ -18,10 +18,10 @@
// leave blank line
//
-#include "ACTS/Material/HomogeneousSurfaceMaterial.hpp"
-#include "ACTS/Surfaces/LineSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
+#include "Acts/Surfaces/LineSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
//
#include "DetectorElementStub.hpp"
#include "LineSurfaceStub.hpp"
diff --git a/Tests/Surfaces/PerigeeSurfaceTests.cpp b/Tests/Surfaces/PerigeeSurfaceTests.cpp
index 9bbfd53ed..2b54f8e89 100644
--- a/Tests/Surfaces/PerigeeSurfaceTests.cpp
+++ b/Tests/Surfaces/PerigeeSurfaceTests.cpp
@@ -19,13 +19,13 @@
//
#include <limits>
-#include "ACTS/Layers/PlaneLayer.hpp"
-#include "ACTS/Material/HomogeneousSurfaceMaterial.hpp"
-#include "ACTS/Surfaces/InfiniteBounds.hpp" //to get s_noBounds
-#include "ACTS/Surfaces/PerigeeSurface.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp" //to get s_noBounds
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Layers/PlaneLayer.hpp"
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
+#include "Acts/Surfaces/InfiniteBounds.hpp" //to get s_noBounds
+#include "Acts/Surfaces/PerigeeSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp" //to get s_noBounds
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
using boost::test_tools::output_test_stream;
namespace utf = boost::unit_test;
diff --git a/Tests/Surfaces/PlaneSurfaceTests.cpp b/Tests/Surfaces/PlaneSurfaceTests.cpp
index 90cdcb04a..73b60b9b2 100644
--- a/Tests/Surfaces/PlaneSurfaceTests.cpp
+++ b/Tests/Surfaces/PlaneSurfaceTests.cpp
@@ -18,11 +18,11 @@
// leave blank line
#include <limits>
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/TriangleBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/TriangleBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
#include "DetectorElementStub.hpp"
namespace tt = boost::test_tools;
diff --git a/Tests/Surfaces/RadialBoundsTests.cpp b/Tests/Surfaces/RadialBoundsTests.cpp
index 54f648e6f..e16ab6df3 100644
--- a/Tests/Surfaces/RadialBoundsTests.cpp
+++ b/Tests/Surfaces/RadialBoundsTests.cpp
@@ -18,9 +18,9 @@
// leave blank
//
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
//
#include <limits>
diff --git a/Tests/Surfaces/RectangleBoundsTests.cpp b/Tests/Surfaces/RectangleBoundsTests.cpp
index e3298b61d..daa491d98 100644
--- a/Tests/Surfaces/RectangleBoundsTests.cpp
+++ b/Tests/Surfaces/RectangleBoundsTests.cpp
@@ -19,9 +19,9 @@
#include <algorithm>
#include <limits>
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
namespace utf = boost::unit_test;
const double inf = std::numeric_limits<double>::infinity();
diff --git a/Tests/Surfaces/StrawSurfaceTests.cpp b/Tests/Surfaces/StrawSurfaceTests.cpp
index 4c257399e..199553e3e 100644
--- a/Tests/Surfaces/StrawSurfaceTests.cpp
+++ b/Tests/Surfaces/StrawSurfaceTests.cpp
@@ -18,12 +18,12 @@
// leave blank line
#include <limits>
-#include "ACTS/Layers/PlaneLayer.hpp"
-#include "ACTS/Material/HomogeneousSurfaceMaterial.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/StrawSurface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Layers/PlaneLayer.hpp"
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/StrawSurface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
#include "DetectorElementStub.hpp"
using boost::test_tools::output_test_stream;
diff --git a/Tests/Surfaces/SurfaceArrayTests.cpp b/Tests/Surfaces/SurfaceArrayTests.cpp
index b339f17b4..b96c4cdd0 100644
--- a/Tests/Surfaces/SurfaceArrayTests.cpp
+++ b/Tests/Surfaces/SurfaceArrayTests.cpp
@@ -12,17 +12,17 @@
#include <boost/format.hpp>
#include <boost/test/data/test_case.hpp>
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Surfaces/SurfaceArray.hpp"
-#include "ACTS/Tools/LayerCreator.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Utilities/BinningType.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
-#include "ACTS/Utilities/detail/Grid.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/SurfaceArray.hpp"
+#include "Acts/Tools/LayerCreator.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+#include "Acts/Utilities/detail/Grid.hpp"
namespace bdata = boost::unit_test::data;
namespace tt = boost::test_tools;
diff --git a/Tests/Surfaces/SurfaceBoundsTests.cpp b/Tests/Surfaces/SurfaceBoundsTests.cpp
index 646bdf98a..56688e41c 100644
--- a/Tests/Surfaces/SurfaceBoundsTests.cpp
+++ b/Tests/Surfaces/SurfaceBoundsTests.cpp
@@ -18,9 +18,9 @@
// leave blank line
//
-#include "ACTS/Surfaces/SurfaceBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/SurfaceBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
namespace Acts {
diff --git a/Tests/Surfaces/SurfaceStub.hpp b/Tests/Surfaces/SurfaceStub.hpp
index 41e728d66..415536b19 100644
--- a/Tests/Surfaces/SurfaceStub.hpp
+++ b/Tests/Surfaces/SurfaceStub.hpp
@@ -8,11 +8,11 @@
#ifndef ACTS_TEST_SURFACESTUB
#define ACTS_TEST_SURFACESTUB 1
-#include "ACTS/Surfaces/InfiniteBounds.hpp" //to get s_noBounds
-#include "ACTS/Surfaces/PlanarBounds.hpp"
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/InfiniteBounds.hpp" //to get s_noBounds
+#include "Acts/Surfaces/PlanarBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
namespace Acts {
/// Surface derived class stub
diff --git a/Tests/Surfaces/SurfaceTests.cpp b/Tests/Surfaces/SurfaceTests.cpp
index 86bba82fd..0bb9fde21 100644
--- a/Tests/Surfaces/SurfaceTests.cpp
+++ b/Tests/Surfaces/SurfaceTests.cpp
@@ -18,12 +18,12 @@
// leave blank line
#include <limits>
-#include "ACTS/Layers/PlaneLayer.hpp"
-#include "ACTS/Material/HomogeneousSurfaceMaterial.hpp"
-#include "ACTS/Surfaces/InfiniteBounds.hpp" //to get s_noBounds
-#include "ACTS/Surfaces/RectangleBounds.hpp" //to get s_noBounds
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Layers/PlaneLayer.hpp"
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
+#include "Acts/Surfaces/InfiniteBounds.hpp" //to get s_noBounds
+#include "Acts/Surfaces/RectangleBounds.hpp" //to get s_noBounds
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
#include "DetectorElementStub.hpp"
#include "SurfaceStub.hpp"
diff --git a/Tests/Surfaces/TrapezoidBoundsTests.cpp b/Tests/Surfaces/TrapezoidBoundsTests.cpp
index a27b08a07..76916913b 100644
--- a/Tests/Surfaces/TrapezoidBoundsTests.cpp
+++ b/Tests/Surfaces/TrapezoidBoundsTests.cpp
@@ -19,9 +19,9 @@
#include <limits>
-#include "ACTS/Surfaces/TrapezoidBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
namespace utf = boost::unit_test;
const double NaN = std::numeric_limits<double>::quiet_NaN();
diff --git a/Tests/Surfaces/TriangleBoundsTests.cpp b/Tests/Surfaces/TriangleBoundsTests.cpp
index 6d56908c7..5d5182cc3 100644
--- a/Tests/Surfaces/TriangleBoundsTests.cpp
+++ b/Tests/Surfaces/TriangleBoundsTests.cpp
@@ -19,9 +19,9 @@
#include <limits>
-#include "ACTS/Surfaces/TriangleBounds.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
+#include "Acts/Surfaces/TriangleBounds.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/VariantData.hpp"
namespace utf = boost::unit_test;
// const double NaN = std::numeric_limits<double>::quiet_NaN();
diff --git a/Tests/Tools/CylinderVolumeBuilderTests.cpp b/Tests/Tools/CylinderVolumeBuilderTests.cpp
index 2ee5f49b6..0002d93d1 100644
--- a/Tests/Tools/CylinderVolumeBuilderTests.cpp
+++ b/Tests/Tools/CylinderVolumeBuilderTests.cpp
@@ -10,8 +10,8 @@
#include <boost/test/included/unit_test.hpp>
#include <boost/test/data/test_case.hpp>
-#include "ACTS/Tools/CylinderVolumeBuilder.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Tools/CylinderVolumeBuilder.hpp"
+#include "Acts/Utilities/Definitions.hpp"
namespace bdata = boost::unit_test::data;
namespace tt = boost::test_tools;
diff --git a/Tests/Tools/LayerCreatorTests.cpp b/Tests/Tools/LayerCreatorTests.cpp
index fa57b033a..5f4c97f5b 100644
--- a/Tests/Tools/LayerCreatorTests.cpp
+++ b/Tests/Tools/LayerCreatorTests.cpp
@@ -12,19 +12,19 @@
#include <boost/format.hpp>
#include <boost/test/data/test_case.hpp>
-#include "ACTS/Layers/CylinderLayer.hpp"
-#include "ACTS/Layers/DiscLayer.hpp"
-#include "ACTS/Layers/ProtoLayer.hpp"
-#include "ACTS/Surfaces/CylinderBounds.hpp"
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RadialBounds.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Tools/LayerCreator.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Utilities/BinningType.hpp"
-#include "ACTS/Utilities/VariantData.hpp"
-
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Layers/CylinderLayer.hpp"
+#include "Acts/Layers/DiscLayer.hpp"
+#include "Acts/Layers/ProtoLayer.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Tools/LayerCreator.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/VariantData.hpp"
+
+#include "Acts/Utilities/Definitions.hpp"
#include <fstream>
#include <random>
diff --git a/Tests/Tools/SurfaceArrayCreatorTests.cpp b/Tests/Tools/SurfaceArrayCreatorTests.cpp
index 2b3983ff2..306e2aba5 100644
--- a/Tests/Tools/SurfaceArrayCreatorTests.cpp
+++ b/Tests/Tools/SurfaceArrayCreatorTests.cpp
@@ -12,12 +12,12 @@
#include <boost/format.hpp>
#include <boost/test/data/test_case.hpp>
-#include "ACTS/Surfaces/PlaneSurface.hpp"
-#include "ACTS/Surfaces/RectangleBounds.hpp"
-#include "ACTS/Tools/SurfaceArrayCreator.hpp"
-#include "ACTS/Utilities/BinningType.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Tools/SurfaceArrayCreator.hpp"
+#include "Acts/Utilities/BinningType.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Definitions.hpp"
#include <fstream>
#include <random>
diff --git a/Tests/Utilities/AxesTests.cpp b/Tests/Utilities/AxesTests.cpp
index 8ba0b4198..2199c15b4 100644
--- a/Tests/Utilities/AxesTests.cpp
+++ b/Tests/Utilities/AxesTests.cpp
@@ -9,7 +9,7 @@
#define BOOST_TEST_MODULE grid axis tests
#include <boost/test/included/unit_test.hpp>
-#include "ACTS/Utilities/detail/Axis.hpp"
+#include "Acts/Utilities/detail/Axis.hpp"
namespace Acts {
diff --git a/Tests/Utilities/BFieldMapUtilsTests.cpp b/Tests/Utilities/BFieldMapUtilsTests.cpp
index ba7d29365..621e4f50c 100644
--- a/Tests/Utilities/BFieldMapUtilsTests.cpp
+++ b/Tests/Utilities/BFieldMapUtilsTests.cpp
@@ -11,8 +11,8 @@
#include <boost/test/included/unit_test.hpp>
#include <boost/test/data/test_case.hpp>
-#include "ACTS/Utilities/BFieldMapUtils.hpp"
-#include "ACTS/Utilities/detail/Axis.hpp"
+#include "Acts/Utilities/BFieldMapUtils.hpp"
+#include "Acts/Utilities/detail/Axis.hpp"
namespace bdata = boost::unit_test::data;
diff --git a/Tests/Utilities/BinUtilityTests.cpp b/Tests/Utilities/BinUtilityTests.cpp
index 20404a16e..affa47f44 100644
--- a/Tests/Utilities/BinUtilityTests.cpp
+++ b/Tests/Utilities/BinUtilityTests.cpp
@@ -9,9 +9,9 @@
// Boost include(s)
#define BOOST_TEST_MODULE BinUtility Tests
#include <boost/test/included/unit_test.hpp>
-#include "ACTS/Utilities/BinUtility.hpp"
-#include "ACTS/Utilities/BinningData.hpp"
-#include "ACTS/Utilities/BinningType.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/BinningData.hpp"
+#include "Acts/Utilities/BinningType.hpp"
namespace Acts {
namespace Test {
diff --git a/Tests/Utilities/BinningDataTests.cpp b/Tests/Utilities/BinningDataTests.cpp
index 2b59b81ce..6829f268b 100644
--- a/Tests/Utilities/BinningDataTests.cpp
+++ b/Tests/Utilities/BinningDataTests.cpp
@@ -10,8 +10,8 @@
#define BOOST_TEST_MODULE BinningData Tests
#include <boost/test/included/unit_test.hpp>
#include <cmath>
-#include "ACTS/Utilities/BinningData.hpp"
-#include "ACTS/Utilities/BinningType.hpp"
+#include "Acts/Utilities/BinningData.hpp"
+#include "Acts/Utilities/BinningType.hpp"
namespace Acts {
namespace Test {
diff --git a/Tests/Utilities/GeometryIDTests.cpp b/Tests/Utilities/GeometryIDTests.cpp
index 34845c7d5..6794876f5 100644
--- a/Tests/Utilities/GeometryIDTests.cpp
+++ b/Tests/Utilities/GeometryIDTests.cpp
@@ -9,8 +9,8 @@
// Boost include(s)
#define BOOST_TEST_MODULE GeometryID Tests
#include <boost/test/included/unit_test.hpp>
-#include "ACTS/Utilities/GeometryID.hpp"
-#include "ACTS/Utilities/Helpers.hpp"
+#include "Acts/Utilities/GeometryID.hpp"
+#include "Acts/Utilities/Helpers.hpp"
namespace Acts {
namespace Test {
diff --git a/Tests/Utilities/GridTests.cpp b/Tests/Utilities/GridTests.cpp
index 92f6ca886..9b2be9d99 100644
--- a/Tests/Utilities/GridTests.cpp
+++ b/Tests/Utilities/GridTests.cpp
@@ -11,9 +11,9 @@
#include <chrono>
#include <random>
-#include "ACTS/Utilities/concept/AnyGrid.hpp"
-#include "ACTS/Utilities/detail/Axis.hpp"
-#include "ACTS/Utilities/detail/Grid.hpp"
+#include "Acts/Utilities/concept/AnyGrid.hpp"
+#include "Acts/Utilities/detail/Axis.hpp"
+#include "Acts/Utilities/detail/Grid.hpp"
namespace Acts {
diff --git a/Tests/Utilities/InterpolationTests.cpp b/Tests/Utilities/InterpolationTests.cpp
index 3dd270358..fb3e32227 100644
--- a/Tests/Utilities/InterpolationTests.cpp
+++ b/Tests/Utilities/InterpolationTests.cpp
@@ -9,9 +9,9 @@
#define BOOST_TEST_MODULE interpolation tests
#include <boost/test/included/unit_test.hpp>
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/Interpolation.hpp"
-#include "ACTS/Utilities/detail/interpolation_impl.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/Interpolation.hpp"
+#include "Acts/Utilities/detail/interpolation_impl.hpp"
namespace Acts {
diff --git a/Tests/Utilities/LoggerTests.cpp b/Tests/Utilities/LoggerTests.cpp
index 3dda14146..c15e25214 100644
--- a/Tests/Utilities/LoggerTests.cpp
+++ b/Tests/Utilities/LoggerTests.cpp
@@ -12,7 +12,7 @@
#include <boost/test/included/unit_test.hpp>
#include <fstream>
#include <string>
-#include "ACTS/Utilities/Logger.hpp"
+#include "Acts/Utilities/Logger.hpp"
namespace Acts {
namespace Test {
diff --git a/Tests/Utilities/MPLTests.cpp b/Tests/Utilities/MPLTests.cpp
index af1b07c8a..3b7083215 100644
--- a/Tests/Utilities/MPLTests.cpp
+++ b/Tests/Utilities/MPLTests.cpp
@@ -13,14 +13,14 @@
#include <boost/mpl/vector.hpp>
#include <boost/test/included/unit_test.hpp>
#include <type_traits>
-#include "ACTS/Utilities/detail/MPL/all_of.hpp"
-#include "ACTS/Utilities/detail/MPL/any_of.hpp"
-#include "ACTS/Utilities/detail/MPL/are_sorted.hpp"
-#include "ACTS/Utilities/detail/MPL/are_within.hpp"
-#include "ACTS/Utilities/detail/MPL/at_index.hpp"
-#include "ACTS/Utilities/detail/MPL/boost_mpl_helper.hpp"
-#include "ACTS/Utilities/detail/MPL/has_duplicates.hpp"
-#include "ACTS/Utilities/detail/MPL/type_collector.hpp"
+#include "Acts/Utilities/detail/MPL/all_of.hpp"
+#include "Acts/Utilities/detail/MPL/any_of.hpp"
+#include "Acts/Utilities/detail/MPL/are_sorted.hpp"
+#include "Acts/Utilities/detail/MPL/are_within.hpp"
+#include "Acts/Utilities/detail/MPL/at_index.hpp"
+#include "Acts/Utilities/detail/MPL/boost_mpl_helper.hpp"
+#include "Acts/Utilities/detail/MPL/has_duplicates.hpp"
+#include "Acts/Utilities/detail/MPL/type_collector.hpp"
namespace bm = bm;
diff --git a/Tests/Utilities/RealQuadraticEquationTests.cpp b/Tests/Utilities/RealQuadraticEquationTests.cpp
index e422aade9..93cbd1793 100644
--- a/Tests/Utilities/RealQuadraticEquationTests.cpp
+++ b/Tests/Utilities/RealQuadraticEquationTests.cpp
@@ -18,8 +18,8 @@
// leave blank
//
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Utilities/detail/RealQuadraticEquation.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/detail/RealQuadraticEquation.hpp"
//
#include <limits>
diff --git a/Tests/Utilities/UnitConversionTests.cpp b/Tests/Utilities/UnitConversionTests.cpp
index a20818caf..1a525f6d0 100644
--- a/Tests/Utilities/UnitConversionTests.cpp
+++ b/Tests/Utilities/UnitConversionTests.cpp
@@ -9,7 +9,7 @@
// Boost include(s)
#define BOOST_TEST_MODULE Unit Conversion Tests
#include <boost/test/included/unit_test.hpp>
-#include "ACTS/Utilities/Units.hpp"
+#include "Acts/Utilities/Units.hpp"
using namespace Acts::units;
namespace utf = boost::unit_test;
diff --git a/Tests/Volumes/CylinderVolumeBoundsTests.cpp b/Tests/Volumes/CylinderVolumeBoundsTests.cpp
index 5832793dd..d2cdf458f 100644
--- a/Tests/Volumes/CylinderVolumeBoundsTests.cpp
+++ b/Tests/Volumes/CylinderVolumeBoundsTests.cpp
@@ -10,9 +10,9 @@
#include <boost/test/included/unit_test.hpp>
#include <boost/test/data/test_case.hpp>
-#include "ACTS/Surfaces/Surface.hpp"
-#include "ACTS/Utilities/Definitions.hpp"
-#include "ACTS/Volumes/CylinderVolumeBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Volumes/CylinderVolumeBounds.hpp"
namespace bdata = boost::unit_test::data;
namespace tt = boost::test_tools;
diff --git a/doc/Modules.hpp b/doc/Modules.hpp
index 28124f6c4..c5068e28b 100644
--- a/doc/Modules.hpp
+++ b/doc/Modules.hpp
@@ -47,7 +47,7 @@
/// @code{.cpp}
/// #include <fstream>
/// #include <memory>
-/// #include "ACTS/Utilities/Logger.hpp"
+/// #include "Acts/Utilities/Logger.hpp"
///
/// void myFunction() {
/// // open the logfile
--
GitLab