Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
CEPCSW_OTE_development
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
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
Show more breadcrumbs
yudian2002@sjtu.edu.cn
CEPCSW_OTE_development
Commits
6630fea3
Commit
6630fea3
authored
1 year ago
by
FU Chengdong
Browse files
Options
Downloads
Patches
Plain Diff
switch version more than 0.10.4
parent
f2f0f1b2
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Utilities/DataHelper/include/DataHelper/Navigation.h
+1
-1
1 addition, 1 deletion
Utilities/DataHelper/include/DataHelper/Navigation.h
Utilities/DataHelper/src/Navigation.cpp
+2
-2
2 additions, 2 deletions
Utilities/DataHelper/src/Navigation.cpp
with
3 additions
and
3 deletions
Utilities/DataHelper/include/DataHelper/Navigation.h
+
1
−
1
View file @
6630fea3
...
...
@@ -26,7 +26,7 @@ class Navigation{
void
AddTrackerHitCollection
(
const
edm4hep
::
TrackerHitCollection
*
col
){
m_hitColVec
.
push_back
(
col
);};
void
AddTrackerAssociationCollection
(
const
edm4hep
::
MCRecoTrackerAssociationCollection
*
col
){
m_assColVec
.
push_back
(
col
);};
#if EDM4HEP_BUILD_VERSION <= EDM4HEP_VERSION(0, 10,
2
)
#if EDM4HEP_BUILD_VERSION <= EDM4HEP_VERSION(0, 10,
4
)
edm4hep
::
TrackerHit
GetTrackerHit
(
const
edm4hep
::
ObjectID
&
id
,
bool
delete_by_caller
=
true
);
std
::
vector
<
edm4hep
::
SimTrackerHit
>
GetRelatedTrackerHit
(
const
edm4hep
::
ObjectID
&
id
);
#else
...
...
This diff is collapsed.
Click to expand it.
Utilities/DataHelper/src/Navigation.cpp
+
2
−
2
View file @
6630fea3
...
...
@@ -25,7 +25,7 @@ void Navigation::Initialize(){
m_trkHits
.
clear
();
}
#if EDM4HEP_BUILD_VERSION <= EDM4HEP_VERSION(0, 10,
2
)
#if EDM4HEP_BUILD_VERSION <= EDM4HEP_VERSION(0, 10,
4
)
edm4hep
::
TrackerHit
Navigation
::
GetTrackerHit
(
const
edm4hep
::
ObjectID
&
obj_id
,
bool
delete_by_caller
){
#else
edm4hep
::
TrackerHit
Navigation
::
GetTrackerHit
(
const
podio
::
ObjectID
&
obj_id
,
bool
delete_by_caller
){
...
...
@@ -61,7 +61,7 @@ edm4hep::TrackerHit Navigation::GetTrackerHit(const podio::ObjectID& obj_id, boo
throw
std
::
runtime_error
(
"Not found TrackerHit"
);
}
#if EDM4HEP_BUILD_VERSION <= EDM4HEP_VERSION(0, 10,
2
)
#if EDM4HEP_BUILD_VERSION <= EDM4HEP_VERSION(0, 10,
4
)
std
::
vector
<
edm4hep
::
SimTrackerHit
>
Navigation
::
GetRelatedTrackerHit
(
const
edm4hep
::
ObjectID
&
id
){
#else
std
::
vector
<
edm4hep
::
SimTrackerHit
>
Navigation
::
GetRelatedTrackerHit
(
const
podio
::
ObjectID
&
id
){
...
...
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