Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
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
Davide Di Croce
athena
Commits
a7346959
Commit
a7346959
authored
2 years ago
by
Edward Moyse
Browse files
Options
Downloads
Plain Diff
Merge branch 'ufoEnergyPerLayerFix' into 'master'
UFO energy per layer fix See merge request
atlas/athena!57021
parents
7744fa70
0be9b790
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Reconstruction/Jet/JetMomentTools/Root/JetCaloEnergies.cxx
+2
-2
2 additions, 2 deletions
Reconstruction/Jet/JetMomentTools/Root/JetCaloEnergies.cxx
with
2 additions
and
2 deletions
Reconstruction/Jet/JetMomentTools/Root/JetCaloEnergies.cxx
+
2
−
2
View file @
a7346959
...
...
@@ -209,7 +209,7 @@ void JetCaloEnergies::fillEperSamplingFE(const xAOD::Jet& jet, std::vector<float
for
(
size_t
n
=
0
;
n
<
constit
->
otherObjects
().
size
();
++
n
)
{
if
(
!
constit
->
otherObject
(
n
))
continue
;
int
index_pfo
=
constit
->
otherObject
(
n
)
->
index
();
int
index_pfo
=
constit
->
otherObject
(
n
)
->
index
();
if
(
index_pfo
<
0
)
continue
;
const
auto
*
fe
=
(
constit
->
otherObject
(
n
));
...
...
@@ -222,7 +222,7 @@ void JetCaloEnergies::fillEperSamplingFE(const xAOD::Jet& jet, std::vector<float
//If we have a PFO, we should still get the associated cluster first
else
{
const
xAOD
::
FlowElement
*
pfo
=
dynamic_cast
<
const
xAOD
::
FlowElement
*>
(
fe
);
if
(
pfo
->
otherObjects
().
size
()
>
0
&&
pfo
->
otherObject
(
0
)
->
type
()
==
xAOD
::
Type
::
CaloCluster
){
if
(
pfo
->
otherObjects
().
size
()
>
0
&&
pfo
->
otherObject
(
0
)
&&
pfo
->
otherObject
(
0
)
->
type
()
==
xAOD
::
Type
::
CaloCluster
){
cluster
=
dynamic_cast
<
const
xAOD
::
CaloCluster
*>
(
pfo
->
otherObject
(
0
));
}
}
...
...
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