From 2de24bb5300c2abb2e091e527f7488672f2bd646 Mon Sep 17 00:00:00 2001 From: joachimckh Date: Tue, 18 Aug 2026 14:35:08 +0200 Subject: [PATCH 1/3] Fix library issue with FFitWeights, discussed in mattermost --- Common/Core/AnalysisCoreLinkDef.h | 2 -- Common/Core/CMakeLists.txt | 11 +++++++++-- Common/Core/FFitWeightsLinkDef.h | 17 +++++++++++++++++ Common/TableProducer/CMakeLists.txt | 2 +- 4 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 Common/Core/FFitWeightsLinkDef.h diff --git a/Common/Core/AnalysisCoreLinkDef.h b/Common/Core/AnalysisCoreLinkDef.h index ae4c91e9589..b376ccc7f10 100644 --- a/Common/Core/AnalysisCoreLinkDef.h +++ b/Common/Core/AnalysisCoreLinkDef.h @@ -26,6 +26,4 @@ #pragma link C++ class OrbitRange + ; -#pragma link C++ class FFitWeights + ; - #endif // COMMON_CORE_ANALYSISCORELINKDEF_H_ diff --git a/Common/Core/CMakeLists.txt b/Common/Core/CMakeLists.txt index 6bf499cd3b7..f820f20857d 100644 --- a/Common/Core/CMakeLists.txt +++ b/Common/Core/CMakeLists.txt @@ -21,7 +21,6 @@ o2physics_add_library(AnalysisCore TableHelper.cxx MetadataHelper.cxx CollisionTypeHelper.cxx - FFitWeights.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2::DataFormatsParameters ROOT::EG O2::CCDB ROOT::Physics O2::FT0Base O2::FV0Base O2::DataFormatsParamTOF) o2physics_target_root_dictionary(AnalysisCore @@ -37,7 +36,6 @@ o2physics_target_root_dictionary(AnalysisCore PID/TPCPIDResponse.h PID/PIDTOFParamService.h CollisionTypeHelper.h - FFitWeights.h LINKDEF AnalysisCoreLinkDef.h) o2physics_add_library(EventFilteringUtils @@ -52,3 +50,12 @@ o2physics_target_root_dictionary(EventFilteringUtils o2physics_add_header_only_library(TPCDriftManager HEADERS TPCVDriftManager.h INTERFACE_LINK_LIBRARIES) + +o2physics_add_library(FFitWeights + SOURCES FFitWeights.cxx + PUBLIC_LINK_LIBRARIES O2::Framework O2::CCDB ROOT::Physics) + +o2physics_target_root_dictionary(FFitWeights + HEADERS FFitWeights.h + LINKDEF FFitWeightsLinkDef.h) + diff --git a/Common/Core/FFitWeightsLinkDef.h b/Common/Core/FFitWeightsLinkDef.h new file mode 100644 index 00000000000..24535355c74 --- /dev/null +++ b/Common/Core/FFitWeightsLinkDef.h @@ -0,0 +1,17 @@ +// 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. + +#ifndef COMMON_CORE_FFITWEIGHTSLINKDEF_H_ +#define COMMON_CORE_FFITWEIGHTSLINKDEF_H_ + +#pragma link C++ class FFitWeights + ; + +#endif // COMMON_CORE_FFITWEIGHTSLINKDEF_H_ diff --git a/Common/TableProducer/CMakeLists.txt b/Common/TableProducer/CMakeLists.txt index 6526cb41772..d01f137f339 100644 --- a/Common/TableProducer/CMakeLists.txt +++ b/Common/TableProducer/CMakeLists.txt @@ -134,7 +134,7 @@ o2physics_add_dpl_workflow(zdc-extra-table-producer o2physics_add_dpl_workflow(ese-table-producer SOURCES eseTableProducer.cxx - PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore + PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::FFitWeights COMPONENT_NAME Analysis) o2physics_add_dpl_workflow(mftmch-matching-data From b38e48d27e95e596342b399c3d5edab117dc5994 Mon Sep 17 00:00:00 2001 From: joachimckh Date: Tue, 18 Aug 2026 14:38:51 +0200 Subject: [PATCH 2/3] documentation --- Common/Core/FFitWeightsLinkDef.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Common/Core/FFitWeightsLinkDef.h b/Common/Core/FFitWeightsLinkDef.h index 24535355c74..68a09ab603b 100644 --- a/Common/Core/FFitWeightsLinkDef.h +++ b/Common/Core/FFitWeightsLinkDef.h @@ -9,6 +9,12 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. +/// \file FFitWeightsLinkDef.h +/// \brief LinkDef for FFitWeights +/// +/// \author Joachim C. K. B. Hansen + + #ifndef COMMON_CORE_FFITWEIGHTSLINKDEF_H_ #define COMMON_CORE_FFITWEIGHTSLINKDEF_H_ From 2ab542cabf0721c487b0e07c0698d2ca63feebbe Mon Sep 17 00:00:00 2001 From: joachimckh Date: Tue, 18 Aug 2026 14:42:19 +0200 Subject: [PATCH 3/3] clang-format --- Common/Core/FFitWeightsLinkDef.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Common/Core/FFitWeightsLinkDef.h b/Common/Core/FFitWeightsLinkDef.h index 68a09ab603b..1960be8f4df 100644 --- a/Common/Core/FFitWeightsLinkDef.h +++ b/Common/Core/FFitWeightsLinkDef.h @@ -14,7 +14,6 @@ /// /// \author Joachim C. K. B. Hansen - #ifndef COMMON_CORE_FFITWEIGHTSLINKDEF_H_ #define COMMON_CORE_FFITWEIGHTSLINKDEF_H_