Skip to content

[TDF] Consistent, unified selection of column names in TDF #768

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 9 commits into from
Jul 13, 2017
Merged

[TDF] Consistent, unified selection of column names in TDF #768

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
12eb94d
[TDF] Rename GetDefault{Branches,ColumnNames}, fDefault{Branches,Colu…
eguiraud Jul 5, 2017
ead3a71
[TDF] Use "column" instead of "branch" in Reduce action
eguiraud Jul 12, 2017
c529f49
[TDF] Use SelectColumns instead of PickBranchNames
eguiraud Jul 5, 2017
301ee7f
[TDF] Use SelectColumns instead of GetBranchNames in Take
eguiraud Jul 12, 2017
0c52782
[TDF] Use SelectColumn instead of GetBranchNames in Histo and Fill ac…
eguiraud Jul 13, 2017
c1adef5
[TDF] Use SelectColumns instead of GetBranchNames in Min,Max,Mean
eguiraud Jul 13, 2017
6baafe4
[TDF] Remove the GetBranchNames function
eguiraud Jul 13, 2017
41b8c8d
[TDF] Delete GetDefaultBranchNames
eguiraud Jul 13, 2017
e22b85c
[TDF] Rename GetUsedBranchNames -> FindUsedColumnNames. Complete ROOT…
eguiraud Jul 13, 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] Rename GetUsedBranchNames -> FindUsedColumnNames. Complete ROOT… 
…-8879.
  • Loading branch information
@eguiraud
eguiraud committed Jul 13, 2017
commit e22b85c71fb648652161d9d98188787009fec3ee
2 changes: 1 addition & 1 deletion tree/treeplayer/inc/ROOT/TDFInterface.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ void CallBuildAndBook(PrevNodeType &prevNode, const ColumnNames_t &bl, unsigned
delete rOnHeap;
}

std::vector<std::string> GetUsedBranchesNames(const std::string, TObjArray *, const std::vector<std::string> &);
std::vector<std::string> FindUsedColumnNames(const std::string, TObjArray *, const std::vector<std::string> &);

using TmpBranchBasePtr_t = std::shared_ptr<TCustomColumnBase>;

Expand Down
6 changes: 3 additions & 3 deletions tree/treeplayer/src/TDFInterface.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ namespace Internal {
namespace TDF {
// Match expression against names of branches passed as parameter
// Return vector of names of the branches used in the expression
std::vector<std::string> GetUsedBranchesNames(const std::string expression, TObjArray *branches,
const std::vector<std::string> &tmpBranches)
std::vector<std::string> FindUsedColumnNames(const std::string expression, TObjArray *branches,
const std::vector<std::string> &tmpBranches)
{
// Check what branches and temporary branches are used in the expression
// To help matching the regex
Expand Down Expand Up @@ -68,7 +68,7 @@ Long_t JitTransformation(void *thisPtr, const std::string &methodName, const std
const std::vector<std::string> &tmpBranches,
const std::map<std::string, TmpBranchBasePtr_t> &tmpBookedBranches, TTree *tree)
{
auto usedBranches = GetUsedBranchesNames(expression, branches, tmpBranches);
auto usedBranches = FindUsedColumnNames(expression, branches, tmpBranches);
auto exprNeedsVariables = !usedBranches.empty();

// Move to the preparation of the jitting
Expand Down