Skip to content
Snippets Groups Projects
Commit c43f2563 authored by Fabian Klimpel's avatar Fabian Klimpel Committed by Andreas Salzburger
Browse files

Format fixed

parent 807c9560
No related branches found
No related tags found
1 merge request!488Introducing confined volume logic for TrackingVolume and DD4hep
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#include "Acts/Geometry/CylinderVolumeBuilder.hpp" #include "Acts/Geometry/CylinderVolumeBuilder.hpp"
#include "Acts/Geometry/BoundarySurfaceFace.hpp" #include "Acts/Geometry/BoundarySurfaceFace.hpp"
#include "Acts/Geometry/TrackingVolume.hpp"
#include "Acts/Geometry/CylinderLayer.hpp" #include "Acts/Geometry/CylinderLayer.hpp"
#include "Acts/Geometry/CylinderVolumeBounds.hpp" #include "Acts/Geometry/CylinderVolumeBounds.hpp"
#include "Acts/Geometry/DiscLayer.hpp" #include "Acts/Geometry/DiscLayer.hpp"
......
// This file is part of the Acts project. // 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 // 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 // License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -203,10 +203,10 @@ void Acts::TrackingVolume::createBoundarySurfaces() { ...@@ -203,10 +203,10 @@ void Acts::TrackingVolume::createBoundarySurfaces() {
} }
} }
void Acts::TrackingVolume::glueTrackingVolume( void Acts::TrackingVolume::glueTrackingVolume(const GeometryContext& gctx,
const GeometryContext& gctx, BoundarySurfaceFace bsfMine, BoundarySurfaceFace bsfMine,
TrackingVolume* neighbor, TrackingVolume* neighbor,
BoundarySurfaceFace bsfNeighbor) { BoundarySurfaceFace bsfNeighbor) {
// Find the connection of the two tracking volumes: binR returns the center // Find the connection of the two tracking volumes: binR returns the center
// except for cylindrical volumes // except for cylindrical volumes
Vector3D bPosition(binningPosition(gctx, binR)); Vector3D bPosition(binningPosition(gctx, binR));
......
...@@ -465,7 +465,8 @@ std::shared_ptr<const CylinderVolumeBuilder> volumeBuilder_dd4hep( ...@@ -465,7 +465,8 @@ std::shared_ptr<const CylinderVolumeBuilder> volumeBuilder_dd4hep(
auto dd4hepVolumeBuilder = auto dd4hepVolumeBuilder =
std::make_shared<const Acts::DD4hepVolumeBuilder>( std::make_shared<const Acts::DD4hepVolumeBuilder>(
vbConfig, 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 // the configuration object of the volume builder
Acts::CylinderVolumeBuilder::Config cvbConfig; Acts::CylinderVolumeBuilder::Config cvbConfig;
...@@ -602,4 +603,4 @@ void collectLayers_dd4hep(dd4hep::DetElement& detElement, ...@@ -602,4 +603,4 @@ void collectLayers_dd4hep(dd4hep::DetElement& detElement,
collectLayers_dd4hep(childDetElement, layers); collectLayers_dd4hep(childDetElement, layers);
} }
} }
} // End of namespace Acts } // End of namespace Acts
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment