Skip to content

Commit dd08446

Browse files
justonedev1Michal Tichák
andauthored
QC: add TCanvas into mergeable checks (#13897)
Co-authored-by: Michal Tichák <michal.tichak@cern.ch>
1 parent 31358c8 commit dd08446

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Utilities/Mergers/include/Mergers/Mergeable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ constexpr bool IsDerivedFrom = (std::derived_from<T, Ts> || ...);
4242
//
4343
// \parameter T type to be restricted
4444
template <typename T>
45-
concept Mergeable = IsDerivedFrom<std::remove_pointer_t<T>, mergers::MergeInterface, TCollection, TH1, TTree, TGraph, TEfficiency, THnBase>;
45+
concept Mergeable = IsDerivedFrom<std::remove_pointer_t<T>, mergers::MergeInterface, TCollection, TH1, TTree, TGraph, TEfficiency, THnBase, TCanvas>;
4646

4747
// \brief runtime check whether TObject is mergeable
4848
bool isMergeable(TObject* obj);

Utilities/Mergers/src/Mergeable.cxx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12+
#include <TCanvas.h>
1213
#include <TCollection.h>
1314
#include <TEfficiency.h>
1415
#include <TGraph.h>
@@ -30,7 +31,8 @@ bool isMergeable(TObject* obj)
3031
obj->InheritsFrom(THnBase::Class()) ||
3132
obj->InheritsFrom(TTree::Class()) ||
3233
obj->InheritsFrom(TGraph::Class()) ||
33-
obj->InheritsFrom(TEfficiency::Class());
34+
obj->InheritsFrom(TEfficiency::Class()) ||
35+
obj->InheritsFrom(TCanvas::Class());
3436
}
3537

3638
} // namespace o2::mergers

0 commit comments

Comments
 (0)