From 34bd984f66029ebe93697aab76e84c56a16f10c0 Mon Sep 17 00:00:00 2001 From: "Alexander J. Pfleger" <70842573+AJPfleger@users.noreply.github.com> Date: Tue, 5 Dec 2023 07:34:17 +0100 Subject: [PATCH] chore: Remove `volumeSignature` from geometry building (#2759) Seems to have no purpose anymore in ACTS. I was introduced in the pre-PR time: https://github.com/acts-project/acts/commit/cd4c063b0f556c403dee260d809ddf7c013881a2 Closes https://github.com/acts-project/acts/issues/1731 --- Core/include/Acts/Geometry/CylinderVolumeBuilder.hpp | 3 --- .../ActsExamples/GenericDetector/BuildGenericDetector.hpp | 5 ----- Examples/Detectors/TGeoDetector/src/TGeoDetector.cpp | 1 - Plugins/DD4hep/src/ConvertDD4hepDetector.cpp | 3 --- .../Acts/Tests/CommonHelpers/CylindricalTrackingGeometry.hpp | 1 - Tests/UnitTests/Core/Geometry/SimpleGeometryTests.cpp | 2 -- Tests/UnitTests/Core/Material/SurfaceMaterialMapperTests.cpp | 1 - 7 files changed, 16 deletions(-) diff --git a/Core/include/Acts/Geometry/CylinderVolumeBuilder.hpp b/Core/include/Acts/Geometry/CylinderVolumeBuilder.hpp index 4e76eab7f35..8b242e139f8 100644 --- a/Core/include/Acts/Geometry/CylinderVolumeBuilder.hpp +++ b/Core/include/Acts/Geometry/CylinderVolumeBuilder.hpp @@ -503,9 +503,6 @@ class CylinderVolumeBuilder : public ITrackingVolumeBuilder { /// -------------------- MB (inner [0]) --------------- std::array, 6> boundaryMaterial{ nullptr, nullptr, nullptr, nullptr, nullptr, nullptr}; - - /// Volume signature - int volumeSignature = -1; }; /// Constructor diff --git a/Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/BuildGenericDetector.hpp b/Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/BuildGenericDetector.hpp index 0cfd3cad2fa..3f5379f5bc4 100644 --- a/Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/BuildGenericDetector.hpp +++ b/Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/BuildGenericDetector.hpp @@ -205,7 +205,6 @@ std::unique_ptr buildDetector( bpvConfig.layerEnvelopeR = {1. * Acts::UnitConstants::mm, 1. * Acts::UnitConstants::mm}; bpvConfig.buildToRadiusZero = true; - bpvConfig.volumeSignature = 0; auto beamPipeVolumeBuilder = std::make_shared( bpvConfig, @@ -393,7 +392,6 @@ std::unique_ptr buildDetector( pvbConfig.layerEnvelopeR = {1. * Acts::UnitConstants::mm, 5. * Acts::UnitConstants::mm}; pvbConfig.layerBuilder = pixelLayerBuilder; - pvbConfig.volumeSignature = 0; auto pixelVolumeBuilder = std::make_shared( pvbConfig, Acts::getDefaultLogger("PixelVolumeBuilder", volumeLLevel)); // add to the list of builders @@ -427,7 +425,6 @@ std::unique_ptr buildDetector( pstvolConfig.volumeName = "PST"; pstvolConfig.buildToRadiusZero = false; pstvolConfig.layerBuilder = pstBuilder; - pstvolConfig.volumeSignature = 0; auto pstVolumeBuilder = std::make_shared( pstvolConfig, Acts::getDefaultLogger("PSTVolumeBuilder", volumeLLevel)); // add to the detector builds @@ -623,7 +620,6 @@ std::unique_ptr buildDetector( ssvbConfig.volumeName = "SStrip"; ssvbConfig.buildToRadiusZero = false; ssvbConfig.layerBuilder = sstripLayerBuilder; - ssvbConfig.volumeSignature = 0; auto sstripVolumeBuilder = std::make_shared( ssvbConfig, @@ -809,7 +805,6 @@ std::unique_ptr buildDetector( lsvbConfig.volumeName = "LStrip"; lsvbConfig.buildToRadiusZero = false; lsvbConfig.layerBuilder = lstripLayerBuilder; - lsvbConfig.volumeSignature = 0; auto lstripVolumeBuilder = std::make_shared( lsvbConfig, diff --git a/Examples/Detectors/TGeoDetector/src/TGeoDetector.cpp b/Examples/Detectors/TGeoDetector/src/TGeoDetector.cpp index d87f0f80ca8..f60af5f7afe 100644 --- a/Examples/Detectors/TGeoDetector/src/TGeoDetector.cpp +++ b/Examples/Detectors/TGeoDetector/src/TGeoDetector.cpp @@ -295,7 +295,6 @@ std::shared_ptr buildTGeoDetector( ringLayoutConfiguration(lbc.layerConfigurations[0]); ringLayoutConfiguration(lbc.layerConfigurations[2]); volumeConfig.layerBuilder = layerBuilder; - volumeConfig.volumeSignature = 0; auto volumeBuilder = std::make_shared( volumeConfig, logger.clone(lbc.configurationName + "VolumeBuilder", config.volumeLogLevel)); diff --git a/Plugins/DD4hep/src/ConvertDD4hepDetector.cpp b/Plugins/DD4hep/src/ConvertDD4hepDetector.cpp index 82d1a3cd4ec..7db6a4badc4 100644 --- a/Plugins/DD4hep/src/ConvertDD4hepDetector.cpp +++ b/Plugins/DD4hep/src/ConvertDD4hepDetector.cpp @@ -382,7 +382,6 @@ std::shared_ptr volumeBuilder_dd4hep( cvbConfig.layerEnvelopeR = std::make_pair(layerEnvelopeR, layerEnvelopeR); cvbConfig.layerEnvelopeZ = layerEnvelopeZ; cvbConfig.trackingVolumeHelper = volumeHelper; - cvbConfig.volumeSignature = 0; cvbConfig.volumeName = subDetector.name(); cvbConfig.layerBuilder = dd4hepLayerBuilder; auto cylinderVolumeBuilder = @@ -438,7 +437,6 @@ std::shared_ptr volumeBuilder_dd4hep( // the configuration object of the volume builder Acts::CylinderVolumeBuilder::Config cvbConfig; cvbConfig.trackingVolumeHelper = volumeHelper; - cvbConfig.volumeSignature = 0; cvbConfig.volumeName = subDetector.name(); cvbConfig.layerBuilder = pcLayerBuilder; cvbConfig.layerEnvelopeR = {layerEnvelopeR, layerEnvelopeR}; @@ -522,7 +520,6 @@ std::shared_ptr volumeBuilder_dd4hep( cvbConfig.layerEnvelopeR = std::make_pair(layerEnvelopeR, layerEnvelopeR); cvbConfig.layerEnvelopeZ = layerEnvelopeZ; cvbConfig.trackingVolumeHelper = volumeHelper; - cvbConfig.volumeSignature = 0; cvbConfig.volumeName = subDetector.name(); cvbConfig.layerBuilder = dd4hepLayerBuilder; cvbConfig.ctVolumeBuilder = dd4hepVolumeBuilder; diff --git a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/CylindricalTrackingGeometry.hpp b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/CylindricalTrackingGeometry.hpp index 1c0911883a4..708e28f662c 100644 --- a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/CylindricalTrackingGeometry.hpp +++ b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/CylindricalTrackingGeometry.hpp @@ -259,7 +259,6 @@ struct CylindricalTrackingGeometry { bpvConfig.layerBuilder = beamPipeBuilder; bpvConfig.layerEnvelopeR = {1_mm, 1_mm}; bpvConfig.buildToRadiusZero = true; - bpvConfig.volumeSignature = 0; auto beamPipeVolumeBuilder = std::make_shared( bpvConfig, getDefaultLogger("BeamPipeVolumeBuilder", volumeLLevel)); diff --git a/Tests/UnitTests/Core/Geometry/SimpleGeometryTests.cpp b/Tests/UnitTests/Core/Geometry/SimpleGeometryTests.cpp index 50ca0a64cc2..63fabde2023 100644 --- a/Tests/UnitTests/Core/Geometry/SimpleGeometryTests.cpp +++ b/Tests/UnitTests/Core/Geometry/SimpleGeometryTests.cpp @@ -83,7 +83,6 @@ BOOST_AUTO_TEST_CASE(SimpleGeometryTest) { bpvConfig.layerBuilder = beamPipeBuilder; bpvConfig.layerEnvelopeR = {1_mm, 1_mm}; bpvConfig.buildToRadiusZero = true; - bpvConfig.volumeSignature = 0; auto beamPipeVolumeBuilder = std::make_shared( bpvConfig, getDefaultLogger("BeamPipeVolumeBuilder", volumeLLevel)); @@ -102,7 +101,6 @@ BOOST_AUTO_TEST_CASE(SimpleGeometryTest) { cvbConfig.layerBuilder = layerBuilder; cvbConfig.layerEnvelopeR = {1_mm, 1_mm}; cvbConfig.buildToRadiusZero = false; - cvbConfig.volumeSignature = 0; auto centralVolumeBuilder = std::make_shared( cvbConfig, getDefaultLogger("CentralVolumeBuilder", volumeLLevel)); diff --git a/Tests/UnitTests/Core/Material/SurfaceMaterialMapperTests.cpp b/Tests/UnitTests/Core/Material/SurfaceMaterialMapperTests.cpp index 10e04d6f910..8bd11740566 100644 --- a/Tests/UnitTests/Core/Material/SurfaceMaterialMapperTests.cpp +++ b/Tests/UnitTests/Core/Material/SurfaceMaterialMapperTests.cpp @@ -87,7 +87,6 @@ std::shared_ptr trackingGeometry() { cvbConfig.layerBuilder = layerBuilder; cvbConfig.layerEnvelopeR = {1_mm, 1_mm}; cvbConfig.buildToRadiusZero = true; - cvbConfig.volumeSignature = 0; auto centralVolumeBuilder = std::make_shared( cvbConfig, getDefaultLogger("CentralVolumeBuilder", volumeLLevel));