Skip to content

[TDF] Misc fixes #867

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 5 commits into from
Aug 18, 2017
Merged

[TDF] Misc fixes #867

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
023127b
[TDF] Make TInterface's member variables private.
eguiraud Aug 16, 2017
43ac0ca
[TDF] Fix typos
eguiraud Aug 15, 2017
9d1950f
[TDF] Use clearer name for function parameter
eguiraud Aug 17, 2017
7c9d5c4
[TDF] Remove spurious \endcond doxygen directive
eguiraud Aug 17, 2017
1c81437
[TDF] Comment on jitted gROOTMutex unlocking
eguiraud Aug 17, 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 clearer name for function parameter
  • Loading branch information
@eguiraud
eguiraud committed Aug 17, 2017
commit 9d1950f991a1ead595136c225d7e3514f0e936ea
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 @@ -117,7 +117,7 @@ std::vector<std::string> FindUsedColumnNames(const std::string, TObjArray *, con

using TmpBranchBasePtr_t = std::shared_ptr<TCustomColumnBase>;

Long_t JitTransformation(void *thisPtr, const std::string &methodName, const std::string &nodeTypeName,
Long_t JitTransformation(void *thisPtr, const std::string &methodName, const std::string &interfaceTypeName,
const std::string &name, const std::string &expression, TObjArray *branches,
const std::vector<std::string> &tmpBranches,
const std::map<std::string, TmpBranchBasePtr_t> &tmpBookedBranches, TTree *tree);
Expand Down
4 changes: 2 additions & 2 deletions tree/treeplayer/src/TDFInterface.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ std::vector<std::string> FindUsedColumnNames(const std::string expression, TObjA

// Jit a string filter or a string temporary column, call this->Define or this->Filter as needed
// Return pointer to the new functional chain node returned by the call, cast to Long_t
Long_t JitTransformation(void *thisPtr, const std::string &methodName, const std::string &nodeTypeName,
Long_t JitTransformation(void *thisPtr, const std::string &methodName, const std::string &interfaceTypeName,
const std::string &name, const std::string &expression, TObjArray *branches,
const std::vector<std::string> &tmpBranches,
const std::map<std::string, TmpBranchBasePtr_t> &tmpBookedBranches, TTree *tree)
Expand Down Expand Up @@ -133,7 +133,7 @@ Long_t JitTransformation(void *thisPtr, const std::string &methodName, const std

// Here we have two cases: filter and column
ss.str("");
ss << "((" << nodeTypeName << "*)" << thisPtr << ")->" << methodName << "(";
ss << "((" << interfaceTypeName << "*)" << thisPtr << ")->" << methodName << "(";
if (methodName == "Define") {
ss << "\"" << name << "\", ";
}
Expand Down