Skip to content
Snippets Groups Projects
Commit 6bb1f295 authored by Andreas Salzburger's avatar Andreas Salzburger
Browse files

clang-format

parent d91e3cc7
No related branches found
No related tags found
1 merge request!207WIP: Resolve "Update to new TGeoBuilder functionality"
Pipeline #1403086 failed
......@@ -98,32 +98,35 @@ namespace TGeo {
= vm["geo-tgeo-filename"].template as<std::string>();
// Create a beam pipe if configured to do so
auto beamPipeParameters
auto beamPipeParameters
= vm["geo-tgeo-bp-parameters"].template as<read_range>();
if (beamPipeParameters.size() > 2){
/// configure the beam pipe layer builder
Acts::PassiveLayerBuilder::Config bplConfig;
bplConfig.layerIdentification = "BeamPipe";
bplConfig.centralLayerRadii = std::vector<double>(1, beamPipeParameters[0]);
bplConfig.centralLayerHalflengthZ = std::vector<double>(1, beamPipeParameters[1]);
bplConfig.centralLayerThickness = std::vector<double>(1, beamPipeParameters[2]);
auto beamPipeBuilder = std::make_shared<const Acts::PassiveLayerBuilder>(
bplConfig, Acts::getDefaultLogger("BeamPipeLayerBuilder", layerLogLevel));
// create the volume for the beam pipe
Acts::CylinderVolumeBuilder::Config bpvConfig;
bpvConfig.trackingVolumeHelper = cylinderVolumeHelper;
bpvConfig.volumeName = "BeamPipe";
bpvConfig.layerBuilder = beamPipeBuilder;
bpvConfig.layerEnvelopeR = {1. * Acts::units::_mm, 1. * Acts::units::_mm};
bpvConfig.buildToRadiusZero = true;
auto beamPipeVolumeBuilder
= std::make_shared<const Acts::CylinderVolumeBuilder>(
bpvConfig,
Acts::getDefaultLogger("BeamPipeVolumeBuilder", volumeLogLevel));
// add to the list of builders
volumeBuilders.push_back(beamPipeVolumeBuilder);
if (beamPipeParameters.size() > 2) {
/// configure the beam pipe layer builder
Acts::PassiveLayerBuilder::Config bplConfig;
bplConfig.layerIdentification = "BeamPipe";
bplConfig.centralLayerRadii
= std::vector<double>(1, beamPipeParameters[0]);
bplConfig.centralLayerHalflengthZ
= std::vector<double>(1, beamPipeParameters[1]);
bplConfig.centralLayerThickness
= std::vector<double>(1, beamPipeParameters[2]);
auto beamPipeBuilder = std::make_shared<const Acts::PassiveLayerBuilder>(
bplConfig,
Acts::getDefaultLogger("BeamPipeLayerBuilder", layerLogLevel));
// create the volume for the beam pipe
Acts::CylinderVolumeBuilder::Config bpvConfig;
bpvConfig.trackingVolumeHelper = cylinderVolumeHelper;
bpvConfig.volumeName = "BeamPipe";
bpvConfig.layerBuilder = beamPipeBuilder;
bpvConfig.layerEnvelopeR = {1. * Acts::units::_mm, 1. * Acts::units::_mm};
bpvConfig.buildToRadiusZero = true;
auto beamPipeVolumeBuilder
= std::make_shared<const Acts::CylinderVolumeBuilder>(
bpvConfig,
Acts::getDefaultLogger("BeamPipeVolumeBuilder", volumeLogLevel));
// add to the list of builders
volumeBuilders.push_back(beamPipeVolumeBuilder);
}
// import the file from
......
......@@ -245,15 +245,12 @@ namespace Options {
= *std::max_element(series_size.begin(), series_size.end());
std::array<size_t, 3> ti = {0, 0, 0};
// If a beam pipe is present, shift the sub detector names by one
// Create a beam pipe if configured to do so
int idetaddon = 0;
auto beamPipeParameters
// If a beam pipe is present, shift the sub detector names by one
// Create a beam pipe if configured to do so
int idetaddon = 0;
auto beamPipeParameters
= vm["geo-tgeo-bp-parameters"].template as<read_range>();
if (beamPipeParameters.size() > 2){
++idetaddon;
}
if (beamPipeParameters.size() > 2) { ++idetaddon; }
// Prepare the TGeoLayerBuilder::Configs
for (size_t idet = 0; idet < max_series; ++idet) {
......@@ -294,9 +291,8 @@ namespace Options {
}
}
// Set the scale and the layer creator
layerBuilderConfig.configurationName = subdetectors[idet+idetaddon];
layerBuilderConfig.configurationName = subdetectors[idet + idetaddon];
layerBuilderConfig.unit = unitScalor;
layerBuilderConfig.layerCreator = layerCreator;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment