From 6bb1f295da0de8fa89b8f7e1a3612d15c7a69acf Mon Sep 17 00:00:00 2001
From: Andreas Salzburger <Andreas.Salzburger@cern.ch>
Date: Mon, 10 Feb 2020 14:13:47 +0100
Subject: [PATCH] clang-format

---
 .../ACTFW/TGeoDetector/BuildTGeoDetector.hpp  | 53 ++++++++++---------
 .../TGeoDetector/TGeoDetectorOptions.hpp      | 16 +++---
 2 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/Detectors/TGeoDetector/include/ACTFW/TGeoDetector/BuildTGeoDetector.hpp b/Detectors/TGeoDetector/include/ACTFW/TGeoDetector/BuildTGeoDetector.hpp
index fb72dd5b8..82731ad08 100644
--- a/Detectors/TGeoDetector/include/ACTFW/TGeoDetector/BuildTGeoDetector.hpp
+++ b/Detectors/TGeoDetector/include/ACTFW/TGeoDetector/BuildTGeoDetector.hpp
@@ -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
diff --git a/Detectors/TGeoDetector/include/ACTFW/TGeoDetector/TGeoDetectorOptions.hpp b/Detectors/TGeoDetector/include/ACTFW/TGeoDetector/TGeoDetectorOptions.hpp
index e85969ccf..f5ff53c60 100644
--- a/Detectors/TGeoDetector/include/ACTFW/TGeoDetector/TGeoDetectorOptions.hpp
+++ b/Detectors/TGeoDetector/include/ACTFW/TGeoDetector/TGeoDetectorOptions.hpp
@@ -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;
 
-- 
GitLab