From 047bb6452ab7f0b2dfd080c082282f5274ff53ac Mon Sep 17 00:00:00 2001 From: kochebina Date: Thu, 8 Jan 2026 10:27:39 +0100 Subject: [PATCH 01/27] CMakeLists.txt --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e009bc4b5..4cf7affb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,8 +98,8 @@ STRING(REGEX REPLACE "(.*)[.](.*)[.](.*)" "\\3" G4VERSION_PATCH ${Geant4_VERSION #MESSAGE(${G4VERSION_MAJOR}) #MESSAGE(${G4VERSION_MINOR}) #MESSAGE(${G4VERSION_PATCH}) -IF(NOT ${G4VERSION_MAJOR}.${G4VERSION_MINOR} EQUAL 11.3) - MESSAGE("Warning! This GATE version is not validated for Geant4 ${G4VERSION_MAJOR}.${G4VERSION_MINOR} distribution. Please use Geant4 11.3 distribution instead.") +IF(NOT ${G4VERSION_MAJOR}.${G4VERSION_MINOR} EQUAL 11.4.0) + MESSAGE("Warning! This GATE version is not validated for Geant4 ${G4VERSION_MAJOR}.${G4VERSION_MINOR} distribution. Please use Geant4 11.4.0 distribution instead.") ENDIF() #========================================================= @@ -312,13 +312,13 @@ MESSAGE("Your current Geant4 version is ${Geant4_VERSION}") #========================================================= # Display message about this version -MESSAGE("IMPORTANT! This version of GATE (9.4.1) has still some traces of passage for new digitizer.") +MESSAGE("IMPORTANT! This version of GATE (9.4.2) has still some traces of passage for new digitizer.") MESSAGE("Please, be aware that some of functionalities are NOT YET re-implemented: ") MESSAGE("- Output: Sinogram, Ecat7, LMF") MESSAGE("- ARF may work not properly yet") MESSAGE("We apologize for this inconvenience and kindly ask for your patience.") MESSAGE("This functionalities will be added during 2025.") -MESSAGE("Meanwhile, please, use Gate 9.4") +MESSAGE("Meanwhile, please, use Gate 9.2") From 5d7376463aef76185eaec0ab8f251681dab23498 Mon Sep 17 00:00:00 2001 From: kochebina Date: Thu, 8 Jan 2026 10:31:34 +0100 Subject: [PATCH 02/27] Gate.cc and readme.md --- Gate.cc | 4 ++-- readme.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gate.cc b/Gate.cc index baca74917..b906f184f 100644 --- a/Gate.cc +++ b/Gate.cc @@ -158,7 +158,7 @@ void welcome() { GateMessage("Core", 0, G4endl); GateMessage("Core", 0, "*******************************************************" << G4endl); - GateMessage("Core", 0, " GATE version 9.4.1 (2025)" << G4endl); + GateMessage("Core", 0, " GATE version 9.4.2 (2026)" << G4endl); GateMessage("Core", 0, " Copyright : OpenGATE Collaboration" << G4endl); GateMessage("Core", 0, " Reference : Phys. Med. Biol. 49(19) 4543-4561 2004 " << G4endl); GateMessage("Core", 0, " Reference : Phys. Med. Biol. 56(4) 881-901 2011 " << G4endl); @@ -256,7 +256,7 @@ int main( int argc, char* argv[] ) break; case 'v': ss << G4VERSION_MAJOR << "." << G4VERSION_MINOR << "." << G4VERSION_PATCH; - std::cout << "Gate version is 9.4.1; Geant4 version is " << ss.str() << std::endl; + std::cout << "Gate version is 9.4.2; Geant4 version is " << ss.str() << std::endl; exit(0); break; case 'a': diff --git a/readme.md b/readme.md index a29ee5a76..3db10423a 100644 --- a/readme.md +++ b/readme.md @@ -15,7 +15,7 @@ More details : http://www.opengatecollaboration.org Documentation : https://opengate.readthedocs.io -* The stable version is tag 9.4.1: https://github.com/OpenGATE/Gate/tree/v9.4.1 with Geant4 11.3.0 +* The stable version is tag 9.4.2: https://github.com/OpenGATE/Gate/tree/v9.4.2 with Geant4 11.4.0 * The current development version is branch 'develop' (default): http://github.com/OpenGATE/Gate/tree/develop * [Benchmarks](https://github.com/OpenGATE/GateBenchmarks) * [Examples](https://github.com/OpenGATE/GateContrib) From 6c158ac76edf5a7271fb4b7eeed1e97403b2321c Mon Sep 17 00:00:00 2001 From: kochebina Date: Thu, 8 Jan 2026 15:08:47 +0100 Subject: [PATCH 03/27] itk-mhd Cmake version > 3.5 --- source/externals/itk-mhd/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/externals/itk-mhd/CMakeLists.txt b/source/externals/itk-mhd/CMakeLists.txt index c070b9228..040c61e87 100644 --- a/source/externals/itk-mhd/CMakeLists.txt +++ b/source/externals/itk-mhd/CMakeLists.txt @@ -1,5 +1,5 @@ PROJECT(testmhd) -CMAKE_MINIMUM_REQUIRED (VERSION 2.4) +CMAKE_MINIMUM_REQUIRED (VERSION 3.6) IF(COMMAND CMAKE_POLICY) CMAKE_POLICY(SET CMP0003 NEW) ENDIF(COMMAND CMAKE_POLICY) From 5967df440a217ff28f2d465b9a1e6d168a83c8b8 Mon Sep 17 00:00:00 2001 From: kochebina Date: Fri, 9 Jan 2026 10:32:57 +0100 Subject: [PATCH 04/27] Bug correction in gjs --- cluster_tools/jobsplitter/src/GateMacfileParser.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cluster_tools/jobsplitter/src/GateMacfileParser.cc b/cluster_tools/jobsplitter/src/GateMacfileParser.cc index bc45838f8..5db1add59 100644 --- a/cluster_tools/jobsplitter/src/GateMacfileParser.cc +++ b/cluster_tools/jobsplitter/src/GateMacfileParser.cc @@ -107,8 +107,7 @@ G4int GateMacfileParser::GenerateResolvedMacros(G4String directory) i_str<=10 && j%(nSplits/10)==0) cout<<100*j/nSplits<<"% "< Date: Fri, 9 Jan 2026 10:48:56 +0100 Subject: [PATCH 05/27] Mem leaks corrections in some Digitizer Modules --- source/digits_hits/src/GateClustering.cc | 10 +++++----- source/digits_hits/src/GateDoIModels.cc | 2 +- source/digits_hits/src/GateEnergyFraming.cc | 2 +- source/digits_hits/src/GateTimeDelay.cc | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/digits_hits/src/GateClustering.cc b/source/digits_hits/src/GateClustering.cc index b22636227..28958df0b 100644 --- a/source/digits_hits/src/GateClustering.cc +++ b/source/digits_hits/src/GateClustering.cc @@ -121,11 +121,11 @@ void GateClustering::Digitize() G4cout << Gateendl; } - GateDigi* m_outputDigi = new GateDigi(*inputDigi); - m_outputDigi->SetEnergyFin(-1); - m_outputDigi->SetEnergyIniTrack(-1); - std::vector dist; - std::vector index4ClustSameVol; + m_outputDigi = new GateDigi(*inputDigi); + m_outputDigi->SetEnergyFin(-1); + m_outputDigi->SetEnergyIniTrack(-1); + std::vector dist; + std::vector index4ClustSameVol; if(OutputDigiCollectionVector->empty()){ m_OutputDigiCollection->insert(m_outputDigi); diff --git a/source/digits_hits/src/GateDoIModels.cc b/source/digits_hits/src/GateDoIModels.cc index 36c39e85c..277f937ce 100644 --- a/source/digits_hits/src/GateDoIModels.cc +++ b/source/digits_hits/src/GateDoIModels.cc @@ -117,7 +117,7 @@ void GateDoIModels::Digitize() return; } - GateDigi* m_outputDigi = new GateDigi(*inputDigi); + m_outputDigi = new GateDigi(*inputDigi); if (flgCorrectAxis==1) { diff --git a/source/digits_hits/src/GateEnergyFraming.cc b/source/digits_hits/src/GateEnergyFraming.cc index 5516caddf..eef94d029 100755 --- a/source/digits_hits/src/GateEnergyFraming.cc +++ b/source/digits_hits/src/GateEnergyFraming.cc @@ -93,7 +93,7 @@ void GateEnergyFraming::Digitize() { G4double energy = 0; inputDigi=(*IDC)[i]; - GateDigi* m_outputDigi = new GateDigi(*inputDigi); + m_outputDigi = new GateDigi(*inputDigi); if( m_EnergyFramingLaw != 0 ){ diff --git a/source/digits_hits/src/GateTimeDelay.cc b/source/digits_hits/src/GateTimeDelay.cc index fffcf4b06..c3f21eba4 100755 --- a/source/digits_hits/src/GateTimeDelay.cc +++ b/source/digits_hits/src/GateTimeDelay.cc @@ -76,7 +76,7 @@ void GateTimeDelay::Digitize() { inputDigi=(*IDC)[i]; - GateDigi* m_outputDigi = new GateDigi(*inputDigi); + m_outputDigi = new GateDigi(*inputDigi); m_outputDigi->SetTime(inputDigi->GetTime()+ m_TimeDelay); From 20d350ecb3118e11788e390a046831dd25b3d946 Mon Sep 17 00:00:00 2001 From: kochebina Date: Fri, 9 Jan 2026 12:53:19 +0100 Subject: [PATCH 06/27] main.yml --- .github/workflows/main.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index be995ba51..55c89b46b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,7 +25,7 @@ jobs: env: ROOT_VERSION: 'v6-32-02' ITK_VERSION: 'v5.4.2' - GEANT4_VERSION: 'v11.3.0' + GEANT4_VERSION: 'v11.4.0' ROOT_DIR: $(HOME)/software/root GEANT4_DIR: $(HOME)/software/geant4 @@ -56,8 +56,7 @@ jobs: libxpm-dev \ libxft-dev \ libxext-dev \ - qtbase5-dev \ - qt5-qmake \ + qt6-base-dev \ git \ cmake \ libssl-dev \ @@ -73,12 +72,12 @@ jobs: brew config #rm -rf /usr/local/bin/python3.11-config /usr/local/bin/2to3-3.11 /usr/local/bin/idle3.11 /usr/local/bin/pydoc3.11 /usr/local/bin/python3.11 #rm -rf /usr/local/bin/python3-config /usr/local/bin/2to3 /usr/local/bin/idle3 /usr/local/bin/pydoc3 /usr/local/bin/python3 - brew install --force --verbose --overwrite --debug qt5 \ + brew install --force --verbose --overwrite --debug qt6 \ ccache \ tbb \ xrootd \ fftw - brew link qt5 --force && sudo ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs && sudo ln -s /usr/local/opt/qt/plugins /usr/local/plugins + brew link qt6 --force && sudo ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs && sudo ln -s /usr/local/opt/qt/plugins /usr/local/plugins export PATH=/usr/local/opt/qt/bin:$PATH export LDFLAGS="-L/usr/local/opt/qt/lib -L/usr/local/opt/llvm/lib" export CPPFLAGS="-I/usr/local/opt/qt/include -I/usr/local/opt/llvm/include -fopenmp" @@ -268,8 +267,7 @@ jobs: libxpm-dev \ libxft-dev \ libxext-dev \ - qtbase5-dev \ - qt5-qmake \ + qt6-base-dev \ git \ cmake \ libssl-dev \ @@ -282,5 +280,5 @@ jobs: mkdir gate_benchmarks export GIT_SSL_NO_VERIFY=1 git clone --recursive https://github.com/OpenGATE/GateBenchmarks.git gate_benchmarks - docker run --rm -e "TEST=${{ matrix.strategy_name }}" -v $GITHUB_WORKSPACE:/src -v $GITHUB_WORKSPACE/gate_benchmarks:/home tbaudier/gatebenchmarks:9.4.1 /home/.github/workflows/runTest.sh + docker run --rm -e "TEST=${{ matrix.strategy_name }}" -v $GITHUB_WORKSPACE:/src -v $GITHUB_WORKSPACE/gate_benchmarks:/home tbaudier/gatebenchmarks:9.4.2 /home/.github/workflows/runTest.sh From d35eb599218a5cebf1723f4472a9bd9b87d7baaa Mon Sep 17 00:00:00 2001 From: kochebina Date: Fri, 9 Jan 2026 12:56:34 +0100 Subject: [PATCH 07/27] main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 55c89b46b..265971681 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -267,7 +267,7 @@ jobs: libxpm-dev \ libxft-dev \ libxext-dev \ - qt6-base-dev \ + qt6-base-dev \ git \ cmake \ libssl-dev \ @@ -280,5 +280,5 @@ jobs: mkdir gate_benchmarks export GIT_SSL_NO_VERIFY=1 git clone --recursive https://github.com/OpenGATE/GateBenchmarks.git gate_benchmarks - docker run --rm -e "TEST=${{ matrix.strategy_name }}" -v $GITHUB_WORKSPACE:/src -v $GITHUB_WORKSPACE/gate_benchmarks:/home tbaudier/gatebenchmarks:9.4.2 /home/.github/workflows/runTest.sh + docker run --rm -e "TEST=${{ matrix.strategy_name }}" -v $GITHUB_WORKSPACE:/src -v $GITHUB_WORKSPACE/gate_benchmarks:/home tbaudier/gatebenchmarks:9.4.1 /home/.github/workflows/runTest.sh From b8340658dac26fb54bc9597fc8dedf6494368917 Mon Sep 17 00:00:00 2001 From: kochebina Date: Fri, 9 Jan 2026 13:50:56 +0100 Subject: [PATCH 08/27] main.yml --- .github/workflows/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 265971681..a33242ebc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -56,6 +56,8 @@ jobs: libxpm-dev \ libxft-dev \ libxext-dev \ + qtbase5-dev \ + qt5-qmake \ qt6-base-dev \ git \ cmake \ @@ -267,7 +269,9 @@ jobs: libxpm-dev \ libxft-dev \ libxext-dev \ - qt6-base-dev \ + qtbase5-dev \ + qt5-qmake \ + qt6-base-dev \ git \ cmake \ libssl-dev \ From 7145e6588b8ef79261f9a4c2e8a035932fc50786 Mon Sep 17 00:00:00 2001 From: kochebina Date: Fri, 9 Jan 2026 13:54:00 +0100 Subject: [PATCH 09/27] main.yml --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a33242ebc..32165ed0c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -271,7 +271,6 @@ jobs: libxext-dev \ qtbase5-dev \ qt5-qmake \ - qt6-base-dev \ git \ cmake \ libssl-dev \ From 992fcf212310167678800ed50377f1368d2038e0 Mon Sep 17 00:00:00 2001 From: kochebina Date: Fri, 9 Jan 2026 13:54:26 +0100 Subject: [PATCH 10/27] main.yml --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 32165ed0c..a33242ebc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -271,6 +271,7 @@ jobs: libxext-dev \ qtbase5-dev \ qt5-qmake \ + qt6-base-dev \ git \ cmake \ libssl-dev \ From 821aff3744b47b687889edff15cd685ac7108eab Mon Sep 17 00:00:00 2001 From: kochebina Date: Fri, 9 Jan 2026 14:51:07 +0100 Subject: [PATCH 11/27] main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a33242ebc..93df37858 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,7 +25,7 @@ jobs: env: ROOT_VERSION: 'v6-32-02' ITK_VERSION: 'v5.4.2' - GEANT4_VERSION: 'v11.4.0' + GEANT4_VERSION: 'v11.3.0' ROOT_DIR: $(HOME)/software/root GEANT4_DIR: $(HOME)/software/geant4 From 6833a7a29ec5343379452fe169367ade58ef6545 Mon Sep 17 00:00:00 2001 From: kochebina Date: Tue, 13 Jan 2026 17:46:19 +0100 Subject: [PATCH 12/27] main.yml --- .github/workflows/main.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 93df37858..be995ba51 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,7 +58,6 @@ jobs: libxext-dev \ qtbase5-dev \ qt5-qmake \ - qt6-base-dev \ git \ cmake \ libssl-dev \ @@ -74,12 +73,12 @@ jobs: brew config #rm -rf /usr/local/bin/python3.11-config /usr/local/bin/2to3-3.11 /usr/local/bin/idle3.11 /usr/local/bin/pydoc3.11 /usr/local/bin/python3.11 #rm -rf /usr/local/bin/python3-config /usr/local/bin/2to3 /usr/local/bin/idle3 /usr/local/bin/pydoc3 /usr/local/bin/python3 - brew install --force --verbose --overwrite --debug qt6 \ + brew install --force --verbose --overwrite --debug qt5 \ ccache \ tbb \ xrootd \ fftw - brew link qt6 --force && sudo ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs && sudo ln -s /usr/local/opt/qt/plugins /usr/local/plugins + brew link qt5 --force && sudo ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs && sudo ln -s /usr/local/opt/qt/plugins /usr/local/plugins export PATH=/usr/local/opt/qt/bin:$PATH export LDFLAGS="-L/usr/local/opt/qt/lib -L/usr/local/opt/llvm/lib" export CPPFLAGS="-I/usr/local/opt/qt/include -I/usr/local/opt/llvm/include -fopenmp" @@ -271,7 +270,6 @@ jobs: libxext-dev \ qtbase5-dev \ qt5-qmake \ - qt6-base-dev \ git \ cmake \ libssl-dev \ From 48c516e33a26e964c71dce0a9c53d5a012a35d38 Mon Sep 17 00:00:00 2001 From: kochebina Date: Tue, 13 Jan 2026 17:48:38 +0100 Subject: [PATCH 13/27] main.yml qt6 --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index be995ba51..c4ae84cd8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,6 +58,7 @@ jobs: libxext-dev \ qtbase5-dev \ qt5-qmake \ + qt6-base-dev \ git \ cmake \ libssl-dev \ @@ -270,6 +271,7 @@ jobs: libxext-dev \ qtbase5-dev \ qt5-qmake \ + qt6-base-dev \ git \ cmake \ libssl-dev \ From 7a6e2632f318db28e625d0d463215a07b9d18cd0 Mon Sep 17 00:00:00 2001 From: kochebina Date: Tue, 13 Jan 2026 17:51:26 +0100 Subject: [PATCH 14/27] main.yml tabs --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c4ae84cd8..d90180444 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,7 +58,7 @@ jobs: libxext-dev \ qtbase5-dev \ qt5-qmake \ - qt6-base-dev \ + qt6-base-dev \ git \ cmake \ libssl-dev \ @@ -271,7 +271,7 @@ jobs: libxext-dev \ qtbase5-dev \ qt5-qmake \ - qt6-base-dev \ + qt6-base-dev \ git \ cmake \ libssl-dev \ From b168f1a04ed982241c5c7e409be9807a0e0c6a32 Mon Sep 17 00:00:00 2001 From: kochebina Date: Tue, 13 Jan 2026 17:52:58 +0100 Subject: [PATCH 15/27] main.yml G11.4.0 --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d90180444..1aa817493 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,7 +25,7 @@ jobs: env: ROOT_VERSION: 'v6-32-02' ITK_VERSION: 'v5.4.2' - GEANT4_VERSION: 'v11.3.0' + GEANT4_VERSION: 'v11.4.0' ROOT_DIR: $(HOME)/software/root GEANT4_DIR: $(HOME)/software/geant4 @@ -74,12 +74,12 @@ jobs: brew config #rm -rf /usr/local/bin/python3.11-config /usr/local/bin/2to3-3.11 /usr/local/bin/idle3.11 /usr/local/bin/pydoc3.11 /usr/local/bin/python3.11 #rm -rf /usr/local/bin/python3-config /usr/local/bin/2to3 /usr/local/bin/idle3 /usr/local/bin/pydoc3 /usr/local/bin/python3 - brew install --force --verbose --overwrite --debug qt5 \ + brew install --force --verbose --overwrite --debug qt6 \ ccache \ tbb \ xrootd \ fftw - brew link qt5 --force && sudo ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs && sudo ln -s /usr/local/opt/qt/plugins /usr/local/plugins + brew link qt6 --force && sudo ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs && sudo ln -s /usr/local/opt/qt/plugins /usr/local/plugins export PATH=/usr/local/opt/qt/bin:$PATH export LDFLAGS="-L/usr/local/opt/qt/lib -L/usr/local/opt/llvm/lib" export CPPFLAGS="-I/usr/local/opt/qt/include -I/usr/local/opt/llvm/include -fopenmp" From a1a0cef9b09749a2e6e7e153ba99aed8674b2d90 Mon Sep 17 00:00:00 2001 From: kochebina Date: Wed, 14 Jan 2026 10:02:10 +0100 Subject: [PATCH 16/27] main.yml ROOT v6-32-16 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1aa817493..81946bee1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: options: torch env: - ROOT_VERSION: 'v6-32-02' + ROOT_VERSION: 'v6-32-16' ITK_VERSION: 'v5.4.2' GEANT4_VERSION: 'v11.4.0' ROOT_DIR: $(HOME)/software/root From 106cd2dd68957f1f5e0915640f95fad1cfd7cef2 Mon Sep 17 00:00:00 2001 From: kochebina Date: Wed, 14 Jan 2026 10:44:38 +0100 Subject: [PATCH 17/27] main.yml ROOT v6-32-10 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 81946bee1..3ac45f611 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: options: torch env: - ROOT_VERSION: 'v6-32-16' + ROOT_VERSION: 'v6-32-10' ITK_VERSION: 'v5.4.2' GEANT4_VERSION: 'v11.4.0' ROOT_DIR: $(HOME)/software/root From ed0c268a4260c811b33dbb8a51d9e25fd142b232 Mon Sep 17 00:00:00 2001 From: kochebina Date: Wed, 14 Jan 2026 10:53:43 +0100 Subject: [PATCH 18/27] main.yml ROOT 32.02 w/o vdt --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3ac45f611..66bfd8933 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: options: torch env: - ROOT_VERSION: 'v6-32-10' + ROOT_VERSION: 'v6-32-02' ITK_VERSION: 'v5.4.2' GEANT4_VERSION: 'v11.4.0' ROOT_DIR: $(HOME)/software/root @@ -101,6 +101,8 @@ jobs: -Dpyroot=OFF \ -Dclad=OFF \ -Dxrootd=OFF \ + -Dvdt=OFF \ + -Dbuiltin_vdt=OFF \ -DCMAKE_INSTALL_PREFIX=$HOME/software/root/install make -j4 install cd .. From 16883710d544f7aba2ac070671fbdc548ea34216 Mon Sep 17 00:00:00 2001 From: kochebina Date: Wed, 14 Jan 2026 11:12:40 +0100 Subject: [PATCH 19/27] main.yml test --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 66bfd8933..a46b769b6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -223,6 +223,7 @@ jobs: needs: [build] strategy: fail-fast: false + max-parallel: 1 matrix: strategy_name: [t1_edep_profiles, t2_edep_vox, From b29932d85a6840b34b7a734f9f0e5c32570c24e7 Mon Sep 17 00:00:00 2001 From: kochebina Date: Wed, 14 Jan 2026 11:42:39 +0100 Subject: [PATCH 20/27] main.yml ROOT afterimage off --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a46b769b6..42c47020e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -103,6 +103,8 @@ jobs: -Dxrootd=OFF \ -Dvdt=OFF \ -Dbuiltin_vdt=OFF \ + -Dasimage=OFF \ + -Dbuiltin_afterimage=OFF \ -DCMAKE_INSTALL_PREFIX=$HOME/software/root/install make -j4 install cd .. From 7f915e3e8fd26a2dc9d983f37dfd26674bc1a57a Mon Sep 17 00:00:00 2001 From: kochebina Date: Wed, 14 Jan 2026 13:28:09 +0100 Subject: [PATCH 21/27] main.yml test qt5 qt6 --- .github/workflows/main.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 42c47020e..999e2f35c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -74,12 +74,14 @@ jobs: brew config #rm -rf /usr/local/bin/python3.11-config /usr/local/bin/2to3-3.11 /usr/local/bin/idle3.11 /usr/local/bin/pydoc3.11 /usr/local/bin/python3.11 #rm -rf /usr/local/bin/python3-config /usr/local/bin/2to3 /usr/local/bin/idle3 /usr/local/bin/pydoc3 /usr/local/bin/python3 - brew install --force --verbose --overwrite --debug qt6 \ + brew install --force --verbose --overwrite --debug qt5 \ + qt6 \ ccache \ tbb \ xrootd \ fftw brew link qt6 --force && sudo ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs && sudo ln -s /usr/local/opt/qt/plugins /usr/local/plugins + brew link qt6 --force && sudo ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs && sudo ln -s /usr/local/opt/qt/plugins /usr/local/plugins export PATH=/usr/local/opt/qt/bin:$PATH export LDFLAGS="-L/usr/local/opt/qt/lib -L/usr/local/opt/llvm/lib" export CPPFLAGS="-I/usr/local/opt/qt/include -I/usr/local/opt/llvm/include -fopenmp" @@ -101,10 +103,10 @@ jobs: -Dpyroot=OFF \ -Dclad=OFF \ -Dxrootd=OFF \ - -Dvdt=OFF \ - -Dbuiltin_vdt=OFF \ - -Dasimage=OFF \ - -Dbuiltin_afterimage=OFF \ + #-Dvdt=OFF \ + #-Dbuiltin_vdt=OFF \ + #-Dasimage=OFF \ + #-Dbuiltin_afterimage=OFF \ -DCMAKE_INSTALL_PREFIX=$HOME/software/root/install make -j4 install cd .. @@ -225,7 +227,6 @@ jobs: needs: [build] strategy: fail-fast: false - max-parallel: 1 matrix: strategy_name: [t1_edep_profiles, t2_edep_vox, From aa55dd71318c47290b64b30d99164fcf71eac9b5 Mon Sep 17 00:00:00 2001 From: kochebina Date: Wed, 14 Jan 2026 14:13:09 +0100 Subject: [PATCH 22/27] main.yml test qt5 qt6 2* --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 999e2f35c..f54ef9a25 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -80,7 +80,7 @@ jobs: tbb \ xrootd \ fftw - brew link qt6 --force && sudo ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs && sudo ln -s /usr/local/opt/qt/plugins /usr/local/plugins + brew link qt5 --force && sudo ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs && sudo ln -s /usr/local/opt/qt/plugins /usr/local/plugins brew link qt6 --force && sudo ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs && sudo ln -s /usr/local/opt/qt/plugins /usr/local/plugins export PATH=/usr/local/opt/qt/bin:$PATH export LDFLAGS="-L/usr/local/opt/qt/lib -L/usr/local/opt/llvm/lib" From 6ad13e28de1f8032b4c2cd6e2e3abef03819c1d8 Mon Sep 17 00:00:00 2001 From: kochebina Date: Wed, 14 Jan 2026 14:50:27 +0100 Subject: [PATCH 23/27] main.yml test qt5 qt6 3 --- .github/workflows/main.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f54ef9a25..c5cd5f066 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -103,10 +103,6 @@ jobs: -Dpyroot=OFF \ -Dclad=OFF \ -Dxrootd=OFF \ - #-Dvdt=OFF \ - #-Dbuiltin_vdt=OFF \ - #-Dasimage=OFF \ - #-Dbuiltin_afterimage=OFF \ -DCMAKE_INSTALL_PREFIX=$HOME/software/root/install make -j4 install cd .. From 258eb0dd091c15e0928cbc662b27a549b9db67e3 Mon Sep 17 00:00:00 2001 From: kochebina Date: Wed, 14 Jan 2026 15:07:13 +0100 Subject: [PATCH 24/27] main.yml remove qt5 --- .github/workflows/main.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c5cd5f066..265971681 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -56,8 +56,6 @@ jobs: libxpm-dev \ libxft-dev \ libxext-dev \ - qtbase5-dev \ - qt5-qmake \ qt6-base-dev \ git \ cmake \ @@ -74,13 +72,11 @@ jobs: brew config #rm -rf /usr/local/bin/python3.11-config /usr/local/bin/2to3-3.11 /usr/local/bin/idle3.11 /usr/local/bin/pydoc3.11 /usr/local/bin/python3.11 #rm -rf /usr/local/bin/python3-config /usr/local/bin/2to3 /usr/local/bin/idle3 /usr/local/bin/pydoc3 /usr/local/bin/python3 - brew install --force --verbose --overwrite --debug qt5 \ - qt6 \ + brew install --force --verbose --overwrite --debug qt6 \ ccache \ tbb \ xrootd \ fftw - brew link qt5 --force && sudo ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs && sudo ln -s /usr/local/opt/qt/plugins /usr/local/plugins brew link qt6 --force && sudo ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs && sudo ln -s /usr/local/opt/qt/plugins /usr/local/plugins export PATH=/usr/local/opt/qt/bin:$PATH export LDFLAGS="-L/usr/local/opt/qt/lib -L/usr/local/opt/llvm/lib" @@ -271,8 +267,6 @@ jobs: libxpm-dev \ libxft-dev \ libxext-dev \ - qtbase5-dev \ - qt5-qmake \ qt6-base-dev \ git \ cmake \ From e6d9b5cc71d8dd2342f0c230e6d3c81b35a0109e Mon Sep 17 00:00:00 2001 From: kochebina Date: Wed, 14 Jan 2026 15:28:10 +0100 Subject: [PATCH 25/27] main.yml whitch off qt6 for ROOT --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 265971681..1dca7814b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -99,6 +99,7 @@ jobs: -Dpyroot=OFF \ -Dclad=OFF \ -Dxrootd=OFF \ + -Dqt6=OFF \ -DCMAKE_INSTALL_PREFIX=$HOME/software/root/install make -j4 install cd .. From c2b26d45e84f8f379a3410ac604caebce4dfb676 Mon Sep 17 00:00:00 2001 From: kochebina Date: Wed, 14 Jan 2026 15:39:32 +0100 Subject: [PATCH 26/27] main.yml swhitch off visu for ROOT --- .github/workflows/main.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1dca7814b..e89041d98 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -99,7 +99,12 @@ jobs: -Dpyroot=OFF \ -Dclad=OFF \ -Dxrootd=OFF \ - -Dqt6=OFF \ + -Dasimage=OFF -Dbuiltin_afterimage=OFF \ + -Dx11=OFF -Dopengl=OFF \ + -Dvdt=OFF -Dvdtbuilin=OFF \ + -Dwebgui=OFF \ + -Dcxxmodiles=OFF -Druntime_cxxmodules=OFF \ + -Dqt=OFF -Dqt6=OFF \ -DCMAKE_INSTALL_PREFIX=$HOME/software/root/install make -j4 install cd .. From 13212cab77f885c67655bc7a215885358b2426ef Mon Sep 17 00:00:00 2001 From: kochebina Date: Wed, 14 Jan 2026 16:46:11 +0100 Subject: [PATCH 27/27] main.yml arm64 --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e89041d98..70b858974 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -94,7 +94,9 @@ jobs: mkdir src bin install git clone --branch $ROOT_VERSION https://github.com/root-project/root.git --depth 1 src cd bin + unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS cmake ../src -DCMAKE_CXX_STANDARD=17 \ + -DCMAKE_OSX_ARCHITERTURES=arm64 \ -Dpython=OFF \ -Dpyroot=OFF \ -Dclad=OFF \