Skip to content

TDF fixes #673

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
dpiparo merged 3 commits into from
Jun 22, 2017
Merged

TDF fixes #673

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0433122
[TDF] Fix jitting in the empty source case (#2)
eguiraud Jun 22, 2017
4c1a8cb
[TDF] Make constant shared_ptrs constant
eguiraud Jun 22, 2017
c1fe433
[TDF] Remove some code duplication in TInterface
eguiraud Jun 22, 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
Prev Previous commit
[TDF] Remove some code duplication in TInterface
  • Loading branch information
@eguiraud
eguiraud committed Jun 22, 2017
commit c1fe4339d99f702ff62c655b2851e3af85bad984
33 changes: 16 additions & 17 deletions tree/treeplayer/inc/ROOT/TDFInterface.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,15 +178,7 @@ public:
/// Refer to the first overload of this method for the full documentation.
TInterface<TFilterBase> Filter(std::string_view expression, std::string_view name = "")
{
auto df = GetDataFrameChecked();
auto tree = df->GetTree();
auto branches = tree ? tree->GetListOfBranches() : nullptr;
auto tmpBranches = fProxiedPtr->GetTmpBranches();
auto tmpBookedBranches = df->GetBookedBranches();
const std::string expressionInt(expression);
const std::string nameInt(name);
auto retVal = TDFInternal::JitTransformation(this, "Filter", GetNodeTypeName(), nameInt, expressionInt, branches,
tmpBranches, tmpBookedBranches, tree);
auto retVal = CallJitTransformation("Filter", name, expression);
return *(TInterface<TFilterBase> *)retVal;
}

Expand Down Expand Up @@ -239,14 +231,7 @@ public:
/// Refer to the first overload of this method for the full documentation.
TInterface<TCustomColumnBase> Define(std::string_view name, std::string_view expression)
{
auto df = GetDataFrameChecked();
auto tree = df->GetTree();
auto branches = tree ? tree->GetListOfBranches() : nullptr;
auto tmpBranches = fProxiedPtr->GetTmpBranches();
auto tmpBookedBranches = df->GetBookedBranches();
const std::string expressionInt(expression);
const std::string nameInt(name);
auto retVal = TDFInternal::JitTransformation(this, "Define", GetNodeTypeName(), nameInt, expressionInt, branches,tmpBranches, tmpBookedBranches, tree);
auto retVal = CallJitTransformation("Define", name, expression);
return *(TInterface<TCustomColumnBase> *)retVal;
}

Expand Down Expand Up @@ -908,6 +893,20 @@ public:
}

private:
Long_t CallJitTransformation(std::string_view transformation, std::string_view nodeName, std::string_view expression)
{
auto df = GetDataFrameChecked();
auto tree = df->GetTree();
auto branches = tree ? tree->GetListOfBranches() : nullptr;
auto tmpBranches = fProxiedPtr->GetTmpBranches();
auto tmpBookedBranches = df->GetBookedBranches();
const std::string transformInt(transformation);
const std::string nameInt(nodeName);
const std::string expressionInt(expression);
return TDFInternal::JitTransformation(this, transformInt, GetNodeTypeName(), nameInt, expressionInt, branches,
tmpBranches, tmpBookedBranches, tree);
}

inline const char *GetNodeTypeName() { return ""; };

/// Returns the default branches if needed, takes care of the error handling.
Expand Down