Skip to content

Commit cabb342

Browse files
aalkinaalkin
authored
DPL: distinctly named *label() methods for soa::Column and Table (#3608)
1 parent 14a515e commit cabb342

6 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎Analysis/DataModel/src/dumpDataModel.cxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,29 @@ template <typename C>
2323
void printColumn(char const* fg, char const* bg)
2424
{
2525
if constexpr (!is_index_column_v<C>) {
26-
fmt::printf("<TR><TD color='%s' bgcolor='%s'>%s</TD></TR>", fg, bg, C::label());
26+
fmt::printf("<TR><TD color='%s' bgcolor='%s'>%s</TD></TR>", fg, bg, C::columnLabel());
2727
}
2828
}
2929

3030
template <typename C>
3131
void printIndexColumn(char const* fg, char const* bg)
3232
{
3333
if constexpr (is_index_column_v<C>) {
34-
fmt::printf("<TR><TD color='%s' bgcolor='%s'>%s</TD></TR>", fg, bg, C::label());
34+
fmt::printf("<TR><TD color='%s' bgcolor='%s'>%s</TD></TR>", fg, bg, C::columnLabel());
3535
}
3636
}
3737

3838
template <typename C, typename T>
3939
void printIndex()
4040
{
4141
if constexpr (!is_type_with_originals_v<typename C::binding_t>) {
42-
auto a = MetadataTrait<typename C::binding_t>::metadata::label();
43-
auto b = MetadataTrait<T>::metadata::label();
42+
auto a = MetadataTrait<typename C::binding_t>::metadata::tableLabel();
43+
auto b = MetadataTrait<T>::metadata::tableLabel();
4444
fmt::printf("%s -> %s []\n", a, b);
4545
} else {
4646
using main_original = pack_element_t<0, typename C::binding_t::originals>;
47-
auto a = MetadataTrait<main_original>::metadata::label();
48-
auto b = MetadataTrait<T>::metadata::label();
47+
auto a = MetadataTrait<main_original>::metadata::tableLabel();
48+
auto b = MetadataTrait<T>::metadata::tableLabel();
4949
fmt::printf("%s -> %s []\n", a, b);
5050
}
5151
}
@@ -107,7 +107,7 @@ void dumpTable(bool index = true, enum StyleType styleId = StyleType::DEFAULT)
107107
{
108108
auto style = styles[static_cast<int>(styleId)];
109109
// nodes.push_back({MetadataTrait<T>::metadata::label(), nodeCount});
110-
auto label = MetadataTrait<T>::metadata::label();
110+
auto label = MetadataTrait<T>::metadata::tableLabel();
111111
fmt::printf(R"(%s[color="%s" cellpadding="0" fillcolor="%s" fontcolor="%s" label = <
112112
<TABLE cellpadding='2' cellspacing='0' cellborder='0' ><TH cellpadding='0' bgcolor="black"><TD bgcolor="%s"><font color="%s">%s</font></TD></TH>)",
113113
label, style.color, style.background, style.fontcolor, style.headerbgcolor, style.headerfontcolor, label);

‎Framework/Core/include/Framework/ASoA.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ struct Column {
254254

255255
using persistent = std::true_type;
256256
using type = T;
257-
static constexpr const char* const& label() { return INHERIT::mLabel; }
257+
static constexpr const char* const& columnLabel() { return INHERIT::mLabel; }
258258
ColumnIterator<T> const& getIterator() const
259259
{
260260
return mColumnIterator;
@@ -271,15 +271,15 @@ struct DynamicColumn {
271271
using inherited_t = INHERIT;
272272

273273
using persistent = std::false_type;
274-
static constexpr const char* const& label() { return INHERIT::mLabel; }
274+
static constexpr const char* const& columnLabel() { return INHERIT::mLabel; }
275275
};
276276

277277
template <typename INHERIT>
278278
struct IndexColumn {
279279
using inherited_t = INHERIT;
280280

281281
using persistent = std::false_type;
282-
static constexpr const char* const& label() { return INHERIT::mLabel; }
282+
static constexpr const char* const& columnLabel() { return INHERIT::mLabel; }
283283
};
284284

285285
template <int64_t START = 0, int64_t END = -1>
@@ -913,7 +913,7 @@ class Table
913913
BackendColumnType* lookupColumn()
914914
{
915915
if constexpr (T::persistent::value) {
916-
auto label = T::label();
916+
auto label = T::columnLabel();
917917
auto index = mTable->schema()->GetFieldIndex(label);
918918
if (index == -1) {
919919
throw std::runtime_error(std::string("Unable to find column with label ") + label);
@@ -963,7 +963,7 @@ template <typename INHERIT>
963963
class TableMetadata
964964
{
965965
public:
966-
static constexpr char const* const label() { return INHERIT::mLabel; }
966+
static constexpr char const* const tableLabel() { return INHERIT::mLabel; }
967967
static constexpr char const (&origin())[4] { return INHERIT::mOrigin; }
968968
static constexpr char const (&description())[16] { return INHERIT::mDescription; }
969969
};

‎Framework/Core/include/Framework/AnalysisTask.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,12 @@ struct Produces<soa::Table<C...>> : WritingCursor<typename soa::FilterPersistent
136136
// @return the associated OutputSpec
137137
OutputSpec const spec()
138138
{
139-
return OutputSpec{OutputLabel{metadata::label()}, metadata::origin(), metadata::description()};
139+
return OutputSpec{OutputLabel{metadata::tableLabel()}, metadata::origin(), metadata::description()};
140140
}
141141

142142
OutputRef ref()
143143
{
144-
return OutputRef{metadata::label(), 0};
144+
return OutputRef{metadata::tableLabel(), 0};
145145
}
146146
};
147147

@@ -280,7 +280,7 @@ struct AnalysisDataProcessorBuilder {
280280
using metadata = typename aod::MetadataTrait<std::decay_t<Arg>>::metadata;
281281
static_assert(std::is_same_v<metadata, void> == false,
282282
"Could not find metadata. Did you register your type?");
283-
inputs.push_back({metadata::label(), "AOD", metadata::description()});
283+
inputs.push_back({metadata::tableLabel(), "AOD", metadata::description()});
284284
}
285285

286286
template <typename... Args>
@@ -332,7 +332,7 @@ struct AnalysisDataProcessorBuilder {
332332
static auto extractTableFromRecord(InputRecord& record)
333333
{
334334
if constexpr (soa::is_type_with_metadata_v<aod::MetadataTrait<T>>) {
335-
return record.get<TableConsumer>(aod::MetadataTrait<T>::metadata::label())->asArrowTable();
335+
return record.get<TableConsumer>(aod::MetadataTrait<T>::metadata::tableLabel())->asArrowTable();
336336
} else if constexpr (soa::is_type_with_originals_v<T>) {
337337
return extractFromRecord<T>(record, typename T::originals{});
338338
}
@@ -427,10 +427,10 @@ struct AnalysisDataProcessorBuilder {
427427
if constexpr (soa::is_type_with_originals_v<std::decay_t<G>>) {
428428
using T = typename framework::pack_element_t<0, typename std::decay_t<G>::originals>;
429429
using groupingMetadata = typename aod::MetadataTrait<T>::metadata;
430-
return std::string("f") + groupingMetadata::label() + "ID";
430+
return std::string("f") + groupingMetadata::tableLabel() + "ID";
431431
} else {
432432
using groupingMetadata = typename aod::MetadataTrait<std::decay_t<G>>::metadata;
433-
return std::string("f") + groupingMetadata::label() + "ID";
433+
return std::string("f") + groupingMetadata::tableLabel() + "ID";
434434
}
435435
}
436436

‎Framework/Core/include/Framework/RootTableBuilderHelpers.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ template <typename C>
149149
struct ColumnReaderTrait {
150150
static auto createReader(TTreeReader& reader)
151151
{
152-
return std::move(HolderMaker<Remap64Bit_t<typename C::type>>::make(reader, C::base::label()));
152+
return std::move(HolderMaker<Remap64Bit_t<typename C::type>>::make(reader, C::base::columnLabel()));
153153
}
154154
};
155155

‎Framework/Core/include/Framework/TableBuilder.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -552,14 +552,14 @@ class TableBuilder
552552
template <typename T, size_t... Is>
553553
auto cursorHelper(std::index_sequence<Is...> s)
554554
{
555-
std::vector<std::string> columnNames{pack_element_t<Is, typename T::columns>::label()...};
555+
std::vector<std::string> columnNames{pack_element_t<Is, typename T::columns>::columnLabel()...};
556556
return this->template persist<typename pack_element_t<Is, typename T::columns>::type...>(columnNames);
557557
}
558558

559559
template <typename T, typename E, size_t... Is>
560560
auto cursorHelper(std::index_sequence<Is...> s)
561561
{
562-
std::vector<std::string> columnNames{pack_element_t<Is, typename T::columns>::label()...};
562+
std::vector<std::string> columnNames{pack_element_t<Is, typename T::columns>::columnLabel()...};
563563
return this->template persist<E>(columnNames);
564564
}
565565

‎Framework/Core/src/verifyAODFile.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ using namespace o2::soa;
2222
template <typename T>
2323
void verifyTable(TFile* infile, const char* branchName)
2424
{
25-
std::cout << "Table: " << o2::aod::MetadataTrait<T>::metadata::label() << std::endl;
25+
std::cout << "Table: " << o2::aod::MetadataTrait<T>::metadata::tableLabel() << std::endl;
2626
std::unique_ptr<TTreeReader> reader = std::make_unique<TTreeReader>(branchName, infile);
2727
TableBuilder builder;
2828
RootTableBuilderHelpers::convertASoA<T>(builder, *reader);

0 commit comments

Comments
 (0)