Skip to content

[TypeTraits] Move general-purpose metaprogramming utilities from TDataFrame's utils to ROOT TypeTraits #636

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 20 commits into from
Jun 27, 2017
Merged

[TypeTraits] Move general-purpose metaprogramming utilities from TDataFrame's utils to ROOT TypeTraits #636

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
8a7c93a
[TypeTraits] Create TypeTraits namespace
eguiraud Jun 8, 2017
bc08f41
[TypeTraits] Move TDF general-purpose utilities to TTypeTraits.hxx
eguiraud Jun 8, 2017
6f84b40
[TypeTraits] Static-assert that type passed to IsV7Histo is an histogram
eguiraud Jun 9, 2017
d9a0797
[TypeTraits] Add forward declarations for IsV7Hist
eguiraud Jun 9, 2017
d2d2e99
[TypeTraits] Move back IsV7Histo to TDataFrame
eguiraud Jun 13, 2017
c069b65
[TypeTraits] Rename TTypeTraits.hxx -> TypeTraits.hxx
eguiraud Jun 9, 2017
1dc11d9
[TypeTraits] Add missing includes to TypeTraits.hxx
eguiraud Jun 9, 2017
4be3969
[TypeTraits] clang-format TypeTraits.hxx
eguiraud Jun 12, 2017
50d1b36
[TypeTraits] Update `Author` field
eguiraud Jun 12, 2017
a1f1902
[TypeTraits] Add testTypeTraits google test
eguiraud Jun 12, 2017
3c530fa
[TypeTraits] Rename TakeFirst[_t] -> TakeFirstType[_t]
eguiraud Jun 13, 2017
ca17ca6
[TDF] Update TDFActionHelpers.hxx to use ROOT/TypeTraits.hxx
eguiraud Jun 9, 2017
8dd1bb9
[TDF] Update TDFInterface.hxx to use ROOT/TypeTraits.hxx
eguiraud Jun 9, 2017
9a87e70
[TDF] Update TDFNodes.hxx to use ROOT/TypeTraits.hxx
eguiraud Jun 9, 2017
3aa4afa
[TDF] Update TDFUtils.hxx to use ROOT/TypeTraits.hxx
eguiraud Jun 9, 2017
172888b
[TDF] Update TDataFrame.hxx to use ROOT/TypeTraits.hxx
eguiraud Jun 9, 2017
09ebc02
[TDF] Update TResultProxy.hxx to use ROOT/TypeTraits.hxx
eguiraud Jun 9, 2017
1d1ccdd
[TDF] Add helper alias for GenStaticSeq
eguiraud Jun 12, 2017
5dda3b9
[TDF] clang-format pass on TDF headers
eguiraud Jun 12, 2017
24b2b18
[TDF] Fix GenStaticSeq namespace
eguiraud Jun 14, 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] clang-format pass on TDF headers
  • Loading branch information
@eguiraud
eguiraud committed Jun 26, 2017
commit 5dda3b9b81b5498ab810f467b68c7a08bc1e9ef3
8 changes: 4 additions & 4 deletions tree/treeplayer/inc/ROOT/TDFActionHelpers.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@ public:
}

