From 7c7c3c337fe5c5d4c369b9ed1a26742134da8cdf Mon Sep 17 00:00:00 2001 From: Matt Harris Date: Thu, 4 Jul 2024 13:05:52 +0200 Subject: [PATCH] format yet again --- .../GeoModel/GeoModelMaterialConverter.hpp | 11 ++++---- .../src/GeoModelMaterialConverter.cpp | 4 +-- Plugins/GeoModel/src/GeoModelToDetVol.cpp | 26 +++++++++++++------ 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelMaterialConverter.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelMaterialConverter.hpp index 8ab93528acb..3e19df13c94 100644 --- a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelMaterialConverter.hpp +++ b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelMaterialConverter.hpp @@ -14,11 +14,12 @@ class GeoMaterial; namespace Acts { namespace GeoModel { - /// @brief Convert GeoMaterial to Acts::Material - /// - /// @param gm The GeoMaterial to be converted - /// @return the Acts::Material - Material geoMaterialConverter(const GeoMaterial* gm, bool useMolarDensity = true); +/// @brief Convert GeoMaterial to Acts::Material +/// +/// @param gm The GeoMaterial to be converted +/// @return the Acts::Material +Material geoMaterialConverter(const GeoMaterial* gm, + bool useMolarDensity = true); } // namespace GeoModel } // namespace Acts diff --git a/Plugins/GeoModel/src/GeoModelMaterialConverter.cpp b/Plugins/GeoModel/src/GeoModelMaterialConverter.cpp index cf1c38f25d3..6df13079a72 100644 --- a/Plugins/GeoModel/src/GeoModelMaterialConverter.cpp +++ b/Plugins/GeoModel/src/GeoModelMaterialConverter.cpp @@ -15,8 +15,8 @@ namespace { constexpr double s_densityCnvFactor = 1. / GeoModelKernelUnits::gram; } -Acts::Material Acts::GeoModel::geoMaterialConverter( - const GeoMaterial* gm, bool useMolarDensity) { +Acts::Material Acts::GeoModel::geoMaterialConverter(const GeoMaterial* gm, + bool useMolarDensity) { double x0 = gm->getRadLength(); double l0 = gm->getIntLength(); double density = gm->getDensity() * s_densityCnvFactor; diff --git a/Plugins/GeoModel/src/GeoModelToDetVol.cpp b/Plugins/GeoModel/src/GeoModelToDetVol.cpp index 875c2894e98..4519ab803bf 100644 --- a/Plugins/GeoModel/src/GeoModelToDetVol.cpp +++ b/Plugins/GeoModel/src/GeoModelToDetVol.cpp @@ -48,15 +48,17 @@ void convertVolume( std::make_shared(tubs->getRMin(), tubs->getRMax(), tubs->getZHalfLength(), tubs->getDPhi() / 2); - GeoTrf::Transform3D newTransform = transform * GeoTrf::RotateZ3D(tubs->getSPhi() + 0.5 * tubs->getDPhi()); + GeoTrf::Transform3D newTransform = + transform * GeoTrf::RotateZ3D(tubs->getSPhi() + 0.5 * tubs->getDPhi()); volumes.emplace_back(Experimental::DetectorVolumeFactory::construct( portalGenerator, context, name, newTransform, bounds, Experimental::tryAllPortalsAndSurfaces())); } else if (shape->typeID() == GeoBox::getClassTypeID()) { const GeoBox* box = static_cast(shape); std::shared_ptr bounds = - std::make_shared( - box->getXHalfLength(), box->getYHalfLength(), box->getZHalfLength()); + std::make_shared(box->getXHalfLength(), + box->getYHalfLength(), + box->getZHalfLength()); volumes.emplace_back(Experimental::DetectorVolumeFactory::construct( portalGenerator, context, name, transform, bounds, Experimental::tryAllPortalsAndSurfaces())); @@ -84,7 +86,8 @@ void convertVolume( std::shared_ptr bounds = std::make_shared(x1, x2, z, y1); constexpr double rotationAngle = M_PI / 2; - GeoTrf::Transform3D newTransform = transform * GeoTrf::RotateX3D(rotationAngle); + GeoTrf::Transform3D newTransform = + transform * GeoTrf::RotateX3D(rotationAngle); volumes.emplace_back(Experimental::DetectorVolumeFactory::construct( portalGenerator, context, name, newTransform, bounds, Experimental::tryAllPortalsAndSurfaces())); @@ -92,7 +95,9 @@ void convertVolume( std::shared_ptr bounds = std::make_shared(x2, x1, z, y1); constexpr double rotationAngle = M_PI; - GeoTrf::Transform3D newTransform = transform * GeoTrf::RotateY3D(rotationAngle) * GeoTrf::RotateZ3D(rotationAngle); + GeoTrf::Transform3D newTransform = transform * + GeoTrf::RotateY3D(rotationAngle) * + GeoTrf::RotateZ3D(rotationAngle); volumes.emplace_back(Experimental::DetectorVolumeFactory::construct( portalGenerator, context, name, newTransform, bounds, Experimental::tryAllPortalsAndSurfaces())); @@ -102,7 +107,9 @@ void convertVolume( std::shared_ptr bounds = std::make_shared(y1, y2, z, x1); auto rotationAngle = M_PI / 2; - GeoTrf::Transform3D newTransform = transform * GeoTrf::RotateZ3D(rotationAngle) * GeoTrf::RotateX3D(rotationAngle); + GeoTrf::Transform3D newTransform = transform * + GeoTrf::RotateZ3D(rotationAngle) * + GeoTrf::RotateX3D(rotationAngle); volumes.emplace_back(Experimental::DetectorVolumeFactory::construct( portalGenerator, context, name, newTransform, bounds, Experimental::tryAllPortalsAndSurfaces())); @@ -110,7 +117,10 @@ void convertVolume( std::shared_ptr bounds = std::make_shared(y2, y1, z, x1); auto rotationAngle = M_PI; - GeoTrf::Transform3D newTransform = transform * GeoTrf::RotateX3D(rotationAngle) * GeoTrf::RotateZ3D(rotationAngle / 2) * GeoTrf::RotateX3D(rotationAngle / 2); + GeoTrf::Transform3D newTransform = + transform * GeoTrf::RotateX3D(rotationAngle) * + GeoTrf::RotateZ3D(rotationAngle / 2) * + GeoTrf::RotateX3D(rotationAngle / 2); volumes.emplace_back(Experimental::DetectorVolumeFactory::construct( portalGenerator, context, name, newTransform, bounds, Experimental::tryAllPortalsAndSurfaces())); @@ -146,7 +156,7 @@ void convertVolume( if (shape->typeID() == GeoShapeShift::getClassTypeID()) { const GeoShapeShift* shiftShape = static_cast(shape); const GeoShape* shapeOp = shiftShape->getOp(); - GeoTrf::Transform3D newTransform = transform * shiftShape->getX(); + GeoTrf::Transform3D newTransform = transform * shiftShape->getX(); convertVolume(context, shapeOp, name, newTransform, volumes); } }