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] Use SelectColumns instead of GetBranchNames in Min,Max,Mean
  • Loading branch information
@eguiraud
eguiraud committed Jul 13, 2017
commit c1adef50fd67daabf176dd842d4e8fcfe8ef500f
12 changes: 6 additions & 6 deletions tree/treeplayer/inc/ROOT/TDFInterface.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,9 +962,9 @@ public:
template <typename T = TDFDetail::TInferType>
TResultProxy<double> Min(std::string_view branchName = "")
{
auto bl = GetBranchNames<T>({branchName}, "calculate the minimum");
const auto userColumns = branchName.empty() ? ColumnNames_t() : ColumnNames_t({std::string(branchName)});
auto minV = std::make_shared<double>(std::numeric_limits<double>::max());
return CreateAction<TDFInternal::ActionTypes::Min, T>(bl, minV);
return CreateAction<TDFInternal::ActionTypes::Min, T>(userColumns, minV);
}

////////////////////////////////////////////////////////////////////////////
Expand All @@ -979,9 +979,9 @@ public:
template <typename T = TDFDetail::TInferType>
TResultProxy<double> Max(std::string_view branchName = "")
{
auto bl = GetBranchNames<T>({branchName}, "calculate the maximum");
const auto userColumns = branchName.empty() ? ColumnNames_t() : ColumnNames_t({std::string(branchName)});
auto maxV = std::make_shared<double>(std::numeric_limits<double>::min());
return CreateAction<TDFInternal::ActionTypes::Max, T>(bl, maxV);
return CreateAction<TDFInternal::ActionTypes::Max, T>(userColumns, maxV);
}

////////////////////////////////////////////////////////////////////////////
Expand All @@ -996,9 +996,9 @@ public:
template <typename T = TDFDetail::TInferType>
TResultProxy<double> Mean(std::string_view branchName = "")
{
auto bl = GetBranchNames<T>({branchName}, "calculate the mean");
const auto userColumns = branchName.empty() ? ColumnNames_t() : ColumnNames_t({std::string(branchName)});
auto meanV = std::make_shared<double>(0);
return CreateAction<TDFInternal::ActionTypes::Mean, T>(bl, meanV);
return CreateAction<TDFInternal::ActionTypes::Mean, T>(userColumns, meanV);
}

////////////////////////////////////////////////////////////////////////////
Expand Down