Skip to content

DPL Analysis: out-of-Line LabelMap #6345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktf merged 1 commit into from
Jun 8, 2021
Merged

DPL Analysis: out-of-Line LabelMap #6345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 8 additions & 26 deletions Framework/Core/include/Framework/Array2D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <unordered_map>
#include <memory>
#include <string>
extern template class std::unordered_map<std::string, u_int32_t>;

namespace o2::framework
{
Expand Down Expand Up @@ -121,36 +122,17 @@ struct Array2D {

static constexpr const char* const labels_rows_str = "labels_rows";
static constexpr const char* const labels_cols_str = "labels_cols";

using labelmap_t = std::unordered_map<std::string, uint32_t>;
struct LabelMap {
LabelMap()
: rowmap{},
colmap{},
labels_rows{},
labels_cols{}
{
}
LabelMap(uint32_t rows, uint32_t cols, std::vector<std::string> labels_rows_, std::vector<std::string> labels_cols_)
: rowmap{populate(rows, labels_rows_)},
colmap{populate(cols, labels_cols_)},
labels_rows{labels_rows_},
labels_cols{labels_cols_}
{
}
LabelMap();
LabelMap(uint32_t rows, uint32_t cols, std::vector<std::string> labels_rows_, std::vector<std::string> labels_cols_);

LabelMap(uint32_t size, std::vector<std::string> labels)
: rowmap{},
colmap{populate(size, labels)},
labels_rows{},
labels_cols{labels}
{
}
LabelMap(uint32_t size, std::vector<std::string> labels);

LabelMap(LabelMap const& other) = default;
LabelMap(LabelMap&& other) = default;
LabelMap& operator=(LabelMap const& other) = default;
LabelMap& operator=(LabelMap&& other) = default;
LabelMap(LabelMap const& other);
LabelMap(LabelMap&& other);
LabelMap& operator=(LabelMap const& other);
LabelMap& operator=(LabelMap&& other);

labelmap_t rowmap;
labelmap_t colmap;
Expand Down
31 changes: 31 additions & 0 deletions Framework/Core/src/Array2D.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@
#include <Framework/RuntimeError.h>
#include <Framework/CompilerBuiltins.h>

template class std::unordered_map<std::string, u_int32_t>;

namespace o2::framework
{

labelmap_t LabelMap::populate(uint32_t size, std::vector<std::string> labels)
{
labelmap_t map;
Expand Down Expand Up @@ -47,5 +50,33 @@ void LabelMap::replaceLabelsCols(uint32_t size, std::vector<std::string> const&
colmap.clear();
colmap = populate(labels.size(), labels);
}
LabelMap::LabelMap()
: rowmap{},
colmap{},
labels_rows{},
labels_cols{}
{
}

LabelMap::LabelMap(uint32_t rows, uint32_t cols, std::vector<std::string> labels_rows_, std::vector<std::string> labels_cols_)
: rowmap{populate(rows, labels_rows_)},
colmap{populate(cols, labels_cols_)},
labels_rows{labels_rows_},
labels_cols{labels_cols_}
{
}

LabelMap::LabelMap(uint32_t size, std::vector<std::string> labels)
: rowmap{},
colmap{populate(size, labels)},
labels_rows{},
labels_cols{labels}
{
}

LabelMap::LabelMap(LabelMap const& other) = default;
LabelMap::LabelMap(LabelMap&& other) = default;
LabelMap& LabelMap::operator=(LabelMap const& other) = default;
LabelMap& LabelMap::operator=(LabelMap&& other) = default;

} // namespace o2::framework