Skip to content

Commit

Permalink
Merge branch 'main' into feat/trk-vol-surface-storage
Browse files Browse the repository at this point in the history
  • Loading branch information
@paulgessinger
paulgessinger committed Oct 2, 2024
2 parents 3dc38e6 + 11be339 commit 79eda1c
Show file tree
Hide file tree
Showing 1,990 changed files with 6,277 additions and 6,475 deletions.
10 changes: 5 additions & 5 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ build_exatrkx_cpu:
-DACTS_EXATRKX_ENABLE_CUDA=OFF
- ccache -z
- cmake --build build -- -j8
- cmake --build build -- -j6
- ccache -s

build_exatrkx:
Expand Down Expand Up @@ -119,7 +119,7 @@ build_exatrkx:
-DCMAKE_CUDA_ARCHITECTURES="75;86"
- ccache -z
- cmake --build build -- -j8
- cmake --build build -- -j6
- ccache -s

# test_exatrkx_unittests:
Expand Down Expand Up @@ -186,7 +186,7 @@ build_linux_ubuntu:
-DACTS_BUILD_PLUGIN_ONNX=ON
- ccache -z
- cmake --build build -- -j8
- cmake --build build -- -j6
- ccache -s

linux_test_examples:
Expand Down Expand Up @@ -271,7 +271,7 @@ linux_physmon:
-DCMAKE_CXX_STANDARD=${CXXSTD}
- ccache -z
- cmake --build build -- -j8
- cmake --build build -- -j6
- ccache -s

- ctest --test-dir build -j$(nproc)
Expand Down Expand Up @@ -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 -- -j8
- cmake --build build -- -j6
- ccache -s

- ctest --test-dir build -j$(nproc)
Expand Down
6 changes: 3 additions & 3 deletions Alignment/include/ActsAlignment/Kernel/Alignment.hpp
View file
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 3 additions & 3 deletions Alignment/include/ActsAlignment/Kernel/Alignment.ipp
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
6 changes: 3 additions & 3 deletions Alignment/include/ActsAlignment/Kernel/AlignmentError.hpp
View file
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 3 additions & 3 deletions Alignment/include/ActsAlignment/Kernel/AlignmentMask.hpp
View file
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 3 additions & 3 deletions Alignment/include/ActsAlignment/Kernel/detail/AlignmentEngine.hpp
View file
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 3 additions & 3 deletions Alignment/src/Kernel/detail/AlignmentEngine.cpp
View file
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
Loading

0 comments on commit 79eda1c

Please sign in to comment.