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

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
Next Next commit
[TDF] Remove the GetBranchNames function
  • Loading branch information
@eguiraud
eguiraud committed Jul 13, 2017
commit 6baafe4a1a01f230439b6491fd9f3df3d59e4845
23 changes: 0 additions & 23 deletions tree/treeplayer/inc/ROOT/TDFInterface.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,29 +1035,6 @@ private:

inline std::string GetNodeTypeName();

/// Returns the default branches if needed, takes care of the error handling.
template <typename T1, typename T2 = void, typename T3 = void, typename T4 = void>
ColumnNames_t GetBranchNames(const std::vector<std::string_view> &bl, std::string_view actionNameForErr)
{
constexpr auto isT2Void = std::is_same<T2, void>::value;
constexpr auto isT3Void = std::is_same<T3, void>::value;
constexpr auto isT4Void = std::is_same<T4, void>::value;

unsigned int neededBranches = 1 + !isT2Void + !isT3Void + !isT4Void;

unsigned int providedBranches = 0;
std::for_each(bl.begin(), bl.end(), [&providedBranches](std::string_view s) {
if (!s.empty()) providedBranches++;
});

if (neededBranches == providedBranches) {
ColumnNames_t bl2(bl.begin(), bl.end());
return bl2;
}

return GetDefaultBranchNames(neededBranches, actionNameForErr);
}

// Type was specified by the user, no need to infer it
template <typename ActionType, typename... BranchTypes, typename ActionResultType,
typename std::enable_if<!TDFInternal::TNeedJitting<BranchTypes...>::value, int>::type = 0>
Expand Down