From 98adef6691040a43cfce36f57395d319c80ffde5 Mon Sep 17 00:00:00 2001
From: Paul Gessinger <paul.gessinger@cern.ch>
Date: Wed, 17 Jul 2019 17:10:32 +0200
Subject: [PATCH] fix format
---
.../include/ACTFW/Propagation/PropagationAlgorithm.ipp | 2 +-
.../include/ACTFW/DD4hepDetector/DD4hepDetectorHelper.hpp | 2 +-
Detectors/DD4hepDetector/src/DD4hepGeometryService.cpp | 4 ++--
.../ACTFW/GenericDetector/BuildGenericDetector.hpp | 8 ++++----
.../MaterialMapping/src/detail/MaterialMappingBase.hpp | 4 ++--
.../include/ACTFW/Plugins/Root/RootMaterialWriter.hpp | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Algorithms/Propagation/include/ACTFW/Propagation/PropagationAlgorithm.ipp b/Algorithms/Propagation/include/ACTFW/Propagation/PropagationAlgorithm.ipp
index 168f03aa..4a0caa58 100644
--- a/Algorithms/Propagation/include/ACTFW/Propagation/PropagationAlgorithm.ipp
+++ b/Algorithms/Propagation/include/ACTFW/Propagation/PropagationAlgorithm.ipp
@@ -160,7 +160,7 @@ PropagationAlgorithm<propagator_t>::execute(
double p = pt / sin(theta);
double charge = qDist(rng) > 0.5 ? 1. : -1.;
double qop = charge / p;
- double t = 0;
+ double t = 0;
// parameters
Acts::BoundVector pars;
pars << d0, z0, phi, theta, qop, t;
diff --git a/Detectors/DD4hepDetector/include/ACTFW/DD4hepDetector/DD4hepDetectorHelper.hpp b/Detectors/DD4hepDetector/include/ACTFW/DD4hepDetector/DD4hepDetectorHelper.hpp
index 41a0c8a2..71b01a3c 100644
--- a/Detectors/DD4hepDetector/include/ACTFW/DD4hepDetector/DD4hepDetectorHelper.hpp
+++ b/Detectors/DD4hepDetector/include/ACTFW/DD4hepDetector/DD4hepDetectorHelper.hpp
@@ -12,9 +12,9 @@
#include "Acts/Plugins/Digitization/DigitizationModule.hpp"
#include "Acts/Surfaces/RectangleBounds.hpp"
#include "Acts/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Utilities/Units.hpp"
#include "DD4hep/CartesianGridXY.h"
#include "DD4hep/Segmentations.h"
-#include "Acts/Utilities/Units.hpp"
/// In case several sensitive modules have the same segmentation it can and
/// should be shared between these modules to save memory and time.
diff --git a/Detectors/DD4hepDetector/src/DD4hepGeometryService.cpp b/Detectors/DD4hepDetector/src/DD4hepGeometryService.cpp
index 9533a675..cfd5ca0c 100644
--- a/Detectors/DD4hepDetector/src/DD4hepGeometryService.cpp
+++ b/Detectors/DD4hepDetector/src/DD4hepGeometryService.cpp
@@ -7,13 +7,13 @@
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include "ACTFW/DD4hepDetector/DD4hepGeometryService.hpp"
-#include "Acts/Geometry/TrackingGeometry.hpp"
-#include "Acts/Plugins/DD4hep/ConvertDD4hepDetector.hpp"
#include "Acts/Geometry/CylinderVolumeBuilder.hpp"
#include "Acts/Geometry/CylinderVolumeHelper.hpp"
#include "Acts/Geometry/LayerArrayCreator.hpp"
#include "Acts/Geometry/SurfaceArrayCreator.hpp"
+#include "Acts/Geometry/TrackingGeometry.hpp"
#include "Acts/Geometry/TrackingVolumeArrayCreator.hpp"
+#include "Acts/Plugins/DD4hep/ConvertDD4hepDetector.hpp"
#include "Acts/Utilities/BinningType.hpp"
FW::DD4hep::DD4hepGeometryService::DD4hepGeometryService(
diff --git a/Detectors/GenericDetector/include/ACTFW/GenericDetector/BuildGenericDetector.hpp b/Detectors/GenericDetector/include/ACTFW/GenericDetector/BuildGenericDetector.hpp
index 7f07e193..2971c77f 100644
--- a/Detectors/GenericDetector/include/ACTFW/GenericDetector/BuildGenericDetector.hpp
+++ b/Detectors/GenericDetector/include/ACTFW/GenericDetector/BuildGenericDetector.hpp
@@ -16,18 +16,18 @@
#include <vector>
#include "ACTFW/GenericDetector/LayerBuilderT.hpp"
#include "ACTFW/GenericDetector/ProtoLayerCreatorT.hpp"
-#include "Acts/Geometry/TrackingGeometry.hpp"
-#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
-#include "Acts/Material/Material.hpp"
-#include "Acts/Material/ProtoSurfaceMaterial.hpp"
#include "Acts/Geometry/CylinderVolumeBuilder.hpp"
#include "Acts/Geometry/CylinderVolumeHelper.hpp"
#include "Acts/Geometry/LayerArrayCreator.hpp"
#include "Acts/Geometry/LayerCreator.hpp"
#include "Acts/Geometry/PassiveLayerBuilder.hpp"
#include "Acts/Geometry/SurfaceArrayCreator.hpp"
+#include "Acts/Geometry/TrackingGeometry.hpp"
#include "Acts/Geometry/TrackingGeometryBuilder.hpp"
#include "Acts/Geometry/TrackingVolumeArrayCreator.hpp"
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
+#include "Acts/Material/Material.hpp"
+#include "Acts/Material/ProtoSurfaceMaterial.hpp"
#include "Acts/Utilities/BinUtility.hpp"
#include "Acts/Utilities/Definitions.hpp"
#include "Acts/Utilities/Logger.hpp"
diff --git a/Examples/MaterialMapping/src/detail/MaterialMappingBase.hpp b/Examples/MaterialMapping/src/detail/MaterialMappingBase.hpp
index 53bf1bef..1c539fbc 100644
--- a/Examples/MaterialMapping/src/detail/MaterialMappingBase.hpp
+++ b/Examples/MaterialMapping/src/detail/MaterialMappingBase.hpp
@@ -21,13 +21,13 @@
#include "ACTFW/Plugins/Root/RootMaterialWriter.hpp"
#include "ACTFW/Propagation/PropagationOptions.hpp"
#include "ACTFW/Utilities/Paths.hpp"
+#include "Acts/Geometry/GeometryContext.hpp"
#include "Acts/Geometry/TrackingGeometry.hpp"
+#include "Acts/MagneticField/MagneticFieldContext.hpp"
#include "Acts/Material/SurfaceMaterialMapper.hpp"
#include "Acts/Propagator/Navigator.hpp"
#include "Acts/Propagator/Propagator.hpp"
#include "Acts/Propagator/StraightLineStepper.hpp"
-#include "Acts/Geometry/GeometryContext.hpp"
-#include "Acts/MagneticField/MagneticFieldContext.hpp"
namespace po = boost::program_options;
diff --git a/Plugins/Root/include/ACTFW/Plugins/Root/RootMaterialWriter.hpp b/Plugins/Root/include/ACTFW/Plugins/Root/RootMaterialWriter.hpp
index c99034eb..2b75f25a 100644
--- a/Plugins/Root/include/ACTFW/Plugins/Root/RootMaterialWriter.hpp
+++ b/Plugins/Root/include/ACTFW/Plugins/Root/RootMaterialWriter.hpp
@@ -15,10 +15,10 @@
#include <map>
#include <mutex>
#include "ACTFW/Framework/ProcessCode.hpp"
+#include "Acts/Geometry/GeometryID.hpp"
#include "Acts/Geometry/TrackingGeometry.hpp"
#include "Acts/Geometry/TrackingVolume.hpp"
#include "Acts/Material/IMaterialDecorator.hpp"
-#include "Acts/Geometry/GeometryID.hpp"
#include "Acts/Material/ISurfaceMaterial.hpp"
#include "Acts/Material/IVolumeMaterial.hpp"
#include "Acts/Surfaces/Surface.hpp"
--
GitLab