From 9f364fa46c9821b05f16d69bf53323c2d98d06f2 Mon Sep 17 00:00:00 2001
From: Fabian Klimpel <fklimpel@cern.ch>
Date: Thu, 11 Apr 2019 10:11:02 +0200
Subject: [PATCH] Format fixed
---
.../Acts/Geometry/CuboidVolumeBuilder.hpp | 2 +-
.../Acts/Geometry/CylinderVolumeBuilder.hpp | 2 +-
Core/include/Acts/Geometry/TrackingVolume.hpp | 8 ++---
.../Acts/Geometry/detail/TrackingVolume.ipp | 3 +-
Core/src/Geometry/CylinderVolumeBuilder.cpp | 14 ++++++---
Core/src/Geometry/CylinderVolumeHelper.cpp | 3 +-
Core/src/Geometry/TrackingVolume.cpp | 5 ++-
.../CommonHelpers/CubicTrackingGeometry.hpp | 3 +-
.../Geometry/CuboidVolumeBuilderTests.cpp | 31 ++++++++++++-------
Tests/Core/Propagator/StepperTests.cpp | 7 +++--
10 files changed, 45 insertions(+), 33 deletions(-)
diff --git a/Core/include/Acts/Geometry/CuboidVolumeBuilder.hpp b/Core/include/Acts/Geometry/CuboidVolumeBuilder.hpp
index 56be8f4a5..8d4df34de 100644
--- a/Core/include/Acts/Geometry/CuboidVolumeBuilder.hpp
+++ b/Core/include/Acts/Geometry/CuboidVolumeBuilder.hpp
@@ -176,4 +176,4 @@ class CuboidVolumeBuilder : public ITrackingVolumeBuilder {
/// Configuration of the world volume
Config m_cfg;
};
-} // namespace Acts
+} // namespace Acts
\ No newline at end of file
diff --git a/Core/include/Acts/Geometry/CylinderVolumeBuilder.hpp b/Core/include/Acts/Geometry/CylinderVolumeBuilder.hpp
index ffb72f257..d792c3176 100644
--- a/Core/include/Acts/Geometry/CylinderVolumeBuilder.hpp
+++ b/Core/include/Acts/Geometry/CylinderVolumeBuilder.hpp
@@ -585,4 +585,4 @@ inline CylinderVolumeBuilder::Config CylinderVolumeBuilder::getConfiguration()
return m_cfg;
}
-} // namespace Acts
+} // namespace Acts
\ No newline at end of file
diff --git a/Core/include/Acts/Geometry/TrackingVolume.hpp b/Core/include/Acts/Geometry/TrackingVolume.hpp
index b61651228..0207c6dbd 100644
--- a/Core/include/Acts/Geometry/TrackingVolume.hpp
+++ b/Core/include/Acts/Geometry/TrackingVolume.hpp
@@ -283,10 +283,10 @@ class TrackingVolume : public Volume {
/// Return the confined volumes of this container array - if it exists
std::shared_ptr<const TrackingVolumeArray> confinedVolumes() const;
-
+
/// Return the confined dense volumes
const MutableTrackingVolumeVector
- denseVolumes() const;
+ denseVolumes() const;
/// @brief Visit all sensitive surfaces
///
@@ -556,7 +556,7 @@ inline const LayerArray* TrackingVolume::confinedLayers() const {
inline const MutableTrackingVolumeVector
TrackingVolume::denseVolumes() const
{
- return m_confinedDenseVolumes;
+ return m_confinedDenseVolumes;
}
inline std::shared_ptr<const TrackingVolumeArray>
@@ -594,4 +594,4 @@ inline bool TrackingVolume::hasBoundingVolumeHierarchy() const {
#include "detail/TrackingVolume.ipp"
-} // namespace Acts
+} // namespace Acts
\ No newline at end of file
diff --git a/Core/include/Acts/Geometry/detail/TrackingVolume.ipp b/Core/include/Acts/Geometry/detail/TrackingVolume.ipp
index a94d23b84..d2580f022 100644
--- a/Core/include/Acts/Geometry/detail/TrackingVolume.ipp
+++ b/Core/include/Acts/Geometry/detail/TrackingVolume.ipp
@@ -103,7 +103,8 @@ std::vector<BoundaryIntersection> TrackingVolume::compatibleBoundaries(
nonExcludedBoundaries.push_back(bSurface);
}
- const std::vector<std::shared_ptr<TrackingVolume>> confinedDenseVolumes = denseVolumes();
+ const std::vector<std::shared_ptr<TrackingVolume>> confinedDenseVolumes
+ = denseVolumes();
for (const auto& dv : confinedDenseVolumes) {
auto& bSurfacesConfined = dv->boundarySurfaces();
for (auto& bsIter : bSurfacesConfined) {
diff --git a/Core/src/Geometry/CylinderVolumeBuilder.cpp b/Core/src/Geometry/CylinderVolumeBuilder.cpp
index 6b8b0bcb4..d2978112e 100644
--- a/Core/src/Geometry/CylinderVolumeBuilder.cpp
+++ b/Core/src/Geometry/CylinderVolumeBuilder.cpp
@@ -299,7 +299,8 @@ Acts::CylinderVolumeBuilder::trackingVolume(
if (wConfig.fGapVolumeConfig) {
// create the gap volume
auto fGap
- = tvHelper->createGapTrackingVolume(gctx,wConfig.cVolumeConfig.volumes,
+ = tvHelper->createGapTrackingVolume(gctx,
+ wConfig.cVolumeConfig.volumes,
m_cfg.volumeMaterial,
wConfig.fGapVolumeConfig.rMin,
wConfig.fGapVolumeConfig.rMax,
@@ -315,7 +316,8 @@ Acts::CylinderVolumeBuilder::trackingVolume(
if (wConfig.sGapVolumeConfig) {
// create the gap volume
auto sGap
- = tvHelper->createGapTrackingVolume(gctx,wConfig.cVolumeConfig.volumes,
+ = tvHelper->createGapTrackingVolume(gctx,
+ wConfig.cVolumeConfig.volumes,
m_cfg.volumeMaterial,
wConfig.sGapVolumeConfig.rMin,
wConfig.sGapVolumeConfig.rMax,
@@ -383,8 +385,10 @@ Acts::CylinderVolumeBuilder::trackingVolume(
// -----------------------------
Acts::VolumeConfig
-Acts::CylinderVolumeBuilder::analyzeContent(const GeometryContext& gctx,
- const LayerVector& lVector, const MutableTrackingVolumeVector& mtvVector) const
+Acts::CylinderVolumeBuilder::analyzeContent(
+ const GeometryContext& gctx,
+ const LayerVector& lVector,
+ const MutableTrackingVolumeVector& mtvVector) const
{
// @TODO add envelope tolerance
//
@@ -456,4 +460,4 @@ Acts::CylinderVolumeBuilder::analyzeContent(const GeometryContext& gctx,
// and return what you have
return lConfig;
-}
+}
\ No newline at end of file
diff --git a/Core/src/Geometry/CylinderVolumeHelper.cpp b/Core/src/Geometry/CylinderVolumeHelper.cpp
index c7a45928f..6118630e4 100644
--- a/Core/src/Geometry/CylinderVolumeHelper.cpp
+++ b/Core/src/Geometry/CylinderVolumeHelper.cpp
@@ -238,7 +238,8 @@ Acts::CylinderVolumeHelper::createGapTrackingVolume(
}
// now call the main method
- return createGapTrackingVolume(gctx,mtvVector,
+ return createGapTrackingVolume(gctx,
+ mtvVector,
volumeMaterial,
rMin,
rMax,
diff --git a/Core/src/Geometry/TrackingVolume.cpp b/Core/src/Geometry/TrackingVolume.cpp
index 7bb4464ad..c21e3d15c 100644
--- a/Core/src/Geometry/TrackingVolume.cpp
+++ b/Core/src/Geometry/TrackingVolume.cpp
@@ -98,7 +98,6 @@ const Acts::TrackingVolume* Acts::TrackingVolume::lowestTrackingVolume(
for (auto& denseVolume : m_confinedDenseVolumes)
if (denseVolume->inside(gp, 0.001)) return denseVolume.get();
-
// there is no lower sub structure
return this;
}
@@ -463,7 +462,7 @@ void Acts::TrackingVolume::closeGeometry(
mutableVolumesIter->closeGeometry(materialDecorator, volumeMap, vol);
}
}
-
+
if (!m_confinedDenseVolumes.empty()) {
for (auto& volumesIter : m_confinedDenseVolumes) {
auto mutableVolumesIter
@@ -494,4 +493,4 @@ void Acts::TrackingVolume::visitSurfaces(
volume->visitSurfaces(visitor);
}
}
-}
+}
\ No newline at end of file
diff --git a/Tests/Core/CommonHelpers/include/Acts/Tests/CommonHelpers/CubicTrackingGeometry.hpp b/Tests/Core/CommonHelpers/include/Acts/Tests/CommonHelpers/CubicTrackingGeometry.hpp
index 122194175..3345b5cb0 100644
--- a/Tests/Core/CommonHelpers/include/Acts/Tests/CommonHelpers/CubicTrackingGeometry.hpp
+++ b/Tests/Core/CommonHelpers/include/Acts/Tests/CommonHelpers/CubicTrackingGeometry.hpp
@@ -55,7 +55,6 @@ struct CubicTrackingGeometry {
surfaceMaterial = std::shared_ptr<const ISurfaceMaterial>(
new HomogeneousSurfaceMaterial(matProp));
}
-<<<<<<< HEAD
/// Call operator to build the standard cubic tracking geometry
std::shared_ptr<const TrackingGeometry> operator()() {
@@ -191,4 +190,4 @@ struct CubicTrackingGeometry {
std::reference_wrapper<const GeometryContext> geoContext;
};
} // namespace Test
-} // namespace Acts
+} // namespace Acts
\ No newline at end of file
diff --git a/Tests/Core/Geometry/CuboidVolumeBuilderTests.cpp b/Tests/Core/Geometry/CuboidVolumeBuilderTests.cpp
index 0e5fe97e2..414b604a0 100644
--- a/Tests/Core/Geometry/CuboidVolumeBuilderTests.cpp
+++ b/Tests/Core/Geometry/CuboidVolumeBuilderTests.cpp
@@ -269,9 +269,9 @@ namespace Test {
CuboidVolumeBuilder cvb;
// Create a test context
- GeometryContext tgContext = GeometryContext();
+ GeometryContext tgContext = GeometryContext();
MagneticFieldContext mfContext = MagneticFieldContext();
-
+
// Build a volume that confines another volume
CuboidVolumeBuilder::VolumeConfig vCfg;
vCfg.position = {1. * units::_m, 0., 0.};
@@ -303,21 +303,26 @@ namespace Test {
return cvb.trackingVolume(context, inner, vb);
});
TrackingGeometryBuilder tgb(tgbCfg);
- std::shared_ptr<const TrackingGeometry> detector = tgb.trackingGeometry(tgContext);
+ std::shared_ptr<const TrackingGeometry> detector
+ = tgb.trackingGeometry(tgContext);
// Test that the right volume is selected
BOOST_TEST(
- detector->lowestTrackingVolume(tgContext, {1. * units::_m, 0., 0.})->volumeName()
+ detector->lowestTrackingVolume(tgContext, {1. * units::_m, 0., 0.})
+ ->volumeName()
== vCfg.name);
BOOST_TEST(
- detector->lowestTrackingVolume(tgContext, {1.1 * units::_m, 0., 0.})->volumeName()
+ detector->lowestTrackingVolume(tgContext, {1.1 * units::_m, 0., 0.})
+ ->volumeName()
== cvCfg1.name);
BOOST_TEST(
- detector->lowestTrackingVolume(tgContext, {0.9 * units::_m, 0., 0.})->volumeName()
+ detector->lowestTrackingVolume(tgContext, {0.9 * units::_m, 0., 0.})
+ ->volumeName()
== cvCfg2.name);
// Set propagator and navigator
- PropagatorOptions<ActionList<StepVolumeCollector>> propOpts(tgContext, mfContext);
+ PropagatorOptions<ActionList<StepVolumeCollector>> propOpts(tgContext,
+ mfContext);
propOpts.maxStepSize = 10. * units::_mm;
StraightLineStepper sls;
Navigator navi(detector);
@@ -367,9 +372,9 @@ namespace Test {
CuboidVolumeBuilder cvb;
// Create a test context
- GeometryContext tgContext = GeometryContext();
+ GeometryContext tgContext = GeometryContext();
MagneticFieldContext mfContext = MagneticFieldContext();
-
+
// Build a volume that confines another volume
CuboidVolumeBuilder::VolumeConfig vCfg1;
vCfg1.position = {1. * units::_m, 0., 0.};
@@ -422,10 +427,12 @@ namespace Test {
return cvb.trackingVolume(context, inner, vb);
});
TrackingGeometryBuilder tgb(tgbCfg);
- std::shared_ptr<const TrackingGeometry> detector = tgb.trackingGeometry(tgContext);
+ std::shared_ptr<const TrackingGeometry> detector
+ = tgb.trackingGeometry(tgContext);
// Set propagator and navigator
- PropagatorOptions<ActionList<StepVolumeCollector>> propOpts(tgContext, mfContext);
+ PropagatorOptions<ActionList<StepVolumeCollector>> propOpts(tgContext,
+ mfContext);
propOpts.maxStepSize = 10. * units::_mm;
StraightLineStepper sls;
Navigator navi(detector);
@@ -471,4 +478,4 @@ namespace Test {
}
}
} // namespace Test
-} // namespace Acts
+} // namespace Acts
\ No newline at end of file
diff --git a/Tests/Core/Propagator/StepperTests.cpp b/Tests/Core/Propagator/StepperTests.cpp
index 0484db821..552d88065 100644
--- a/Tests/Core/Propagator/StepperTests.cpp
+++ b/Tests/Core/Propagator/StepperTests.cpp
@@ -694,7 +694,8 @@ BOOST_AUTO_TEST_CASE(step_extension_vacmatvac_test) {
return cvb.trackingVolume(context, inner, vb);
});
TrackingGeometryBuilder tgb(tgbCfg);
- std::shared_ptr<const TrackingGeometry> detector = tgb.trackingGeometry(tgContext);
+ std::shared_ptr<const TrackingGeometry> detector
+ = tgb.trackingGeometry(tgContext);
// Build navigator
Navigator naviVac(detector);
@@ -732,7 +733,7 @@ BOOST_AUTO_TEST_CASE(step_extension_vacmatvac_test) {
prop(es, naviVac);
// Launch and collect results
- const auto& result = prop.propagate(sbtp, propOpts).value();
+ const auto& result = prop.propagate(sbtp, propOpts).value();
const StepCollector::this_result& stepResult
= result.get<typename StepCollector::result_type>();
@@ -768,4 +769,4 @@ BOOST_AUTO_TEST_CASE(step_extension_vacmatvac_test) {
}
}
} // namespace Test
-} // namespace Acts
+} // namespace Acts
\ No newline at end of file
--
GitLab