From 933b1a35b5fc17127094d06e6824c978d49d5b16 Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Wed, 10 Jun 2026 09:17:40 +0200 Subject: [PATCH 1/9] Compilation with root 6.40 --- .github/workflows/ci-buildmatrix-cpp17.yml | 1 + src/VPlotAnasumHistograms.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-buildmatrix-cpp17.yml b/.github/workflows/ci-buildmatrix-cpp17.yml index 12233c65a..3108f2072 100644 --- a/.github/workflows/ci-buildmatrix-cpp17.yml +++ b/.github/workflows/ci-buildmatrix-cpp17.yml @@ -15,6 +15,7 @@ jobs: - "rootproject/root:latest" - "rootproject/root:6.26.06-ubuntu22.04" - "rootproject/root:6.32.04-ubuntu24.04" + - "rootproject/root:6.38.00-ubuntu25.10" runs-on: ${{ matrix.os }} container: ${{ matrix.root }} diff --git a/src/VPlotAnasumHistograms.cpp b/src/VPlotAnasumHistograms.cpp index 39eb3a9be..f56f34b54 100644 --- a/src/VPlotAnasumHistograms.cpp +++ b/src/VPlotAnasumHistograms.cpp @@ -245,7 +245,7 @@ void VPlotAnasumHistograms::plot_mscPlots( int irebin, double xmin, double xmax, VDouble_gauss* fdouble_gauss = new VDouble_gauss(); - TF1* hmscw_diff_fit = new TF1( hname, fdouble_gauss, -1.5, 1.5, 4, "VDouble_gauss" ); + TF1* hmscw_diff_fit = new TF1( hname, fdouble_gauss, -1.5, 1.5, 4 ); //TF1 *hmscw_diff_fit = new TF1( hname,double_gauss, -1.5, 1.5, 4); hmscw_diff_fit->SetParameter( 0, hmscw_diff->GetMaximum() ); hmscw_diff_fit->SetParameter( 1, 0. ); @@ -286,7 +286,7 @@ void VPlotAnasumHistograms::plot_mscPlots( int irebin, double xmin, double xmax, hmscl_diff->Draw( "hist e " ); sprintf( hname, "%s_fit", hmscl_diff->GetName() ); - TF1* hmscl_diff_fit = new TF1( hname, fdouble_gauss, -1.5, 2.5, 4, "VDouble_gauss" ); + TF1* hmscl_diff_fit = new TF1( hname, fdouble_gauss, -1.5, 2.5, 4 ); hmscl_diff_fit->SetParameter( 0, hmscl_diff->GetMaximum() ); hmscl_diff_fit->SetParameter( 1, 0. ); hmscl_diff_fit->SetParameter( 2, 0.3 ); From 418b07f073e389156e5958e35f76736ca88b0e37 Mon Sep 17 00:00:00 2001 From: GernotMaier Date: Wed, 10 Jun 2026 09:24:38 +0200 Subject: [PATCH 2/9] astyle --- src/VStereoAnalysis.cpp | 2 +- src/makeEffectiveArea.cpp | 2 +- src/printRunParameter.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/VStereoAnalysis.cpp b/src/VStereoAnalysis.cpp index 3efe644b9..fd35edca3 100644 --- a/src/VStereoAnalysis.cpp +++ b/src/VStereoAnalysis.cpp @@ -1982,7 +1982,7 @@ CData* VStereoAnalysis::getDataFromFile( int i_runNumber ) false, iFileName, ( fRunPara->fEnergyReconstructionMethod == 2 || fRunPara->fDirectionReconstructionMethod == 2 ) - ? fRunPara->fXGB_stereo_file_suffix : "", + ? fRunPara->fXGB_stereo_file_suffix : "", "" // GH XGB tree loaded later, after analysis type is known from cut file ); // read current (major) epoch from data file diff --git a/src/makeEffectiveArea.cpp b/src/makeEffectiveArea.cpp index fbf790b32..63ec890b2 100644 --- a/src/makeEffectiveArea.cpp +++ b/src/makeEffectiveArea.cpp @@ -181,7 +181,7 @@ int main( int argc, char* argv[] ) } const bool i_need_stereo_xgb = ( fRunPara->fEnergyReconstructionMethod == 2 - || fRunPara->fDirectionReconstructionMethod == 2 ); + || fRunPara->fDirectionReconstructionMethod == 2 ); CData d( c, true, false, fRunPara->fdatafile, i_need_stereo_xgb ? fRunPara->fXGB_stereo_file_suffix : "", fCuts->useXGBoostCuts() ? fRunPara->fXGB_gh_file_suffix : "" ); diff --git a/src/printRunParameter.cpp b/src/printRunParameter.cpp index 1c5474df9..b37d3501c 100644 --- a/src/printRunParameter.cpp +++ b/src/printRunParameter.cpp @@ -103,7 +103,7 @@ bool readRunParameter( TFile* fIn, string iPara ) iPara.find( "updated-runinfo" ) != string::npos ) << "\t"; cout << fPar->getInstrumentEpoch( true ) << "\t"; cout << fPar->getAtmosphereID( iPara.find( "updated-runinfo" ) != string::npos ) << "\t"; - if (fPar->fDBRunType.size() > 0 ) cout << fPar->fDBRunType << "\t"; + if( fPar->fDBRunType.size() > 0 ) cout << fPar->fDBRunType << "\t"; else cout << "no_db_runtype \t"; for( unsigned int i = 0; i < fPar->fTelToAnalyze.size(); i++ ) { From 4ba6fd7643f561a9fb48952e78ff6b6ca0e3053d Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Wed, 10 Jun 2026 09:42:16 +0200 Subject: [PATCH 3/9] more efficient testing --- .github/workflows/ci-buildmatrix-cpp17.yml | 71 ++++++++++++++++++++-- 1 file changed, 66 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-buildmatrix-cpp17.yml b/.github/workflows/ci-buildmatrix-cpp17.yml index 3108f2072..844827936 100644 --- a/.github/workflows/ci-buildmatrix-cpp17.yml +++ b/.github/workflows/ci-buildmatrix-cpp17.yml @@ -7,7 +7,57 @@ on: workflow_dispatch: jobs: + prepare: + name: Download and cache source files + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v6 + + - name: Cache VBF tarball + id: vbf-cache + uses: actions/cache@v3 + with: + path: VBF.tar.gz + key: vbf-tarball-${{ hashFiles('.github/workflows/ci-buildmatrix-cpp17.yml') }} + restore-keys: | + vbf-tarball- + + - name: Download VBF tarball + if: steps.vbf-cache.outputs.cache-hit != 'true' + run: | + curl -L --retry 3 --retry-delay 3 https://syncandshare.desy.de/index.php/s/${{ secrets.VBFcpp17 }}/download -o VBF.tar.gz + + - name: Cache SOFA tarball + id: sofa-cache + uses: actions/cache@v3 + with: + path: sofa.tar.gz + key: sofa-tarball-${{ hashFiles('.github/workflows/ci-buildmatrix-cpp17.yml') }} + restore-keys: | + sofa-tarball- + + - name: Download SOFA tarball + if: steps.sofa-cache.outputs.cache-hit != 'true' + run: | + curl -L --retry 3 --retry-delay 3 https://syncandshare.desy.de/index.php/s/${{ secrets.SOFA20231011 }}/download -o sofa.tar.gz + + - name: Upload VBF tarball artifact + uses: actions/upload-artifact@v3 + with: + name: vbf-tarball + path: VBF.tar.gz + retention-days: 30 + + - name: Upload SOFA tarball artifact + uses: actions/upload-artifact@v3 + with: + name: sofa-tarball + path: sofa.tar.gz + retention-days: 30 + build: + needs: prepare strategy: matrix: os: [ubuntu-latest] @@ -26,17 +76,28 @@ jobs: run: | apt-get update && apt-get install -y libopenblas-dev - - name: vbf + - name: Download VBF tarball + uses: actions/download-artifact@v3 + with: + name: vbf-tarball + path: . + + - name: Build and install VBF run: | - curl -L --retry 3 --retry-delay 3 https://syncandshare.desy.de/index.php/s/${{ secrets.VBFcpp17 }}/download -o VBF.tar.gz - mkdir VBF && tar -xzf VBF.tar.gz -C VBF --strip-components=1 + mkdir -p VBF && tar -xzf VBF.tar.gz -C VBF --strip-components=1 cd VBF && ./configure --prefix=$(echo $GITHUB_WORKSPACE)/VBF make make install - - name: sofa + - name: Download SOFA tarball + uses: actions/download-artifact@v3 + with: + name: sofa-tarball + path: . + + - name: Extract SOFA run: | - curl -L --retry 3 --retry-delay 3 https://syncandshare.desy.de/index.php/s/${{ secrets.SOFA20231011 }}/download -o sofa/sofa.tar.gz + mkdir -p sofa && tar -xzf sofa.tar.gz -C sofa --strip-components=1 ./install_sofa.sh - name: eventdisplay From e09c2d13ff69950102e19a216c619ea4c5398e1f Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Wed, 10 Jun 2026 09:43:15 +0200 Subject: [PATCH 4/9] more efficient testing --- .github/workflows/ci-buildmatrix-cpp17.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-buildmatrix-cpp17.yml b/.github/workflows/ci-buildmatrix-cpp17.yml index 844827936..30bba0b0a 100644 --- a/.github/workflows/ci-buildmatrix-cpp17.yml +++ b/.github/workflows/ci-buildmatrix-cpp17.yml @@ -43,14 +43,14 @@ jobs: curl -L --retry 3 --retry-delay 3 https://syncandshare.desy.de/index.php/s/${{ secrets.SOFA20231011 }}/download -o sofa.tar.gz - name: Upload VBF tarball artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: vbf-tarball path: VBF.tar.gz retention-days: 30 - name: Upload SOFA tarball artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: sofa-tarball path: sofa.tar.gz @@ -77,7 +77,7 @@ jobs: apt-get update && apt-get install -y libopenblas-dev - name: Download VBF tarball - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: vbf-tarball path: . @@ -90,7 +90,7 @@ jobs: make install - name: Download SOFA tarball - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: sofa-tarball path: . From 15bb9bce803ec92d9a3b08e6179ddbcd6eba9f63 Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Wed, 10 Jun 2026 10:01:16 +0200 Subject: [PATCH 5/9] action version --- .github/workflows/ci-buildmatrix-cpp17.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-buildmatrix-cpp17.yml b/.github/workflows/ci-buildmatrix-cpp17.yml index 30bba0b0a..ebedd8f45 100644 --- a/.github/workflows/ci-buildmatrix-cpp17.yml +++ b/.github/workflows/ci-buildmatrix-cpp17.yml @@ -16,7 +16,7 @@ jobs: - name: Cache VBF tarball id: vbf-cache - uses: actions/cache@v3 + uses: actions/cache@v5 with: path: VBF.tar.gz key: vbf-tarball-${{ hashFiles('.github/workflows/ci-buildmatrix-cpp17.yml') }} @@ -30,7 +30,7 @@ jobs: - name: Cache SOFA tarball id: sofa-cache - uses: actions/cache@v3 + uses: actions/cache@v5 with: path: sofa.tar.gz key: sofa-tarball-${{ hashFiles('.github/workflows/ci-buildmatrix-cpp17.yml') }} @@ -43,14 +43,14 @@ jobs: curl -L --retry 3 --retry-delay 3 https://syncandshare.desy.de/index.php/s/${{ secrets.SOFA20231011 }}/download -o sofa.tar.gz - name: Upload VBF tarball artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: vbf-tarball path: VBF.tar.gz retention-days: 30 - name: Upload SOFA tarball artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: sofa-tarball path: sofa.tar.gz @@ -77,7 +77,7 @@ jobs: apt-get update && apt-get install -y libopenblas-dev - name: Download VBF tarball - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v8 with: name: vbf-tarball path: . @@ -90,7 +90,7 @@ jobs: make install - name: Download SOFA tarball - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v8 with: name: sofa-tarball path: . From 7a89e82c2c2da20b0c7f1c933cb2cec86c4979d0 Mon Sep 17 00:00:00 2001 From: GernotMaier Date: Wed, 10 Jun 2026 10:15:58 +0200 Subject: [PATCH 6/9] changelog [skip ci] --- docs/changes/358.maintenance.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/changes/358.maintenance.md diff --git a/docs/changes/358.maintenance.md b/docs/changes/358.maintenance.md new file mode 100644 index 000000000..bbde6d5a4 --- /dev/null +++ b/docs/changes/358.maintenance.md @@ -0,0 +1 @@ +Updates to allow for compilation with ROOT >=v6.38. Adjustment of CI. From 1207e577c5661a70ed57c524fcdd95812e320876 Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Mon, 15 Jun 2026 12:23:47 +0200 Subject: [PATCH 7/9] Add statement on using XGB tree --- src/CData.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CData.cpp b/src/CData.cpp index 6a4a3b126..62a5a3cde 100644 --- a/src/CData.cpp +++ b/src/CData.cpp @@ -1094,6 +1094,7 @@ TTree* CData::getXGBTree( string file_name, string file_suffix, string tree_name cout << "(this might be ok if no XGB analysis results are requested)" << endl; return 0; } + cout << "CData: opened XGB file " << file_name << endl; fXGBFiles.push_back( iFile ); TTree* iXGB_tree = ( TTree* )iFile->Get( tree_name.c_str() ); From 69b3b99cfb58aff42ea26dd9fbcdf2f5b90b7f27 Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Mon, 15 Jun 2026 20:58:10 +0200 Subject: [PATCH 8/9] consistent path treatment sofa --- .github/workflows/ci-buildmatrix-cpp17.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-buildmatrix-cpp17.yml b/.github/workflows/ci-buildmatrix-cpp17.yml index ebedd8f45..d2dfc038a 100644 --- a/.github/workflows/ci-buildmatrix-cpp17.yml +++ b/.github/workflows/ci-buildmatrix-cpp17.yml @@ -97,7 +97,9 @@ jobs: - name: Extract SOFA run: | - mkdir -p sofa && tar -xzf sofa.tar.gz -C sofa --strip-components=1 + export EVNDISPSYS=$(echo $GITHUB_WORKSPACE) + mkdir -p "${EVNDISPSYS}/sofa" + cp sofa.tar.gz "${EVNDISPSYS}/sofa/sofa.tar.gz" ./install_sofa.sh - name: eventdisplay @@ -107,5 +109,5 @@ jobs: export VBFSYS=$(echo $GITHUB_WORKSPACE)/VBF export LD_LIBRARY_PATH="${EVNDISPSYS}/obj:${EVNDISPSYS}/lib:${LD_LIBRARY_PATH}" export LD_LIBRARY_PATH="${VBFSYS}/lib:${LD_LIBRARY_PATH}" - export SOFASYS=/sofa + export SOFASYS="${EVNDISPSYS}/sofa" make -j 4 VTS From fdb8bbf2dceed877757efcc645421f4d0a28c12f Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Mon, 15 Jun 2026 21:00:55 +0200 Subject: [PATCH 9/9] v6.38 --- dockerfiles/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index c8ba052aa..3f40d86dd 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -1,4 +1,4 @@ -ARG ROOT_VERSION=6.32.04-ubuntu24.04 +ARG ROOT_VERSION=6.38.00-ubuntu25.10 FROM rootproject/root:${ROOT_VERSION} AS build ARG VBF_VERSION=0.3.4 ARG BUILD_BRANCH=main