diff --git a/.clang-format-check.sh b/.clang-format-check.sh index 2989f9b5..a9d1d07c 100755 --- a/.clang-format-check.sh +++ b/.clang-format-check.sh @@ -3,7 +3,7 @@ # Copyright (C) 2019 University of Santiago de Compostela # # Copyright (C) 2019 CEA-DAM-DIF, Université Paris-Saclay # # Copyright (C) 2023 University of Coruña # -# Copyright (C) 2019-2025 Members of R3B Collaboration # +# Copyright (C) 2019-2026 Members of R3B Collaboration # # # # This software is distributed under the terms of the # # GNU General Public Licence (GPL) version 3, # diff --git a/.github/actions/fsr/install-deps/action.yml b/.github/actions/fsr/install-deps/action.yml index 0b719b21..f98eb382 100644 --- a/.github/actions/fsr/install-deps/action.yml +++ b/.github/actions/fsr/install-deps/action.yml @@ -39,6 +39,6 @@ runs: if: steps.cache-ucesb.outputs.cache-hit != 'true' run: | export LD_LIBRARY_PATH="${SIMPATH}/lib/:${LD_LIBRARY_PATH}" - git clone https://git.chalmers.se/expsubphys/ucesb.git - cd ucesb && make -j${NUM_THREADS} empty/empty + git clone https://git.chalmers.se/expsubphys/ucesb.git ${UCESB_DIR} + cd ${UCESB_DIR} && make -j${NUM_THREADS} empty/empty shell: bash diff --git a/.github/actions/fsr/pre-build/action.yml b/.github/actions/fsr/pre-build/action.yml index 7a758bf9..c66bf462 100644 --- a/.github/actions/fsr/pre-build/action.yml +++ b/.github/actions/fsr/pre-build/action.yml @@ -23,9 +23,15 @@ runs: shell: bash - name: update system - run: | - apt-get update - apt-get install --fix-missing -y sudo wget gnupg lsb-release + run: | + if command -v apt-get >/dev/null 2>&1; then + apt-get update + apt-get install --fix-missing -y sudo gnupg lsb-release + elif command -v dnf >/dev/null 2>&1; then + dnf -y install sudo gnupg2 which diffutils + echo "YACC=bison" >> $GITHUB_ENV + fi + cat /etc/os-release mkdir -p ${UCESB_DIR} mkdir -p ${CCACHE_DIR} shell: bash diff --git a/.github/actions/fsr/r3bbuild-steps/action.yml b/.github/actions/fsr/r3bbuild-steps/action.yml index 54a9e1cc..6bac5393 100644 --- a/.github/actions/fsr/r3bbuild-steps/action.yml +++ b/.github/actions/fsr/r3bbuild-steps/action.yml @@ -31,6 +31,7 @@ runs: mv sofia R3BRoot mv R3BRoot sofia cd sofia + git clone https://github.com/R3BRootGroup/R3BFileSource.git mv sofia/ucesb . export UCESB_DIR=$GITHUB_WORKSPACE/ucesb/ echo "UCESB_DIR=$GITHUB_WORKSPACE/ucesb/" >> $GITHUB_ENV diff --git a/.github/workflows/check_metadata.yaml b/.github/workflows/check_metadata.yaml index f4cba15e..759435a1 100644 --- a/.github/workflows/check_metadata.yaml +++ b/.github/workflows/check_metadata.yaml @@ -20,7 +20,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - name: Try updating metadata run: python update_zenodo.py - name: Check for Updates diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f68c83e1..0e82a10f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ # See the CI workflow developed for R3BRoot for more details # SPDX-License-Identifier: LGPL-3.0-or-later -name: CI-CD +name: CI-CD-GSI # Controls when the action will run. on: @@ -53,7 +53,7 @@ jobs: # Here are the groups of repositories that need to be downloaded inside # r3broot. Each group is used by only one job. repos: [ sofia ] - os: [ debian11, debian12 , debian13] + os: [ debian11, debian12 ] fsv: [ jan24p5 ] cpp: [ 17 ] include: @@ -83,7 +83,7 @@ jobs: # another github repo or a self-defined one in .github/actions. steps: # Fetch updates from pull request branches using a public github action. - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: # This allows all commits of all branches to be fetched. fetch-depth: 0 diff --git a/.github/workflows/main_fsr.yml b/.github/workflows/main_fsr.yml index 8a25bae3..0932a5a0 100644 --- a/.github/workflows/main_fsr.yml +++ b/.github/workflows/main_fsr.yml @@ -18,7 +18,7 @@ # See the CI workflow developed for R3BRoot for more details # SPDX-License-Identifier: LGPL-3.0-or-later -name: CI-CD +name: CI-CD-Main # Controls when the action will run. on: @@ -48,8 +48,10 @@ jobs: # Definition of the strategy matrix matrix: # Each group is used by only one job. - repos: [ sofia ] - sys: [ debian13_cpp17_feb26p1_v19.0.1 , debian13_cpp20_feb26p1_v19.0.1 , debian14_cpp17_feb26p1_v19.0.1 , ubuntu2604_cpp17_jan24p6_v19.0.1 ] + repos: [ sofia ] + sys: [ debian12_cpp17_feb26p1_v19.0.1, almalinux101_cpp17_feb26p1_v19.0.1, ubuntu2604_cpp17_feb26p1_v19.0.1, + debian13_cpp17_feb26p1_v19.0.1, debian13_cpp20_feb26p1_v19.0.1, debian13_cpp23_feb26p1_v19.0.1, + debian14_cpp17_feb26p1_v19.0.1, debian14_cpp20_feb26p1_v19.0.1, debian14_cpp23_feb26p1_v19.0.1 ] include: - preset: simple - repos: sofia @@ -60,24 +62,19 @@ jobs: # information, please visit the Docker repository at Dockerhub. container: image: r3bdockers/${{ matrix.sys }} - volumes: - - /tmp:/cvmfs env: - CVMDIR: /cvmfs/fairsoft.gsi.de # Specifying the number of threads available for the building and # testing. Github hosted runners can have at most 4 cores. The number # of the cores can be increased with a larger runner, thus increasing # the speed of the run. NUM_THREADS: 4 - # Options for the Docker container to be run with cvmfs. - options: --user root --privileged --ulimit nofile=10000:10000 --cap-add SYS_ADMIN --device /dev/fuse # Each job contains different steps that are executed sequentially. Each # step could be multiple shell commands or a composite action either from # another github repo or a self-defined one in .github/actions. steps: # Fetch updates from pull request branches using a public github action. - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: # This allows all commits of all branches to be fetched. fetch-depth: 0 diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index 72fd9909..8c27626d 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -35,7 +35,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - name: Code formatting run: | cd $GITHUB_WORKSPACE diff --git a/CMakeLists.txt b/CMakeLists.txt index 28ac7f04..1fb08d57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ # Copyright (C) 2019 University of Santiago de Compostela # # Copyright (C) 2019 CEA-DAM-DIF, Université Paris-Saclay # # Copyright (C) 2023 University of Coruña # -# Copyright (C) 2019-2025 Members of R3B Collaboration # +# Copyright (C) 2019-2026 Members of R3B Collaboration # # # # This software is distributed under the terms of the # # GNU General Public Licence (GPL) version 3, # diff --git a/COPYRIGHT b/COPYRIGHT index c228d5e5..a63d7e72 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -4,9 +4,9 @@ Upstream-Contact: Jose Luis Rodríguez-Sánchez Source: https://github.com/R3BRootGroup/sofia Files: * -Copyright: 2023-2025, University of Coruña -Copyright: 2017-2025, University of Santiago de Compostela -Copyright: 2017-2025, CEA-DAM-DIF, Université Paris-Saclay +Copyright: 2023-2026, University of Coruña +Copyright: 2017-2026, University of Santiago de Compostela +Copyright: 2017-2026, CEA-DAM-DIF, Université Paris-Saclay Copyright: 2017-2020, GSI Helmholtzzentrum fuer Schwerionenforschung GmbH -Copyright: 2017-2025, [see AUTHORS file] -Copyright: 2017-2025, [see CONTRIBUTORS file] +Copyright: 2017-2026, [see AUTHORS file] +Copyright: 2017-2026, [see CONTRIBUTORS file] diff --git a/README.md b/README.md index af950b1b..d9e0f246 100644 --- a/README.md +++ b/README.md @@ -130,15 +130,15 @@ Some simulations of two experimental configurations are included inside the sofi This directory contains all the detector geometries generated from the macros located at ./sofia/macros/geo. The existing geometries are : -- sof_at_v19a.geo.root for the Active target detector -- mwpc_0.geo.root for the MWPC0 detector +- sof_at_v21.geo.root for the Active target detector +- mwpc0_v2021.3.geo.root for the MWPC0 detector - targetvacuumchamber_ams_s455.geo.root for the vacuum chamber and AMS silicon detectors -- mwpc_1.geo.root for the MWPC1 detector -- twinmusic_v22.geo.root for the twin-Music detector -- mwpc_2.geo.root for the MWPC2 detector -- mwpc_3.geo.root for the MWPC3 detector -- glad_s455.geo.root for GLAD magnet -- sof_tof_v21.geo.root for the ToF-Wall detector +- mwpc1_v2021.3.geo.root for the MWPC1 detector +- twinmusic_v2021.3.geo.root for the twin-Music detector +- mwpc2_v2021.3.geo.root for the MWPC2 detector +- mwpc3_v2021.3.geo.root for the MWPC3 detector +- glad_v2025.1.fission.geo.root for GLAD magnet +- sof_tof_v2021.3.geo.root for the ToF-Wall detector ### sofia/macros/coulexsim @@ -329,16 +329,20 @@ The following systems are tested regularly. | **OS Name** | **Arch** | **OS Version** | **Compiler** | **CMake** | **C++ Version** | | ----------- | -------- | -------------- | ------------- | --------------- | --------------- | -| Almalinux | x86\_64 | 9.3 | GCC 11.4.1 | 3.27.9 / 4.0.3 | C++17 / C++20 | +| Almalinux | x86\_64 | 9.3 | GCC 11.4.1 | 3.27.9 / 4.0.3 | C++17 / C++20 / C++23 | | Almalinux | x86\_64 | 9.4 | GCC 14.2.0 | 3.30.6 | C++17 | +| Almalinux | x86\_64 | 9.7 | GCC 11.4.1 | 4.2.0 | C++17 / C++20 / C++23 | +| Almalinux | x86\_64 | 10.1 | GCC 14.2.0 | 4.0.3 | C++17 / C++20 / C++23 | +| Almalinux | x86\_64 | 10.2 | GCC 14.3.1 | 4.0.3 | C++17 / C++20 / C++23 | | RHEL | x86\_64 | 9.6 | GCC 14.2.0 | 3.30.6 | C++17 | | Debian | x86\_64 | 11 | GCC 10.2.1 | 3.27.4 / 3.30.0 | C++17 | -| Debian | x86\_64 | 12 | GCC 12.2.0 | 3.27.4 / 3.30.0 | C++17 / C++20 | -| Debian | x86\_64 | 13 | GCC 14.2.0 | 3.31.6 / 4.0.3 | C++17 | -| Debian | x86\_64 | 14 | GCC 15.2.0 | 4.0.3 | C++17 | -| Ubuntu | x86\_64 | 24.04 | GCC 13.3.0 | 3.28.3 / 4.0.3 | C++17 / C++20 | -| Ubuntu | x86\_64 | 25.04 | GCC 14.2.0 | 3.31.6 / 4.0.3 | C++17 | -| Ubuntu | x86\_64 | 26.04 | GCC 15.2.0 | 4.0.3 | C++17 | +| Debian | x86\_64 | 12 | GCC 12.2.0 | 3.27.4 / 4.0.3 | C++17 / C++20 | +| Debian | x86\_64 | 13 | GCC 14.2.0 | 3.31.6 / 4.0.3 | C++17 / C++20 / C++23 | +| Debian | x86\_64 | 14 | GCC 15.2.0 | 3.31.6 / 4.0.3 | C++17 / C++20 / C++23 | +| Ubuntu | x86\_64 | 24.04 | GCC 13.3.0 | 3.28.3 / 4.0.3 | C++17 / C++20 / C++23 | +| Ubuntu | x86\_64 | 25.04 | GCC 14.2.0 | 3.31.6 | C++17 / C++20 | +| Ubuntu | x86\_64 | 26.04 | GCC 15.2.0 | 3.31.6 / 4.0.3 | C++17 / C++20 / C++23 | +| MacOS | arm64 | 15.3 | AppleClang 15 | 4.0.3 | C++17 | ## More Information diff --git a/apply-format.sh b/apply-format.sh index 3b5d4ca2..524e1434 100644 --- a/apply-format.sh +++ b/apply-format.sh @@ -3,7 +3,7 @@ # Copyright (C) 2019 University of Santiago de Compostela # # Copyright (C) 2019 CEA-DAM-DIF, Université Paris-Saclay # # Copyright (C) 2023 University of Coruña # -# Copyright (C) 2019-2025 Members of R3B Collaboration # +# Copyright (C) 2019-2026 Members of R3B Collaboration # # # # This software is distributed under the terms of the # # GNU General Public Licence (GPL) version 3, # diff --git a/at/CMakeLists.txt b/at/CMakeLists.txt index 0102f121..2282d952 100644 --- a/at/CMakeLists.txt +++ b/at/CMakeLists.txt @@ -3,7 +3,7 @@ # Copyright (C) 2019 University of Santiago de Compostela # # Copyright (C) 2019 CEA-DAM-DIF, Université Paris-Saclay # # Copyright (C) 2023 University of Coruña # -# Copyright (C) 2019-2025 Members of R3B Collaboration # +# Copyright (C) 2019-2026 Members of R3B Collaboration # # # # This software is distributed under the terms of the # # GNU General Public Licence (GPL) version 3, # diff --git a/at/SofAtLinkDef.h b/at/SofAtLinkDef.h index 6cedb235..354e84ce 100644 --- a/at/SofAtLinkDef.h +++ b/at/SofAtLinkDef.h @@ -4,7 +4,7 @@ * Copyright (C) 2019 University of Santiago de Compostela * * Copyright (C) 2019 CEA-DAM-DIF, Université Paris-Saclay * * Copyright (C) 2023 University of Coruña * - * Copyright (C) 2019-2025 Members of R3B Collaboration * + * Copyright (C) 2019-2026 Members of R3B Collaboration * * * * This software is distributed under the terms of the * * GNU General Public Licence (GPL) version 3, * diff --git a/geobase/CMakeLists.txt b/geobase/CMakeLists.txt index eff11181..a43113b3 100755 --- a/geobase/CMakeLists.txt +++ b/geobase/CMakeLists.txt @@ -3,7 +3,7 @@ # Copyright (C) 2019 University of Santiago de Compostela # # Copyright (C) 2019 CEA-DAM-DIF, Université Paris-Saclay # # Copyright (C) 2023 University of Coruña # -# Copyright (C) 2019-2025 Members of R3B Collaboration # +# Copyright (C) 2019-2026 Members of R3B Collaboration # # # # This software is distributed under the terms of the # # GNU General Public Licence (GPL) version 3, # diff --git a/macros/CMakeLists.txt b/macros/CMakeLists.txt index 76c0b9ca..db85e7e3 100755 --- a/macros/CMakeLists.txt +++ b/macros/CMakeLists.txt @@ -3,7 +3,7 @@ # Copyright (C) 2019 University of Santiago de Compostela # # Copyright (C) 2019 CEA-DAM-DIF, Université Paris-Saclay # # Copyright (C) 2023 University of Coruña # -# Copyright (C) 2019-2025 Members of R3B Collaboration # +# Copyright (C) 2019-2026 Members of R3B Collaboration # # # # This software is distributed under the terms of the # # GNU General Public Licence (GPL) version 3, # diff --git a/sofana/CMakeLists.txt b/sofana/CMakeLists.txt index dfd01d42..8038ca3d 100644 --- a/sofana/CMakeLists.txt +++ b/sofana/CMakeLists.txt @@ -3,7 +3,7 @@ # Copyright (C) 2019 University of Santiago de Compostela # # Copyright (C) 2019 CEA-DAM-DIF, Université Paris-Saclay # # Copyright (C) 2023 University of Coruña # -# Copyright (C) 2019-2025 Members of R3B Collaboration # +# Copyright (C) 2019-2026 Members of R3B Collaboration # # # # This software is distributed under the terms of the # # GNU General Public Licence (GPL) version 3, # diff --git a/sofdata/CMakeLists.txt b/sofdata/CMakeLists.txt index 9eae56a3..6a32b394 100755 --- a/sofdata/CMakeLists.txt +++ b/sofdata/CMakeLists.txt @@ -3,7 +3,7 @@ # Copyright (C) 2019 University of Santiago de Compostela # # Copyright (C) 2019 CEA-DAM-DIF, Université Paris-Saclay # # Copyright (C) 2023 University of Coruña # -# Copyright (C) 2019-2025 Members of R3B Collaboration # +# Copyright (C) 2019-2026 Members of R3B Collaboration # # # # This software is distributed under the terms of the # # GNU General Public Licence (GPL) version 3, # diff --git a/sofdata/SofDataLinkDef.h b/sofdata/SofDataLinkDef.h index 930a200d..eec188ab 100755 --- a/sofdata/SofDataLinkDef.h +++ b/sofdata/SofDataLinkDef.h @@ -4,7 +4,7 @@ * Copyright (C) 2019 University of Santiago de Compostela * * Copyright (C) 2019 CEA-DAM-DIF, Université Paris-Saclay * * Copyright (C) 2023 University of Coruña * - * Copyright (C) 2019-2025 Members of R3B Collaboration * + * Copyright (C) 2019-2026 Members of R3B Collaboration * * * * This software is distributed under the terms of the * * GNU General Public Licence (GPL) version 3, * diff --git a/sofonline/CMakeLists.txt b/sofonline/CMakeLists.txt index d1c5f69c..3f0c1a32 100644 --- a/sofonline/CMakeLists.txt +++ b/sofonline/CMakeLists.txt @@ -3,7 +3,7 @@ # Copyright (C) 2019 University of Santiago de Compostela # # Copyright (C) 2019 CEA-DAM-DIF, Université Paris-Saclay # # Copyright (C) 2023 University of Coruña # -# Copyright (C) 2019-2025 Members of R3B Collaboration # +# Copyright (C) 2019-2026 Members of R3B Collaboration # # # # This software is distributed under the terms of the # # GNU General Public Licence (GPL) version 3, # diff --git a/sofonline/SofOnlineLinkDef.h b/sofonline/SofOnlineLinkDef.h index f0c6c87d..d7b45dee 100644 --- a/sofonline/SofOnlineLinkDef.h +++ b/sofonline/SofOnlineLinkDef.h @@ -4,7 +4,7 @@ * Copyright (C) 2019 University of Santiago de Compostela * * Copyright (C) 2019 CEA-DAM-DIF, Université Paris-Saclay * * Copyright (C) 2023 University of Coruña * - * Copyright (C) 2019-2025 Members of R3B Collaboration * + * Copyright (C) 2019-2026 Members of R3B Collaboration * * * * This software is distributed under the terms of the * * GNU General Public Licence (GPL) version 3, * diff --git a/sofsource/CMakeLists.txt b/sofsource/CMakeLists.txt index 5c8a93a4..ec44389d 100755 --- a/sofsource/CMakeLists.txt +++ b/sofsource/CMakeLists.txt @@ -3,7 +3,7 @@ # Copyright (C) 2019 University of Santiago de Compostela # # Copyright (C) 2019 CEA-DAM-DIF, Université Paris-Saclay # # Copyright (C) 2023 University of Coruña # -# Copyright (C) 2019-2025 Members of R3B Collaboration # +# Copyright (C) 2019-2026 Members of R3B Collaboration # # # # This software is distributed under the terms of the # # GNU General Public Licence (GPL) version 3, # diff --git a/sofsource/SofSourceLinkDef.h b/sofsource/SofSourceLinkDef.h index c86bfe3e..21fbe256 100755 --- a/sofsource/SofSourceLinkDef.h +++ b/sofsource/SofSourceLinkDef.h @@ -4,7 +4,7 @@ * Copyright (C) 2019 University of Santiago de Compostela * * Copyright (C) 2019 CEA-DAM-DIF, Université Paris-Saclay * * Copyright (C) 2023 University of Coruña * - * Copyright (C) 2019-2025 Members of R3B Collaboration * + * Copyright (C) 2019-2026 Members of R3B Collaboration * * * * This software is distributed under the terms of the * * GNU General Public Licence (GPL) version 3, * diff --git a/tofwall/CMakeLists.txt b/tofwall/CMakeLists.txt index 1bc59164..240e24ed 100755 --- a/tofwall/CMakeLists.txt +++ b/tofwall/CMakeLists.txt @@ -3,7 +3,7 @@ # Copyright (C) 2019 University of Santiago de Compostela # # Copyright (C) 2019 CEA-DAM-DIF, Université Paris-Saclay # # Copyright (C) 2023 University of Coruña # -# Copyright (C) 2019-2025 Members of R3B Collaboration # +# Copyright (C) 2019-2026 Members of R3B Collaboration # # # # This software is distributed under the terms of the # # GNU General Public Licence (GPL) version 3, # diff --git a/tofwall/SofTofWLinkDef.h b/tofwall/SofTofWLinkDef.h index ec08102d..19afda6b 100755 --- a/tofwall/SofTofWLinkDef.h +++ b/tofwall/SofTofWLinkDef.h @@ -4,7 +4,7 @@ * Copyright (C) 2019 University of Santiago de Compostela * * Copyright (C) 2019 CEA-DAM-DIF, Université Paris-Saclay * * Copyright (C) 2023 University of Coruña * - * Copyright (C) 2019-2025 Members of R3B Collaboration * + * Copyright (C) 2019-2026 Members of R3B Collaboration * * * * This software is distributed under the terms of the * * GNU General Public Licence (GPL) version 3, * diff --git a/trim/CMakeLists.txt b/trim/CMakeLists.txt index 1b9f789d..9dcbaf70 100644 --- a/trim/CMakeLists.txt +++ b/trim/CMakeLists.txt @@ -3,7 +3,7 @@ # Copyright (C) 2019 University of Santiago de Compostela # # Copyright (C) 2019 CEA-DAM-DIF, Université Paris-Saclay # # Copyright (C) 2023 University of Coruña # -# Copyright (C) 2019-2025 Members of R3B Collaboration # +# Copyright (C) 2019-2026 Members of R3B Collaboration # # # # This software is distributed under the terms of the # # GNU General Public Licence (GPL) version 3, # diff --git a/trim/SofTrimLinkDef.h b/trim/SofTrimLinkDef.h index f4c93a21..eee5f73f 100644 --- a/trim/SofTrimLinkDef.h +++ b/trim/SofTrimLinkDef.h @@ -4,7 +4,7 @@ * Copyright (C) 2019 University of Santiago de Compostela * * Copyright (C) 2019 CEA-DAM-DIF, Université Paris-Saclay * * Copyright (C) 2023 University of Coruña * - * Copyright (C) 2019-2025 Members of R3B Collaboration * + * Copyright (C) 2019-2026 Members of R3B Collaboration * * * * This software is distributed under the terms of the * * GNU General Public Licence (GPL) version 3, * diff --git a/update_zenodo.py b/update_zenodo.py index a1cc6f88..e6255c8b 100644 --- a/update_zenodo.py +++ b/update_zenodo.py @@ -3,7 +3,7 @@ # Copyright (C) 2019 University of Santiago de Compostela # # Copyright (C) 2019 CEA-DAM-DIF, Université Paris-Saclay # # Copyright (C) 2023 University of Coruña # -# Copyright (C) 2019-2025 Members of R3B Collaboration # +# Copyright (C) 2019-2026 Members of R3B Collaboration # # # # This software is distributed under the terms of the # # GNU General Public Licence (GPL) version 3, #