Skip to content

Fix compilation with ROOT 6.40 #15626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davidrohr wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Fix compilation with ROOT 6.40 #15626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfb4508
Fix linkDefs (needed for ROOT 6.40)
davidrohr Jul 23, 2026
bef1473
Fix includes for ROOT 6.40 (missing in cxx, and can no longer forward…
davidrohr Jul 23, 2026
ef64674
Do not use deprecated ROOT interfaces
davidrohr Jul 23, 2026
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 CCDB/include/CCDB/CcdbApi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class TJAlienCredentials;
#include "CCDB/CCDBDownloader.h"

class TFile;
class TGrid;
#include <TGrid.h>

namespace o2
{
Expand Down
2 changes: 2 additions & 0 deletions Detectors/FIT/FT0/dcsmonitoring/src/FT0DCSMonitoringLinkDef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,6 @@
#pragma link off all classes;
#pragma link off all functions;

#pragma link C++ class o2::ft0::FT0DCSConfigReader + ;

#endif
2 changes: 2 additions & 0 deletions Detectors/FIT/FV0/reconstruction/src/FV0ReconstructionLinkDef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,6 @@
#pragma link off all classes;
#pragma link off all functions;

#pragma link C++ class o2::fv0::BaseRecoTask + ;

#endif
3 changes: 3 additions & 0 deletions Detectors/O2TrivialMC/src/O2TrivialMCLinkDef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions Detectors/PHOS/calib/src/PHOSRunbyrunCalibrator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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++) {
Expand Down
3 changes: 0 additions & 3 deletions Detectors/ZDC/raw/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 0 additions & 18 deletions Detectors/ZDC/raw/src/ZDCRawLinkDef.h
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Generators/include/Generators/GeneratorFromFile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
#include "Generators/GeneratorFromO2KineParam.h"
#include "SimulationDataFormat/MCEventHeader.h"
#include <TRandom3.h>
#include <TGrid.h>
#include <random>

class TBranch;
class TFile;
class TParticle;
class TGrid;

namespace o2
{
Expand Down
Loading