Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore!: Remove volumeSignature from geometry building #2767

Merged
merged 7 commits into from
Jan 16, 2024
Merged

chore!: Remove volumeSignature from geometry building #2767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ae7a2ba
remove volumeSignature
AJPfleger Dec 1, 2023
454e1d8
Merge branch 'main' into volumesignature
asalzburger Dec 5, 2023
e2460bc
Merge branch 'acts-project:main' into volumesignature
AJPfleger Dec 5, 2023
19272b4
Merge branch 'main' into volumesignature
kodiakhq[bot] Dec 19, 2023
4b7007c
Merge branch 'main' into volumesignature
kodiakhq[bot] Dec 20, 2023
dbd160d
Merge branch 'main' into volumesignature
asalzburger Jan 16, 2024
56b9473
Merge branch 'main' into volumesignature
kodiakhq[bot] Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Core/include/Acts/Geometry/CylinderVolumeBuilder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,9 +503,6 @@ class CylinderVolumeBuilder : public ITrackingVolumeBuilder {
/// -------------------- MB (inner [0]) ---------------
std::array<std::shared_ptr<const ISurfaceMaterial>, 6> boundaryMaterial{
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr};

/// Volume signature
int volumeSignature = -1;
};

/// Constructor
Expand Down
5 changes: 0 additions & 5 deletions ...s/Detectors/GenericDetector/include/ActsExamples/GenericDetector/BuildGenericDetector.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ std::unique_ptr<const Acts::TrackingGeometry> buildDetector(
bpvConfig.layerEnvelopeR = {1. * Acts::UnitConstants::mm,
1. * Acts::UnitConstants::mm};
bpvConfig.buildToRadiusZero = true;
bpvConfig.volumeSignature = 0;
auto beamPipeVolumeBuilder =
std::make_shared<const Acts::CylinderVolumeBuilder>(
bpvConfig,
Expand Down Expand Up @@ -392,7 +391,6 @@ std::unique_ptr<const Acts::TrackingGeometry> buildDetector(
pvbConfig.layerEnvelopeR = {1. * Acts::UnitConstants::mm,
5. * Acts::UnitConstants::mm};
pvbConfig.layerBuilder = pixelLayerBuilder;
pvbConfig.volumeSignature = 0;
auto pixelVolumeBuilder = std::make_shared<const Acts::CylinderVolumeBuilder>(
pvbConfig, Acts::getDefaultLogger("PixelVolumeBuilder", volumeLLevel));
// add to the list of builders
Expand Down Expand Up @@ -426,7 +424,6 @@ std::unique_ptr<const Acts::TrackingGeometry> buildDetector(
pstvolConfig.volumeName = "PST";
pstvolConfig.buildToRadiusZero = false;
pstvolConfig.layerBuilder = pstBuilder;
pstvolConfig.volumeSignature = 0;
auto pstVolumeBuilder = std::make_shared<const Acts::CylinderVolumeBuilder>(
pstvolConfig, Acts::getDefaultLogger("PSTVolumeBuilder", volumeLLevel));
// add to the detector builds
Expand Down Expand Up @@ -622,7 +619,6 @@ std::unique_ptr<const Acts::TrackingGeometry> buildDetector(
ssvbConfig.volumeName = "SStrip";
ssvbConfig.buildToRadiusZero = false;
ssvbConfig.layerBuilder = sstripLayerBuilder;
ssvbConfig.volumeSignature = 0;
auto sstripVolumeBuilder =
std::make_shared<const Acts::CylinderVolumeBuilder>(
ssvbConfig,
Expand Down Expand Up @@ -808,7 +804,6 @@ std::unique_ptr<const Acts::TrackingGeometry> buildDetector(
lsvbConfig.volumeName = "LStrip";
lsvbConfig.buildToRadiusZero = false;
lsvbConfig.layerBuilder = lstripLayerBuilder;
lsvbConfig.volumeSignature = 0;
auto lstripVolumeBuilder =
std::make_shared<const Acts::CylinderVolumeBuilder>(
lsvbConfig,
Expand Down
1 change: 0 additions & 1 deletion Examples/Detectors/TGeoDetector/src/TGeoDetector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@ std::shared_ptr<const Acts::TrackingGeometry> buildTGeoDetector(
ringLayoutConfiguration(lbc.layerConfigurations[0]);
ringLayoutConfiguration(lbc.layerConfigurations[2]);
volumeConfig.layerBuilder = layerBuilder;
volumeConfig.volumeSignature = 0;
auto volumeBuilder = std::make_shared<const Acts::CylinderVolumeBuilder>(
volumeConfig, logger.clone(lbc.configurationName + "VolumeBuilder",
config.volumeLogLevel));
Expand Down
3 changes: 0 additions & 3 deletions Plugins/DD4hep/src/ConvertDD4hepDetector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,6 @@ std::shared_ptr<const CylinderVolumeBuilder> 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 =
Expand Down Expand Up @@ -438,7 +437,6 @@ std::shared_ptr<const CylinderVolumeBuilder> 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};
Expand Down Expand Up @@ -522,7 +520,6 @@ std::shared_ptr<const CylinderVolumeBuilder> 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;
Expand Down
1 change: 0 additions & 1 deletion Tests/CommonHelpers/Acts/Tests/CommonHelpers/CylindricalTrackingGeometry.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<const CylinderVolumeBuilder>(
bpvConfig, getDefaultLogger("BeamPipeVolumeBuilder", volumeLLevel));

Expand Down
2 changes: 0 additions & 2 deletions Tests/UnitTests/Core/Geometry/SimpleGeometryTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<const CylinderVolumeBuilder>(
bpvConfig, getDefaultLogger("BeamPipeVolumeBuilder", volumeLLevel));

Expand All @@ -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<const CylinderVolumeBuilder>(
cvbConfig, getDefaultLogger("CentralVolumeBuilder", volumeLLevel));

Expand Down
1 change: 0 additions & 1 deletion Tests/UnitTests/Core/Material/SurfaceMaterialMapperTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ std::shared_ptr<const TrackingGeometry> trackingGeometry() {
cvbConfig.layerBuilder = layerBuilder;
cvbConfig.layerEnvelopeR = {1_mm, 1_mm};
cvbConfig.buildToRadiusZero = true;
cvbConfig.volumeSignature = 0;
auto centralVolumeBuilder = std::make_shared<const CylinderVolumeBuilder>(
cvbConfig, getDefaultLogger("CentralVolumeBuilder", volumeLLevel));

Expand Down
Loading