Skip to content

[TDF] Fix ROOT-9037 #1096

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
eguiraud merged 2 commits into from
Oct 2, 2017
Merged

[TDF] Fix ROOT-9037 #1096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0ae8a3
[TDF] Fix ctor with single filename as string.
eguiraud Oct 2, 2017
7e5d5a7
[TDF] Add unit tests for construction of TDataFrames
eguiraud Oct 2, 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
10 changes: 7 additions & 3 deletions tree/treeplayer/inc/ROOT/TDataFrame.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,20 @@ public:
/// booking of actions or transformations.
/// See TInterface for the documentation of the
/// methods available.
template <typename FILENAMESCOLL = std::vector<std::string>,
typename std::enable_if<TTraits::IsContainer<FILENAMESCOLL>::value, int>::type = 0>
template <
typename FILENAMESCOLL = std::vector<std::string>,
typename std::enable_if<
TTraits::IsContainer<FILENAMESCOLL>::value && !std::is_same<FILENAMESCOLL, std::string>::value, int>::type = 0>
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(ULong64_t numEntries);
TDataFrame(std::unique_ptr<TDataSource>, const ColumnNames_t &defaultBranches = {});
};

template <typename FILENAMESCOLL, typename std::enable_if<TTraits::IsContainer<FILENAMESCOLL>::value, int>::type>
template <typename FILENAMESCOLL,
typename std::enable_if<
TTraits::IsContainer<FILENAMESCOLL>::value && !std::is_same<FILENAMESCOLL, std::string>::value, int>::type>
TDataFrame::TDataFrame(std::string_view treeName, const FILENAMESCOLL &filenamescoll,
const ColumnNames_t &defaultBranches)
: TDF::TInterface<TDFDetail::TLoopManager>(std::make_shared<TDFDetail::TLoopManager>(nullptr, defaultBranches))
Expand Down
23 changes: 23 additions & 0 deletions tree/treeplayer/test/dataframe/dataframe_interface.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,29 @@
using namespace ROOT::Experimental;
using namespace ROOT::Experimental::TDF;

TEST(TDataFrameInterface, CreateFromCStrings)
{
TDataFrame tdf("t", "file");
}

TEST(TDataFrameInterface, CreateFromStrings)
{
std::string t("t"), f("file");
TDataFrame tdf(t, f);
}

TEST(TDataFrameInterface, CreateFromContainer)
{
std::string t("t");
std::vector<std::string> f({"f1", "f2"});
TDataFrame tdf(t, f);
}

TEST(TDataFrameInterface, CreateFromInitList)
{
TDataFrame tdf("t", {"f1","f2"});
}

TEST(TDataFrameInterface, CreateFromNullTDirectory)
{
int ret = 1;
Expand Down