Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena
Manage
Activity
Members
Labels
Plan
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
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
atlas
athena
Merge requests
!40519
Migrate TruthD3PMaker to HepMC3
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Migrate TruthD3PMaker to HepMC3
averbyts/athena:hepmc3_nightly_fixes_10022021_part_1
into
master
Overview
4
Commits
2
Pipelines
2
Changes
6
Merged
Andrii Verbytskyi
requested to merge
averbyts/athena:hepmc3_nightly_fixes_10022021_part_1
into
master
4 years ago
Overview
4
Commits
2
Pipelines
2
Changes
6
Expand
In this MR:
Migrate TruthD3PMaker to HepMC3
0
0
Merge request reports
Compare
master
version 1
260569dc
4 years ago
master (base)
and
latest version
latest version
92f0d7d7
2 commits,
4 years ago
version 1
260569dc
1 commit,
4 years ago
6 files
+
121
−
9
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
6
Search (e.g. *.vue) (Ctrl+P)
PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/GenParticleGetterTool.cxx
+
37
−
3
Options
@@ -86,12 +86,45 @@ namespace D3PD {
const
void
*
GenParticleGetterTool
::
nextUntyped
()
{
if
(
m_evtItr
==
m_evtEnd
)
return
0
;
if
(
m_evtItr
==
m_evtEnd
)
return
nullptr
;
#ifdef HEPMC3
//AV: Untyped is a bad idea for smart pointers.
// Check if this GenEvent passes our selection cuts:
if
(
!
m_selector
->
pass
(
*
m_evtItr
,
m_mcColl
)
)
{
++
m_evtItr
;
if
(
m_evtItr
==
m_evtEnd
)
return
0
;
if
(
m_evtItr
==
m_evtEnd
)
return
nullptr
;
m_partItr
=
(
*
m_evtItr
)
->
particles
().
begin
();
m_partEnd
=
(
*
m_evtItr
)
->
particles
().
end
();
return
nextUntyped
();
}
// Check if there are no more particles in this GenEvent:
if
(
m_partItr
==
m_partEnd
)
{
++
m_evtItr
;
if
(
m_evtItr
==
m_evtEnd
)
return
nullptr
;
m_partItr
=
(
*
m_evtItr
)
->
particles
().
begin
();
m_partEnd
=
(
*
m_evtItr
)
->
particles
().
end
();
return
nextUntyped
();
}
// Check if this GenParticle passes our selection:
if
(
!
m_selector
->
pass
(
*
m_partItr
,
m_mcColl
)
)
{
++
m_partItr
;
return
nextUntyped
();
}
// I just like to write this part our verbosely...
HepMC
::
ConstGenParticlePtr
part
=
*
m_partItr
;
++
m_partItr
;
return
part
.
get
();
#else
// Check if this GenEvent passes our selection cuts:
if
(
!
m_selector
->
pass
(
*
m_evtItr
,
m_mcColl
)
)
{
++
m_evtItr
;
if
(
m_evtItr
==
m_evtEnd
)
return
nullptr
;
m_partItr
=
(
*
m_evtItr
)
->
particles_begin
();
m_partEnd
=
(
*
m_evtItr
)
->
particles_end
();
return
nextUntyped
();
@@ -100,7 +133,7 @@ namespace D3PD {
// Check if there are no more particles in this GenEvent:
if
(
m_partItr
==
m_partEnd
)
{
++
m_evtItr
;
if
(
m_evtItr
==
m_evtEnd
)
return
0
;
if
(
m_evtItr
==
m_evtEnd
)
return
nullptr
;
m_partItr
=
(
*
m_evtItr
)
->
particles_begin
();
m_partEnd
=
(
*
m_evtItr
)
->
particles_end
();
@@ -118,6 +151,7 @@ namespace D3PD {
++
m_partItr
;
return
part
;
#endif
}
const
std
::
type_info
&
GenParticleGetterTool
::
elementTypeinfo
()
const
{
Loading