template <typename X0, typename X1, typename X2,
typename std::enable_if<
IsContainer<X0>::value && IsContainer<X1>::value && IsContainer<X2>::value, int>::type = 0>
typename std::enable_if<IsContainer<X0>::value && IsContainer<X1>::value && IsContainer<X2>::value,
int>::type = 0>
void Exec(unsigned int slot, const X0 &x0s, const X1 &x1s, const X2 &x2s)
{
auto thisSlotH = fTo->GetAtSlotUnchecked(slot);
Expand All @@ -212,8 +212,8 @@ public:
}
}
template <typename X0, typename X1, typename X2, typename X3,
typename std::enable_if<IsContainer<X0>::value && IsContainer<X1>::value &&
IsContainer<X2>::value && IsContainer<X3>::value,
typename std::enable_if<IsContainer<X0>::value && IsContainer<X1>::value && IsContainer<X2>::value &&
IsContainer<X3>::value,
int>::type = 0>
void Exec(unsigned int slot, const X0 &x0s, const X1 &x1s, const X2 &x2s, const X3 &x3s)
{
Expand Down
13 changes: 5 additions & 8 deletions tree/treeplayer/inc/ROOT/TDFInterface.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,7 @@ public:
///
/// This function returns a `TDataFrame` built with the output tree as a source.
template <typename... BranchTypes>
TInterface<TLoopManager> Snapshot(std::string_view treename, std::string_view filename,
const ColumnNames_t &bnames)
TInterface<TLoopManager> Snapshot(std::string_view treename, std::string_view filename, const ColumnNames_t &bnames)
{
using TypeInd_t = TTraits::GenStaticSeq_t<sizeof...(BranchTypes)>;
return SnapshotImpl<BranchTypes...>(treename, filename, bnames, TypeInd_t());
Expand All @@ -258,8 +257,7 @@ public:
///
/// This function returns a `TDataFrame` built with the output tree as a source.
/// The types of the branches are automatically inferred and do not need to be specified.
TInterface<TLoopManager> Snapshot(std::string_view treename, std::string_view filename,
const ColumnNames_t &bnames)
TInterface<TLoopManager> Snapshot(std::string_view treename, std::string_view filename, const ColumnNames_t &bnames)
{
auto df = GetDataFrameChecked();
auto tree = df->GetTree();
Expand Down Expand Up @@ -300,7 +298,7 @@ public:
const auto isEmptyRegex = 0 == theRegexSize;
// This is to avoid cases where branches called b1, b2, b3 are all matched by expression "b"
if (theRegexSize > 0 && theRegex[0] != '^') theRegex = "^" + theRegex;
if (theRegexSize > 0 && theRegex[theRegexSize-1] != '$') theRegex = theRegex + "$";
if (theRegexSize > 0 && theRegex[theRegexSize - 1] != '$') theRegex = theRegex + "$";

ColumnNames_t selectedColumns;
selectedColumns.reserve(32);
Expand Down Expand Up @@ -690,8 +688,7 @@ public:
/// booked but not executed. See TResultProxy documentation.
/// The user gives up ownership of the model profile object.
template <typename V1 = TDFDetail::TInferType, typename V2 = TDFDetail::TInferType>
TResultProxy<::TProfile> Profile1D(::TProfile &&model, std::string_view v1Name = "",
std::string_view v2Name = "")
TResultProxy<::TProfile> Profile1D(::TProfile &&model, std::string_view v1Name = "", std::string_view v2Name = "")
{
auto h = std::make_shared<::TProfile>(std::move(model));
if (!TDFInternal::HistoUtils<::TProfile>::HasAxisLimits(*h)) {
Expand Down Expand Up @@ -910,7 +907,7 @@ private:

/// 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)
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;
Expand Down
3 changes: 1 addition & 2 deletions tree/treeplayer/inc/ROOT/TDataFrame.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ public:
/// methods available.
template <typename FILENAMESCOLL = std::vector<std::string>,
typename std::enable_if<TTraits::IsContainer<FILENAMESCOLL>::value, int>::type = 0>
TDataFrame(std::string_view treeName, const FILENAMESCOLL &filenamescoll,
const ColumnNames_t &defaultBranches = {});
TDataFrame(std::string_view treeName, const FILENAMESCOLL &filenamescoll, const ColumnNames_t &defaultBranches = {});
TDataFrame(std::string_view treeName, ::TDirectory *dirPtr, const ColumnNames_t &defaultBranches = {});
TDataFrame(TTree &tree, const ColumnNames_t &defaultBranches = {});
TDataFrame(Long64_t numEntries);
Expand Down
5 changes: 1 addition & 4 deletions tree/treeplayer/inc/ROOT/TResultProxy.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,7 @@ public:

/// Get a const reference to the encapsulated object.
/// Triggers event loop and execution of all actions booked in the associated TLoopManager.
const T &GetValue()
{
return *Get();
}
const T &GetValue() { return *Get(); }

/// Get a pointer to the encapsulated object.
/// Triggers event loop and execution of all actions booked in the associated TLoopManager.
Expand Down