From bfb450866d7a93700af68940fa9ca82b67adb87c Mon Sep 17 00:00:00 2001 From: David Rohr Date: Thu, 23 Jul 2026 10:57:17 +0200 Subject: [PATCH 1/3] Fix linkDefs (needed for ROOT 6.40) --- .../src/FT0DCSMonitoringLinkDef.h | 2 ++ .../src/FV0ReconstructionLinkDef.h | 2 ++ Detectors/O2TrivialMC/src/O2TrivialMCLinkDef.h | 3 +++ Detectors/ZDC/raw/CMakeLists.txt | 3 --- Detectors/ZDC/raw/src/ZDCRawLinkDef.h | 18 ------------------ 5 files changed, 7 insertions(+), 21 deletions(-) delete mode 100644 Detectors/ZDC/raw/src/ZDCRawLinkDef.h diff --git a/Detectors/FIT/FT0/dcsmonitoring/src/FT0DCSMonitoringLinkDef.h b/Detectors/FIT/FT0/dcsmonitoring/src/FT0DCSMonitoringLinkDef.h index c85dd2d378ccb..50a9e7f35e25f 100644 --- a/Detectors/FIT/FT0/dcsmonitoring/src/FT0DCSMonitoringLinkDef.h +++ b/Detectors/FIT/FT0/dcsmonitoring/src/FT0DCSMonitoringLinkDef.h @@ -15,4 +15,6 @@ #pragma link off all classes; #pragma link off all functions; +#pragma link C++ class o2::ft0::FT0DCSConfigReader + ; + #endif diff --git a/Detectors/FIT/FV0/reconstruction/src/FV0ReconstructionLinkDef.h b/Detectors/FIT/FV0/reconstruction/src/FV0ReconstructionLinkDef.h index c85dd2d378ccb..f4551100c8cc5 100644 --- a/Detectors/FIT/FV0/reconstruction/src/FV0ReconstructionLinkDef.h +++ b/Detectors/FIT/FV0/reconstruction/src/FV0ReconstructionLinkDef.h @@ -15,4 +15,6 @@ #pragma link off all classes; #pragma link off all functions; +#pragma link C++ class o2::fv0::BaseRecoTask + ; + #endif diff --git a/Detectors/O2TrivialMC/src/O2TrivialMCLinkDef.h b/Detectors/O2TrivialMC/src/O2TrivialMCLinkDef.h index c85dd2d378ccb..51c7e396a49b7 100644 --- a/Detectors/O2TrivialMC/src/O2TrivialMCLinkDef.h +++ b/Detectors/O2TrivialMC/src/O2TrivialMCLinkDef.h @@ -15,4 +15,7 @@ #pragma link off all classes; #pragma link off all functions; +#pragma link C++ class o2::mc::O2TrivialMCEngine + ; +#pragma link C++ class o2::mc::O2TrivialMCApplication + ; + #endif diff --git a/Detectors/ZDC/raw/CMakeLists.txt b/Detectors/ZDC/raw/CMakeLists.txt index 5f4983d6fc31b..da11ea3d9810b 100644 --- a/Detectors/ZDC/raw/CMakeLists.txt +++ b/Detectors/ZDC/raw/CMakeLists.txt @@ -25,9 +25,6 @@ o2_add_library(ZDCRaw O2::ZDCBase O2::ZDCSimulation) -o2_target_root_dictionary(ZDCRaw - HEADERS include/ZDCRaw/DumpRaw.h) - o2_add_executable(raw-parser COMPONENT_NAME zdc SOURCES src/raw-parser.cxx diff --git a/Detectors/ZDC/raw/src/ZDCRawLinkDef.h b/Detectors/ZDC/raw/src/ZDCRawLinkDef.h deleted file mode 100644 index c85dd2d378ccb..0000000000000 --- a/Detectors/ZDC/raw/src/ZDCRawLinkDef.h +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2019-2020 CERN and copyright holders of ALICE O2. -// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders. -// All rights not expressly granted are reserved. -// -// This software is distributed under the terms of the GNU General Public -// License v3 (GPL Version 3), copied verbatim in the file "COPYING". -// -// In applying this license CERN does not waive the privileges and immunities -// granted to it by virtue of its status as an Intergovernmental Organization -// or submit itself to any jurisdiction. - -#ifdef __CLING__ - -#pragma link off all globals; -#pragma link off all classes; -#pragma link off all functions; - -#endif From bef1473a8ef762e84114ae29a9d17b90d2daa0af Mon Sep 17 00:00:00 2001 From: David Rohr Date: Thu, 23 Jul 2026 10:58:04 +0200 Subject: [PATCH 2/3] Fix includes for ROOT 6.40 (missing in cxx, and can no longer forward-declare) --- CCDB/include/CCDB/CcdbApi.h | 2 +- Generators/include/Generators/GeneratorFromFile.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CCDB/include/CCDB/CcdbApi.h b/CCDB/include/CCDB/CcdbApi.h index 4dab11d5972d8..acb0ad10f6c9a 100644 --- a/CCDB/include/CCDB/CcdbApi.h +++ b/CCDB/include/CCDB/CcdbApi.h @@ -39,7 +39,7 @@ class TJAlienCredentials; #include "CCDB/CCDBDownloader.h" class TFile; -class TGrid; +#include namespace o2 { diff --git a/Generators/include/Generators/GeneratorFromFile.h b/Generators/include/Generators/GeneratorFromFile.h index 9bf1d4911008b..ad93814467fc3 100644 --- a/Generators/include/Generators/GeneratorFromFile.h +++ b/Generators/include/Generators/GeneratorFromFile.h @@ -19,12 +19,12 @@ #include "Generators/GeneratorFromO2KineParam.h" #include "SimulationDataFormat/MCEventHeader.h" #include +#include #include class TBranch; class TFile; class TParticle; -class TGrid; namespace o2 { From ef646742cb62d5672401d9be017541a802a454b5 Mon Sep 17 00:00:00 2001 From: David Rohr Date: Thu, 23 Jul 2026 10:58:18 +0200 Subject: [PATCH 3/3] Do not use deprecated ROOT interfaces --- Detectors/PHOS/calib/src/PHOSRunbyrunCalibrator.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Detectors/PHOS/calib/src/PHOSRunbyrunCalibrator.cxx b/Detectors/PHOS/calib/src/PHOSRunbyrunCalibrator.cxx index 63e51f06c0e64..0c4e740168ffe 100644 --- a/Detectors/PHOS/calib/src/PHOSRunbyrunCalibrator.cxx +++ b/Detectors/PHOS/calib/src/PHOSRunbyrunCalibrator.cxx @@ -213,9 +213,9 @@ void PHOSRunbyrunCalibrator::writeHistos() { // Merge collected in different slots histograms - TF1 fRatio("ratio", this, &PHOSRunbyrunCalibrator::CBRatio, 0, 1, 6, "PHOSRunbyrunCalibrator", "CBRatio"); - TF1 fBg("background", this, &PHOSRunbyrunCalibrator::bg, 0, 1, 6, "PHOSRunbyrunCalibrator", "bg"); - TF1 fSignal("signal", this, &PHOSRunbyrunCalibrator::CBSignal, 0, 1, 6, "PHOSRunbyrunCalibrator", "CBSignal"); + TF1 fRatio("ratio", this, &PHOSRunbyrunCalibrator::CBRatio, 0, 1, 6); + TF1 fBg("background", this, &PHOSRunbyrunCalibrator::bg, 0, 1, 6); + TF1 fSignal("signal", this, &PHOSRunbyrunCalibrator::CBSignal, 0, 1, 6); // fit inv mass distributions for (int mod = 0; mod < 4; mod++) {