diff --git a/Core/src/Geometry/CylinderVolumeBuilder.cpp b/Core/src/Geometry/CylinderVolumeBuilder.cpp index 3543c04f2517c362dd31a61f79200587e7513711..790e202630a54e52102cc7b12017d5ff5e38280b 100644 --- a/Core/src/Geometry/CylinderVolumeBuilder.cpp +++ b/Core/src/Geometry/CylinderVolumeBuilder.cpp @@ -12,7 +12,6 @@ #include "Acts/Geometry/CylinderVolumeBuilder.hpp" #include "Acts/Geometry/BoundarySurfaceFace.hpp" -#include "Acts/Geometry/TrackingVolume.hpp" #include "Acts/Geometry/CylinderLayer.hpp" #include "Acts/Geometry/CylinderVolumeBounds.hpp" #include "Acts/Geometry/DiscLayer.hpp" diff --git a/Core/src/Geometry/TrackingVolume.cpp b/Core/src/Geometry/TrackingVolume.cpp index dfb165b3c5c5484a6665477cbea5bacadc74316c..d8e8c2b96979bf9bc5addfbfbda1370edc13b99c 100644 --- a/Core/src/Geometry/TrackingVolume.cpp +++ b/Core/src/Geometry/TrackingVolume.cpp @@ -1,6 +1,6 @@ // This file is part of the Acts project. // -// Copyright (C) 2016-2018 CERN for the benefit of the Acts project +// Copyright (C) 2016-2019 CERN for the benefit of the Acts project // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -203,10 +203,10 @@ void Acts::TrackingVolume::createBoundarySurfaces() { } } -void Acts::TrackingVolume::glueTrackingVolume( - const GeometryContext& gctx, BoundarySurfaceFace bsfMine, - TrackingVolume* neighbor, - BoundarySurfaceFace bsfNeighbor) { +void Acts::TrackingVolume::glueTrackingVolume(const GeometryContext& gctx, + BoundarySurfaceFace bsfMine, + TrackingVolume* neighbor, + BoundarySurfaceFace bsfNeighbor) { // Find the connection of the two tracking volumes: binR returns the center // except for cylindrical volumes Vector3D bPosition(binningPosition(gctx, binR)); diff --git a/Plugins/DD4hep/src/ConvertDD4hepDetector.cpp b/Plugins/DD4hep/src/ConvertDD4hepDetector.cpp index eb9a6d5b34fd09c2dcb979e2ad7bc1a0095ba03b..f009875ae408148e7be1e10b97c688c6a22d9483 100644 --- a/Plugins/DD4hep/src/ConvertDD4hepDetector.cpp +++ b/Plugins/DD4hep/src/ConvertDD4hepDetector.cpp @@ -465,7 +465,8 @@ std::shared_ptr<const CylinderVolumeBuilder> volumeBuilder_dd4hep( auto dd4hepVolumeBuilder = std::make_shared<const Acts::DD4hepVolumeBuilder>( vbConfig, - Acts::getDefaultLogger(std::string("D2A_VB_") + subDetector.name(), loggingLevel)); + Acts::getDefaultLogger(std::string("D2A_VB_") + subDetector.name(), + loggingLevel)); // the configuration object of the volume builder Acts::CylinderVolumeBuilder::Config cvbConfig; @@ -602,4 +603,4 @@ void collectLayers_dd4hep(dd4hep::DetElement& detElement, collectLayers_dd4hep(childDetElement, layers); } } -} // End of namespace Acts +} // End of namespace Acts \ No newline at end of file