Merge branch 'main' into patch-3

.gitlab-ci.yml

@@ -81,7 +81,7 @@ build_exatrkx_cpu:
       -DACTS_EXATRKX_ENABLE_CUDA=OFF
 
     - ccache -z
-    - cmake --build build -- -j2
+    - cmake --build build -- -j6
     - ccache -s
 
 build_exatrkx:
@@ -119,7 +119,7 @@ build_exatrkx:
       -DCMAKE_CUDA_ARCHITECTURES="75;86"
 
     - ccache -z
-    - cmake --build build -- -j2
+    - cmake --build build -- -j6
     - ccache -s
 
 # test_exatrkx_unittests:
@@ -186,7 +186,7 @@ build_linux_ubuntu:
       -DACTS_BUILD_PLUGIN_ONNX=ON
 
     - ccache -z
-    - cmake --build build -- -j2
+    - cmake --build build -- -j6
     - ccache -s
 
 linux_test_examples:
@@ -271,7 +271,7 @@ linux_physmon:
       -DCMAKE_CXX_STANDARD=${CXXSTD}
 
     - ccache -z
-    - cmake --build build -- -j2
+    - cmake --build build -- -j6
     - ccache -s
 
     - ctest --test-dir build -j$(nproc)
@@ -367,7 +367,7 @@ linux_ubuntu_2204_clang:
       -DACTS_BUILD_PLUGIN_GEOMODEL=OFF # GeoModel is not in LCG at this point
 
     - ccache -z
-    - cmake --build build -- -j2
+    - cmake --build build -- -j6
     - ccache -s
 
     - ctest --test-dir build -j$(nproc)

.merge-sentinel.yml

@@ -14,6 +14,7 @@ rules:
     required_checks:
      - Docs / docs
      - Analysis / build_debug
+     - SonarCloud Code Analysis
 
     required_pattern:
      - "Builds / *"

.pre-commit-config.yaml

@@ -86,3 +86,10 @@ repos:
       language: system
       entry: docs/parse_cmake_options.py --write docs/getting_started.md
       files: ^CMakeLists.txt$
+
+  - repo: local
+    hooks:
+    - id: leftover_conflict_markers
+      name: Leftover conflict markers
+      language: system
+      entry: git diff --staged --check

Alignment/include/ActsAlignment/Kernel/Alignment.hpp

@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -149,7 +149,7 @@ struct Alignment {
   /// @tparam fit_options_t The fit options type
   ///
   /// @param gctx The current geometry context object
-  /// @param sourcelinks The fittable uncalibrated measurements
+  /// @param sourceLinks The fittable uncalibrated measurements
   /// @param sParameters The initial track parameters
   /// @param fitOptions The fit Options steering the fit
   /// @param idxedAlignSurfaces The idxed surfaces to be aligned
@@ -161,7 +161,7 @@ struct Alignment {
             typename fit_options_t>
   Acts::Result<detail::TrackAlignmentState> evaluateTrackAlignmentState(
       const Acts::GeometryContext& gctx,
-      const std::vector<source_link_t>& sourcelinks,
+      const std::vector<source_link_t>& sourceLinks,
       const start_parameters_t& sParameters, const fit_options_t& fitOptions,
       const std::unordered_map<const Acts::Surface*, std::size_t>&
           idxedAlignSurfaces,

Alignment/include/ActsAlignment/Kernel/Alignment.ipp

@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/EventData/VectorMultiTrajectory.hpp"
 #include "Acts/EventData/VectorTrackContainer.hpp"
@@ -15,7 +15,7 @@ template <typename source_link_t, typename start_parameters_t,
 Acts::Result<ActsAlignment::detail::TrackAlignmentState>
 ActsAlignment::Alignment<fitter_t>::evaluateTrackAlignmentState(
     const Acts::GeometryContext& gctx,
-    const std::vector<source_link_t>& sourcelinks,
+    const std::vector<source_link_t>& sourceLinks,
     const start_parameters_t& sParameters, const fit_options_t& fitOptions,
     const std::unordered_map<const Acts::Surface*, std::size_t>&
         idxedAlignSurfaces,
@@ -24,8 +24,8 @@ ActsAlignment::Alignment<fitter_t>::evaluateTrackAlignmentState(
                               Acts::VectorMultiTrajectory{}};
 
   // Convert to Acts::SourceLink during iteration
-  Acts::SourceLinkAdapterIterator begin{sourcelinks.begin()};
-  Acts::SourceLinkAdapterIterator end{sourcelinks.end()};
+  Acts::SourceLinkAdapterIterator begin{sourceLinks.begin()};
+  Acts::SourceLinkAdapterIterator end{sourceLinks.end()};
 
   // Perform the fit
   auto fitRes = m_fitter.fit(begin, end, sParameters, fitOptions, tracks);
@@ -82,13 +82,13 @@ void ActsAlignment::Alignment<fitter_t>::calculateAlignmentParameters(
   alignResult.numTracks = trajectoryCollection.size();
   double sumChi2ONdf = 0;
   for (unsigned int iTraj = 0; iTraj < trajectoryCollection.size(); iTraj++) {
-    const auto& sourcelinks = trajectoryCollection.at(iTraj);
+    const auto& sourceLinks = trajectoryCollection.at(iTraj);
     const auto& sParameters = startParametersCollection.at(iTraj);
     // Set the target surface
     fitOptionsWithRefSurface.referenceSurface = &sParameters.referenceSurface();
     // The result for one single track
     auto evaluateRes = evaluateTrackAlignmentState(
-        fitOptions.geoContext, sourcelinks, sParameters,
+        fitOptions.geoContext, sourceLinks, sParameters,
         fitOptionsWithRefSurface, alignResult.idxedAlignSurfaces, alignMask);
     if (!evaluateRes.ok()) {
       ACTS_DEBUG("Evaluation of alignment state for track " << iTraj

Alignment/include/ActsAlignment/Kernel/AlignmentError.hpp

@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 

Alignment/include/ActsAlignment/Kernel/AlignmentMask.hpp

@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 

Alignment/include/ActsAlignment/Kernel/detail/AlignmentEngine.hpp

@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 

Alignment/src/Kernel/detail/AlignmentEngine.cpp

@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsAlignment/Kernel/detail/AlignmentEngine.hpp"