Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 Utilities/Mergers/include/Mergers/Mergeable.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ constexpr bool IsDerivedFrom = (std::derived_from<T, Ts> || ...);
//
// \parameter T type to be restricted
template <typename T>
concept Mergeable = IsDerivedFrom<std::remove_pointer_t<T>, mergers::MergeInterface, TCollection, TH1, TTree, TGraph, TEfficiency, THnBase>;
concept Mergeable = IsDerivedFrom<std::remove_pointer_t<T>, mergers::MergeInterface, TCollection, TH1, TTree, TGraph, TEfficiency, THnBase, TCanvas>;

// \brief runtime check whether TObject is mergeable
bool isMergeable(TObject* obj);
Expand Down
4 changes: 3 additions & 1 deletion Utilities/Mergers/src/Mergeable.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

#include <TCanvas.h>
#include <TCollection.h>
#include <TEfficiency.h>
#include <TGraph.h>
Expand All @@ -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
Loading