Skip to content
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

[IMT] Add TThreadedObject::GetAtSlotRaw #934

Merged
merged 2 commits into from
Sep 5, 2017
Merged

[IMT] Add TThreadedObject::GetAtSlotRaw #934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9c77d1
[IMT] Add TThreadedObject::GetAtSlotRaw
eguiraud Sep 4, 2017
be115a1
[TDF] Use `TThreadedObject::GetAtSlotRaw` instead of `GetAtSlotUnchec…
eguiraud Sep 4, 2017
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
10 changes: 10 additions & 0 deletions core/thread/inc/ROOT/TThreadedObject.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,16 @@ namespace ROOT {
return fObjPointers[i];
}

/// Access a particular slot which corresponds to a single thread.
/// This overload is faster than the GetAtSlotUnchecked method but
/// the caller is responsible to make sure that an object is
/// initialised for the particular slot and that the returned pointer
/// will not outlive the TThreadedObject that returned it.
T* GetAtSlotRaw(unsigned i) const
{
return fObjPointers[i].get();
}

/// Access the pointer corresponding to the current slot. This method is
/// not adequate for being called inside tight loops as it implies a
/// lookup in a mapping between the threadIDs and the slot indices.
Expand Down
16 changes: 8 additions & 8 deletions tree/treeplayer/inc/ROOT/TDFActionHelpers.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,28 +158,28 @@ public:

void Exec(unsigned int slot, double x0) // 1D histos
{
fTo->GetAtSlotUnchecked(slot)->Fill(x0);
fTo->GetAtSlotRaw(slot)->Fill(x0);
}

void Exec(unsigned int slot, double x0, double x1) // 1D weighted and 2D histos
{
fTo->GetAtSlotUnchecked(slot)->Fill(x0, x1);
fTo->GetAtSlotRaw(slot)->Fill(x0, x1);
}

void Exec(unsigned int slot, double x0, double x1, double x2) // 2D weighted and 3D histos
{
fTo->GetAtSlotUnchecked(slot)->Fill(x0, x1, x2);
fTo->GetAtSlotRaw(slot)->Fill(x0, x1, x2);
}

void Exec(unsigned int slot, double x0, double x1, double x2, double x3) // 3D weighted histos
{
fTo->GetAtSlotUnchecked(slot)->Fill(x0, x1, x2, x3);
fTo->GetAtSlotRaw(slot)->Fill(x0, x1, x2, x3);
}

template <typename X0, typename std::enable_if<IsContainer<X0>::value, int>::type = 0>
void Exec(unsigned int slot, const X0 &x0s)
{
auto thisSlotH = fTo->GetAtSlotUnchecked(slot);
auto thisSlotH = fTo->GetAtSlotRaw(slot);
for (auto &x0 : x0s) {
thisSlotH->Fill(x0); // TODO: Can be optimised in case T == vector<double>
}
Expand All @@ -189,7 +189,7 @@ public:
typename std::enable_if<IsContainer<X0>::value && IsContainer<X1>::value, int>::type = 0>
void Exec(unsigned int slot, const X0 &x0s, const X1 &x1s)
{
auto thisSlotH = fTo->GetAtSlotUnchecked(slot);
auto thisSlotH = fTo->GetAtSlotRaw(slot);
if (x0s.size() != x1s.size()) {
throw std::runtime_error("Cannot fill histogram with values in containers of different sizes.");
}
Expand All @@ -206,7 +206,7 @@ public:
int>::type = 0>
void Exec(unsigned int slot, const X0 &x0s, const X1 &x1s, const X2 &x2s)
{
auto thisSlotH = fTo->GetAtSlotUnchecked(slot);
auto thisSlotH = fTo->GetAtSlotRaw(slot);
if (!(x0s.size() == x1s.size() && x1s.size() == x2s.size())) {
throw std::runtime_error("Cannot fill histogram with values in containers of different sizes.");
}
Expand All @@ -224,7 +224,7 @@ public:
int>::type = 0>
void Exec(unsigned int slot, const X0 &x0s, const X1 &x1s, const X2 &x2s, const X3 &x3s)
{
auto thisSlotH = fTo->GetAtSlotUnchecked(slot);
auto thisSlotH = fTo->GetAtSlotRaw(slot);
if (!(x0s.size() == x1s.size() && x1s.size() == x2s.size() && x1s.size() == x3s.size())) {
throw std::runtime_error("Cannot fill histogram with values in containers of different sizes.");
}
Expand Down