From 4d6847c3ffbae12e5a9131e390836e73afeccaaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Tich=C3=A1k?= Date: Thu, 23 Jan 2025 17:05:01 +0100 Subject: [PATCH] QC: add TCanvas into mergeable checks --- Utilities/Mergers/include/Mergers/Mergeable.h | 2 +- Utilities/Mergers/src/Mergeable.cxx | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Utilities/Mergers/include/Mergers/Mergeable.h b/Utilities/Mergers/include/Mergers/Mergeable.h index 12facadb455ea..60bbf9748bb2a 100644 --- a/Utilities/Mergers/include/Mergers/Mergeable.h +++ b/Utilities/Mergers/include/Mergers/Mergeable.h @@ -42,7 +42,7 @@ constexpr bool IsDerivedFrom = (std::derived_from || ...); // // \parameter T type to be restricted template -concept Mergeable = IsDerivedFrom, mergers::MergeInterface, TCollection, TH1, TTree, TGraph, TEfficiency, THnBase>; +concept Mergeable = IsDerivedFrom, mergers::MergeInterface, TCollection, TH1, TTree, TGraph, TEfficiency, THnBase, TCanvas>; // \brief runtime check whether TObject is mergeable bool isMergeable(TObject* obj); diff --git a/Utilities/Mergers/src/Mergeable.cxx b/Utilities/Mergers/src/Mergeable.cxx index 4963240025e1b..b35602b62fbc2 100644 --- a/Utilities/Mergers/src/Mergeable.cxx +++ b/Utilities/Mergers/src/Mergeable.cxx @@ -9,6 +9,7 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. +#include #include #include #include @@ -30,7 +31,8 @@ bool isMergeable(TObject* obj) obj->InheritsFrom(THnBase::Class()) || obj->InheritsFrom(TTree::Class()) || obj->InheritsFrom(TGraph::Class()) || - obj->InheritsFrom(TEfficiency::Class()); + obj->InheritsFrom(TEfficiency::Class()) || + obj->InheritsFrom(TCanvas::Class()); } } // namespace o2::mergers