Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .clang-format-check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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, #
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/fsr/install-deps/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 9 additions & 3 deletions .github/actions/fsr/pre-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions .github/actions/fsr/r3bbuild-steps/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
15 changes: 6 additions & 9 deletions .github/workflows/main_fsr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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, #
Expand Down
10 changes: 5 additions & 5 deletions COPYRIGHT
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ Upstream-Contact: Jose Luis Rodríguez-Sánchez <j.l.rodriguez.sanchez@udc.es>
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]
34 changes: 19 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion apply-format.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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, #
Expand Down
2 changes: 1 addition & 1 deletion at/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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, #
Expand Down
2 changes: 1 addition & 1 deletion at/SofAtLinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -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, *
Expand Down
2 changes: 1 addition & 1 deletion geobase/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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, #
Expand Down
2 changes: 1 addition & 1 deletion macros/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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, #
Expand Down
2 changes: 1 addition & 1 deletion sofana/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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, #
Expand Down
2 changes: 1 addition & 1 deletion sofdata/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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, #
Expand Down
2 changes: 1 addition & 1 deletion sofdata/SofDataLinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -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, *
Expand Down
2 changes: 1 addition & 1 deletion sofonline/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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, #
Expand Down
2 changes: 1 addition & 1 deletion sofonline/SofOnlineLinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -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, *
Expand Down
2 changes: 1 addition & 1 deletion sofsource/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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, #
Expand Down
2 changes: 1 addition & 1 deletion sofsource/SofSourceLinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -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, *
Expand Down
2 changes: 1 addition & 1 deletion tofwall/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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, #
Expand Down
2 changes: 1 addition & 1 deletion tofwall/SofTofWLinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -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, *
Expand Down
2 changes: 1 addition & 1 deletion trim/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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, #
Expand Down
Loading