Skip to content
Snippets Groups Projects
Commit fd0d083b authored by Enrico Guiraud's avatar Enrico Guiraud
Browse files

[DF][NFC] Use consistent naming for function parameter

parent a91ff21f
No related merge requests found
...@@ -64,7 +64,7 @@ const std::type_info &TypeName2TypeID(const std::string &name); ...@@ -64,7 +64,7 @@ const std::type_info &TypeName2TypeID(const std::string &name);
std::string TypeID2TypeName(const std::type_info &id); std::string TypeID2TypeName(const std::type_info &id);
std::string ColumnName2ColumnTypeName(const std::string &colName, unsigned int namespaceID, TTree *, RDataSource *, std::string ColumnName2ColumnTypeName(const std::string &colName, unsigned int namespaceID, TTree *, RDataSource *,
bool isCustomColumn, bool extraConversions = true, unsigned int customColID = 0); bool isCustomColumn, bool vector2rvec = true, unsigned int customColID = 0);
char TypeName2ROOTTypeName(const std::string &b); char TypeName2ROOTTypeName(const std::string &b);
......
...@@ -180,11 +180,11 @@ std::string GetBranchOrLeafTypeName(TTree &t, const std::string &colName) ...@@ -180,11 +180,11 @@ std::string GetBranchOrLeafTypeName(TTree &t, const std::string &colName)
/// Return a string containing the type of the given branch. Works both with real TTree branches and with temporary /// Return a string containing the type of the given branch. Works both with real TTree branches and with temporary
/// column created by Define. Throws if type name deduction fails. /// column created by Define. Throws if type name deduction fails.
/// Note that for fixed- or variable-sized c-style arrays the returned type name will be RVec<T>. /// Note that for fixed- or variable-sized c-style arrays the returned type name will be RVec<T>.
/// vector2tvec specifies whether typename 'std::vector<T>' should be converted to 'RVec<T>' or returned as is /// vector2rvec specifies whether typename 'std::vector<T>' should be converted to 'RVec<T>' or returned as is
/// customColID is only used if isCustomColumn is true, and must correspond to the custom column's unique identifier /// customColID is only used if isCustomColumn is true, and must correspond to the custom column's unique identifier
/// returned by its `GetID()` method. /// returned by its `GetID()` method.
std::string ColumnName2ColumnTypeName(const std::string &colName, unsigned int namespaceID, TTree *tree, std::string ColumnName2ColumnTypeName(const std::string &colName, unsigned int namespaceID, TTree *tree,
RDataSource *ds, bool isCustomColumn, bool vector2tvec, unsigned int customColID) RDataSource *ds, bool isCustomColumn, bool vector2rvec, unsigned int customColID)
{ {
std::string colType; std::string colType;
...@@ -193,7 +193,7 @@ std::string ColumnName2ColumnTypeName(const std::string &colName, unsigned int n ...@@ -193,7 +193,7 @@ std::string ColumnName2ColumnTypeName(const std::string &colName, unsigned int n
if (colType.empty() && tree) { if (colType.empty() && tree) {
colType = GetBranchOrLeafTypeName(*tree, colName); colType = GetBranchOrLeafTypeName(*tree, colName);
if (vector2tvec && TClassEdit::IsSTLCont(colType) == ROOT::ESTLType::kSTLvector) { if (vector2rvec && TClassEdit::IsSTLCont(colType) == ROOT::ESTLType::kSTLvector) {
std::vector<std::string> split; std::vector<std::string> split;
int dummy; int dummy;
TClassEdit::GetSplit(colType.c_str(), split, dummy); TClassEdit::GetSplit(colType.c_str(), split, dummy);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment