From fa29ea8aa854ec68dcb8db5373215bd7c2d30c94 Mon Sep 17 00:00:00 2001 From: jose-luis-rs Date: Mon, 9 Dec 2024 23:23:32 +0100 Subject: [PATCH] Moved old folder githubfiles and removed old github configurations to run the CI tests --- .github/actions/pre-build/action.yml | 2 +- .../config}/fairsoft.gsi.de.conf | 0 .githubfiles/dart_experimental_apr22.cfg | 11 ---- .githubfiles/dart_experimental_jun19p2.cfg | 11 ---- .githubfiles/debian10-apr22-v18.6.8.def | 61 ----------------- .githubfiles/debian10-jun19p2-v18.2.1.def | 66 ------------------- .githubfiles/run_build_test_apr22.sh | 8 --- .githubfiles/run_build_test_jun19p2.sh | 8 --- .zenodo.json | 13 ++-- AUTHORS | 1 + CONTRIBUTORS | 1 - README.md | 2 +- 12 files changed, 9 insertions(+), 175 deletions(-) rename {.githubfiles => .github/config}/fairsoft.gsi.de.conf (100%) delete mode 100644 .githubfiles/dart_experimental_apr22.cfg delete mode 100644 .githubfiles/dart_experimental_jun19p2.cfg delete mode 100644 .githubfiles/debian10-apr22-v18.6.8.def delete mode 100644 .githubfiles/debian10-jun19p2-v18.2.1.def delete mode 100755 .githubfiles/run_build_test_apr22.sh delete mode 100755 .githubfiles/run_build_test_jun19p2.sh diff --git a/.github/actions/pre-build/action.yml b/.github/actions/pre-build/action.yml index fb8b40e80..ff72adead 100644 --- a/.github/actions/pre-build/action.yml +++ b/.github/actions/pre-build/action.yml @@ -29,7 +29,7 @@ runs: conda install -y conda-forge::ninja wget https://cernbox.cern.ch/remote.php/dav/public-files/RmnTeeOZpYjCJQb/masterkey.gsi.de.pub mv masterkey.gsi.de.pub /etc/cvmfs/keys - cp .githubfiles/fairsoft.gsi.de.conf /etc/cvmfs/config.d + cp .github/config/fairsoft.gsi.de.conf /etc/cvmfs/config.d mkdir -p ${CVMDIR} mount -t cvmfs fairsoft.gsi.de ${CVMDIR} mkdir -p ${UCESB_DIR} diff --git a/.githubfiles/fairsoft.gsi.de.conf b/.github/config/fairsoft.gsi.de.conf similarity index 100% rename from .githubfiles/fairsoft.gsi.de.conf rename to .github/config/fairsoft.gsi.de.conf diff --git a/.githubfiles/dart_experimental_apr22.cfg b/.githubfiles/dart_experimental_apr22.cfg deleted file mode 100644 index ea29a40c4..000000000 --- a/.githubfiles/dart_experimental_apr22.cfg +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -export LINUX_FLAVOUR=Debian10.6 -export FAIRSOFT_VERSION=apr22 -export FAIRROOT_VERSION=v18.6.8 -export SIMPATH=/misc/FairSoft/${FAIRSOFT_VERSION}/FairSoft-${FAIRSOFT_VERSION}/install -export FAIRROOTPATH=/misc/FairRoot/${FAIRROOT_VERSION}/install -export GIT_BRANCH=dev -export BUILDDIR=/tmp/r3broot/build_r3b_experimental_${FAIRSOFT_VERSION}_${FAIRROOT_VERSION} -export SOURCEDIR=$PWD -export UCESB_DIR=/misc/Ucesb/ucesb - diff --git a/.githubfiles/dart_experimental_jun19p2.cfg b/.githubfiles/dart_experimental_jun19p2.cfg deleted file mode 100644 index 103835ae4..000000000 --- a/.githubfiles/dart_experimental_jun19p2.cfg +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -export LINUX_FLAVOUR=Debian10.6 -export FAIRSOFT_VERSION=jun19p2 -export FAIRROOT_VERSION=v18.2.1 -export SIMPATH=/misc/FairSoft/${FAIRSOFT_VERSION}/build -export FAIRROOTPATH=/misc/FairRoot/${FAIRROOT_VERSION}/install -export GIT_BRANCH=dev -export BUILDDIR=/tmp/r3broot/build_r3b_experimental_${FAIRSOFT_VERSION}_${FAIRROOT_VERSION} -export SOURCEDIR=$PWD -export UCESB_DIR=/misc/Ucesb/ucesb - diff --git a/.githubfiles/debian10-apr22-v18.6.8.def b/.githubfiles/debian10-apr22-v18.6.8.def deleted file mode 100644 index 84af659b2..000000000 --- a/.githubfiles/debian10-apr22-v18.6.8.def +++ /dev/null @@ -1,61 +0,0 @@ -# vim: filetype=sh -Bootstrap: docker -From: debian:10.6 - -%post - -export DEBIAN_FRONTEND=noninteractive - -echo 'deb http://deb.debian.org/debian buster-backports main' >> /etc/apt/sources.list -apt-get update -y -apt-get upgrade -y -apt-get -y install autoconf automake binutils \ - bison build-essential bzip2 ca-certificates coreutils \ - curl debianutils file findutils flex g++ gcc gfortran git gzip \ - hostname libbz2-dev libcurl4-openssl-dev libgsl-dev libicu-dev \ - libfftw3-dev \ - libgl1-mesa-dev libglu1-mesa-dev libgrpc++-dev \ - libncurses-dev libreadline-dev libsqlite3-dev libssl-dev libtool \ - libx11-dev libxerces-c-dev libxext-dev libxft-dev \ - libxml2-dev libxmu-dev libxpm-dev libyaml-cpp-dev lsb-release make patch \ - python3-dev protobuf-compiler-grpc rsync sed subversion tar unzip wget xutils-dev xz-utils -apt-get -y -t buster-backports install cmake || \ - apt-get -y install cmake -apt-get -y install clang-format-8/buster-backports -apt-get -y clean - -mkdir -p ~/.subversion -echo '[global] -http-proxy-host = proxy.gsi.de -http-proxy-port = 3128' > ~/.subversion/servers - -mkdir -p /misc/FairSoft/apr22 && cd /misc/FairSoft/apr22 -wget https://github.com/FairRootGroup/FairSoft/archive/refs/tags/apr22.tar.gz -tar -xzf apr22.tar.gz -mkdir -p build -cmake -S ./FairSoft-apr22 -B ./build -C ./FairSoft-apr22/FairSoftConfig.cmake -cmake --build ./build -j 32 - -mkdir -p /misc/FairRoot/v18.6.8 && cd /misc/FairRoot/v18.6.8 -wget https://github.com/FairRootGroup/FairRoot/archive/refs/tags/v18.6.8.tar.gz -tar -xzf v18.6.8.tar.gz -mkdir -p build install && cd build -export SIMPATH=/misc/FairSoft/apr22/FairSoft-apr22/install -cmake -DCMAKE_INSTALL_PREFIX=../install ../FairRoot-18.6.8/ -make -j32 -make -j32 install - -mkdir -p /misc/Ucesb && cd /misc/Ucesb -git clone https://git.chalmers.se/expsubphys/ucesb.git -cd ucesb -export ROOTSYS=$SIMPATH -export PATH=$ROOTSYS/bin':'$PATH -export LD_LIBRARY_PATH=$ROOTSYS/lib/root':'$LD_LIBRARY_PATH -make -j32 empty/empty - -%environment -export SIMPATH=/misc/FairSoft/apr22/FairSoft-apr22/install -export FAIRROOTPATH=/misc/FairRoot/v18.6.8/install -export UCESB_DIR=/misc/Ucesb/ucesb - - diff --git a/.githubfiles/debian10-jun19p2-v18.2.1.def b/.githubfiles/debian10-jun19p2-v18.2.1.def deleted file mode 100644 index 3fc6a5fe4..000000000 --- a/.githubfiles/debian10-jun19p2-v18.2.1.def +++ /dev/null @@ -1,66 +0,0 @@ -# vim: filetype=sh -Bootstrap: docker -From: debian:10.6 - -%post - -export DEBIAN_FRONTEND=noninteractive - -echo 'deb http://deb.debian.org/debian buster-backports main' >> /etc/apt/sources.list -apt-get update -y -apt-get upgrade -y -apt-get install -y wget python build-essential ca-certificates bzip2 libbz2-dev zlib1g-dev \ -git patch unzip curl gfortran vim \ -libfreetype6 libfcgi-dev libsm6 libxext6 libxrender-dev libxpm-dev libxft-dev lsb-release \ -environment-modules ruby-full \ -cmake libxml2-dev libssl-dev libglu1-mesa-dev libcurl4-openssl-dev subversion automake libtool \ -clang-format-8/buster-backports \ -flex bison libncurses-dev - -mkdir -p ~/.subversion -echo '[global] -http-proxy-host = proxy.gsi.de -http-proxy-port = 3128' > ~/.subversion/servers - -mkdir -p /misc/FairSoft/jun19p2 && cd /misc/FairSoft/jun19p2 -wget https://github.com/FairRootGroup/FairSoft/archive/refs/tags/jun19p2.tar.gz -tar -xzf jun19p2.tar.gz -mkdir -p build -cd FairSoft-jun19p2 - -echo ' compiler=gcc - debug=yes - optimize=no - geant4_download_install_data_automatic=yes - geant4_install_data_from_dir=no - geant4mt=no - build_root6=yes - build_python=no - install_sim=yes - build_MQOnly=no - SIMPATH_INSTALL=$PWD/../build' > build_for_r3b.conf - -./configure.sh $PWD/build_for_r3b.conf - -mkdir -p /misc/FairRoot/v18.2.1 && cd /misc/FairRoot/v18.2.1 -wget https://github.com/FairRootGroup/FairRoot/archive/refs/tags/v18.2.1.tar.gz -tar -xzf v18.2.1.tar.gz -mkdir -p build install && cd build -export SIMPATH=/misc/FairSoft/jun19p2/build -cmake -DCMAKE_INSTALL_PREFIX=../install ../FairRoot-18.2.1/ -make -j32 -make -j32 install - -mkdir -p /misc/Ucesb && cd /misc/Ucesb -git clone https://git.chalmers.se/expsubphys/ucesb.git -cd ucesb -export ROOTSYS=$SIMPATH -export PATH=$ROOTSYS/bin':'$PATH -export LD_LIBRARY_PATH=$ROOTSYS/lib/root':'$LD_LIBRARY_PATH -make -j32 empty/empty - -%environment -export SIMPATH=/misc/FairSoft/jun19p2/build -export FAIRROOTPATH=/misc/FairRoot/v18.2.1/install -export UCESB_DIR=/misc/Ucesb/ucesb - diff --git a/.githubfiles/run_build_test_apr22.sh b/.githubfiles/run_build_test_apr22.sh deleted file mode 100755 index b92587a7a..000000000 --- a/.githubfiles/run_build_test_apr22.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -rm -rf /tmp/r3broot - -./Dart.sh Experimental .githubfiles/dart_experimental_apr22.cfg - -exit $? - diff --git a/.githubfiles/run_build_test_jun19p2.sh b/.githubfiles/run_build_test_jun19p2.sh deleted file mode 100755 index 51d67f57a..000000000 --- a/.githubfiles/run_build_test_jun19p2.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -rm -rf /tmp/r3broot - -./Dart.sh Experimental .githubfiles/dart_experimental_jun19p2.cfg - -exit $? - diff --git a/.zenodo.json b/.zenodo.json index 8795605fd..230e4811e 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -1,6 +1,6 @@ { "access_right": "open", - "description": "The R3BRoot software is based on the FairRoot framework and can be used to perform Monte Carlo simulations and experimental data analysis of the R3B (Reactions with Relativistic Radioactive Beams) nuclear physics experiments at the GSI-FAIR research center (Facility for Antiproton and Ion Research). The user can create simulated data and/or perform analysis with the same framework. Geant3 and Geant4 transport engines are supported, however, the implemented tasks that create simulated data do not depend on a particular Monte Carlo engine. The framework delivers base classes which enable the users to construct their detectors and/or analysis tasks in a simple way, it also delivers some general functionality like track visualization. Moreover, an interface for reading experimental and/or simulated magnetic field maps is also implemented.", + "description": "The R3BRoot software is based on the FairRoot framework and can be used to perform Monte Carlo simulations and experimental data analysis of the R3B (Reactions with Relativistic Radioactive Beams) nuclear physics experiments at the GSI-FAIR research center (Facility for Antiproton and Ion Research). The user can create simulated data and/or perform analysis with the same framework. Geant3 and Geant4 transport engines are supported, however, the implemented tasks that create simulated data do not depend on a particular Monte Carlo engine. The framework delivers base classes which enable the users to construct their detectors and/or analysis tasks in a simple way, it also delivers some general functionality like track visualization. Moreover, an interface for reading experimental and/or simulated magnetic field maps is also implemented. R3BRoot is a source distribution with recurring releases for macOS and Linux.", "maintainers": [ { "name": "Rodriguez-Sánchez, Jose Luis", @@ -93,6 +93,11 @@ "orcid": "0000-0001-6919-8869", "affiliation": "GSI Helmholtzzentrum für Schwerionenforschung, 64291 Darmstadt, Germany" }, + { + "name": "Barriere, Antoine", + "orcid": "0009-0005-2204-3516", + "affiliation": "GANIL, 14000 Caen, France" + }, { "name": "Bott, Lukas", "orcid": "0000-0002-9554-6246", @@ -246,12 +251,6 @@ "name": "Bajzek, Martin", "affiliation": "GSI Helmholtzzentrum für Schwerionenforschung, 64291 Darmstadt, Germany" }, - { - "type": "Other", - "name": "Barriere, Antoine", - "orcid": "0009-0005-2204-3516", - "affiliation": "GANIL, 14000 Caen, France" - }, { "type": "Other", "name": "Boretzky, Konstanze", diff --git a/AUTHORS b/AUTHORS index 058ac96d1..d96b50170 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,7 @@ Rodríguez-Sánchez, Jose Luis [j.l.rodriguez.sanchez@udc.es] [https://orcid.org/0000-0002-4702-5294] [CITENI, Industrial Campus of Ferrol, University of Coruña, 15403 Ferrol, Spain] Alvarez Pol, Hector [hector.alvarez@usc.es] [https://orcid.org/0000-0001-9643-6252] [IGFAE, University of Santiago de Compostela, 15782 Santiago de Compostela, Spain] Atar, Leyla [https://orcid.org/0000-0001-6919-8869] [GSI Helmholtzzentrum für Schwerionenforschung, 64291 Darmstadt, Germany] +Barriere, Antoine [https://orcid.org/0009-0005-2204-3516] [GANIL, 14000 Caen, France] Bott, Lukas [https://orcid.org/0000-0002-9554-6246] [Goethe University Frankfurt, 60629 Frankfurt am Main, Germany] Chatillon, Audrey [CEA, DAM, DIF, 91297 Arpajon, France] Feijoo-Fontán, Martina [https://orcid.org/0000-0002-8507-5137] [IGFAE, University of Santiago de Compostela, 15782 Santiago de Compostela, Spain] diff --git a/CONTRIBUTORS b/CONTRIBUTORS index d06ec35cc..2a31cab8d 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,7 +1,6 @@ Al-Turany, Mohammad [https://orcid.org/0000-0002-8071-4497] [GSI Helmholtzzentrum für Schwerionenforschung, 64291 Darmstadt, Germany] Audouin, Laurent [https://orcid.org/0000-0001-9899-6923] [IPN Orsay, 91406 Orsay, France] Bajzek, Martin [GSI Helmholtzzentrum für Schwerionenforschung, 64291 Darmstadt, Germany] -Barriere, Antoine [https://orcid.org/0009-0005-2204-3516] [GANIL, 14000 Caen, France] Boretzky, Konstanze [GSI Helmholtzzentrum für Schwerionenforschung, 64291 Darmstadt, Germany] Cabanelas, Pablo [https://orcid.org/0000-0002-5416-4647] [IGFAE, University of Santiago de Compostela, 15782 Santiago de Compostela, Spain] Douma, Christiaan [University of Gronningen, 9712 Gronningen, The Netherlands] diff --git a/README.md b/README.md index 993fb0466..d1393d291 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ## The R3BRoot Framework -The R3BRoot software is based on the FairRoot framework and can be used to perform Monte Carlo simulations and experimental data analysis of the R3B (Reactions with Relativistic Radioactive Beams) nuclear physics experiments at the GSI-FAIR research center (Facility for Antiproton and Ion Research). The user can create simulated data and/or perform analysis with the same framework. Geant3 and Geant4 transport engines are supported, however, the implemented tasks that create simulated data do not depend on a particular Monte Carlo engine. The framework delivers base classes which enable the users to construct their detectors and/or analysis tasks in a simple way, it also delivers some general functionality like track visualization. Moreover, an interface for reading experimental and/or simulated magnetic field maps is also implemented. +The R3BRoot software is based on the FairRoot framework and can be used to perform Monte Carlo simulations and experimental data analysis of the R3B (Reactions with Relativistic Radioactive Beams) nuclear physics experiments at the GSI-FAIR research center (Facility for Antiproton and Ion Research). The user can create simulated data and/or perform analysis with the same framework. Geant3 and Geant4 transport engines are supported, however, the implemented tasks that create simulated data do not depend on a particular Monte Carlo engine. The framework delivers base classes which enable the users to construct their detectors and/or analysis tasks in a simple way, it also delivers some general functionality like track visualization. Moreover, an interface for reading experimental and/or simulated magnetic field maps is also implemented. R3BRoot is a source distribution with recurring releases for macOS and Linux. ## Discussion Forum