Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
Root
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
为了安全,强烈建议开启2FA双因子认证:User Settings -> Account -> Enable two-factor authentication!!!
Show more breadcrumbs
cxwx
Root
Commits
fd0d083b
Commit
fd0d083b
authored
6 years ago
by
Enrico Guiraud
Browse files
Options
Downloads
Patches
Plain Diff
[DF][NFC] Use consistent naming for function parameter
parent
a91ff21f
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tree/dataframe/inc/ROOT/RDF/Utils.hxx
+1
-1
1 addition, 1 deletion
tree/dataframe/inc/ROOT/RDF/Utils.hxx
tree/dataframe/src/RDFUtils.cxx
+3
-3
3 additions, 3 deletions
tree/dataframe/src/RDFUtils.cxx
with
4 additions
and
4 deletions
tree/dataframe/inc/ROOT/RDF/Utils.hxx
+
1
−
1
View file @
fd0d083b
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
tree/dataframe/src/RDFUtils.cxx
+
3
−
3
View file @
fd0d083b
...
@@ -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>.
/// vector2
t
vec specifies whether typename 'std::vector<T>' should be converted to 'RVec<T>' or returned as is
/// vector2
r
vec 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
vector2
t
vec
,
unsigned
int
customColID
)
RDataSource
*
ds
,
bool
isCustomColumn
,
bool
vector2
r
vec
,
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
(
vector2
t
vec
&&
TClassEdit
::
IsSTLCont
(
colType
)
==
ROOT
::
ESTLType
::
kSTLvector
)
{
if
(
vector2
r
vec
&&
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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment