Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue 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
Peter Sherwood
athena
Commits
a0e79004
Commit
a0e79004
authored
4 years ago
by
Teng Jian Khoo
Browse files
Options
Downloads
Patches
Plain Diff
Avoid initWithOutput override entirely in AB builds to prevent compilation warning
parent
aa0b71ce
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Reconstruction/Jet/JetRec/JetRec/JetCopier.h
+4
-0
4 additions, 0 deletions
Reconstruction/Jet/JetRec/JetRec/JetCopier.h
Reconstruction/Jet/JetRec/Root/JetCopier.cxx
+2
-4
2 additions, 4 deletions
Reconstruction/Jet/JetRec/Root/JetCopier.cxx
with
6 additions
and
4 deletions
Reconstruction/Jet/JetRec/JetRec/JetCopier.h
+
4
−
0
View file @
a0e79004
...
@@ -41,9 +41,13 @@ class JetCopier
...
@@ -41,9 +41,13 @@ class JetCopier
// Called in parent initialize()
// Called in parent initialize()
virtual
StatusCode
initialize
()
override
;
virtual
StatusCode
initialize
()
override
;
#ifndef XAOD_ANALYSIS
// Needed to initialise the ShallowCopyDecorDeps object, which propagates
// Needed to initialise the ShallowCopyDecorDeps object, which propagates
// decorations on the original into the copy in StoreGate.
// decorations on the original into the copy in StoreGate.
// Override interface implementation in Athena only
virtual
StatusCode
initWithOutput
(
const
SG
::
WriteHandleKey
<
xAOD
::
JetContainer
>&
outputJets
)
override
;
virtual
StatusCode
initWithOutput
(
const
SG
::
WriteHandleKey
<
xAOD
::
JetContainer
>&
outputJets
)
override
;
#endif
// Called during execution
// Called during execution
virtual
StatusCode
getAndRecordJets
(
SG
::
WriteHandle
<
xAOD
::
JetContainer
>&
jetHandle
)
const
override
;
virtual
StatusCode
getAndRecordJets
(
SG
::
WriteHandle
<
xAOD
::
JetContainer
>&
jetHandle
)
const
override
;
...
...
This diff is collapsed.
Click to expand it.
Reconstruction/Jet/JetRec/Root/JetCopier.cxx
+
2
−
4
View file @
a0e79004
...
@@ -36,14 +36,12 @@ StatusCode JetCopier::initialize() {
...
@@ -36,14 +36,12 @@ StatusCode JetCopier::initialize() {
}
}
#ifndef XAOD_ANALYSIS
// Setup helper to propagate decorations from original to copy
// Setup helper to propagate decorations from original to copy
StatusCode
JetCopier
::
initWithOutput
(
const
SG
::
WriteHandleKey
<
xAOD
::
JetContainer
>&
outputJets
)
{
StatusCode
JetCopier
::
initWithOutput
(
const
SG
::
WriteHandleKey
<
xAOD
::
JetContainer
>&
outputJets
)
{
#ifndef XAOD_ANALYSIS
return
m_decorDeps
.
initialize
(
m_inputJets
,
outputJets
)
;
return
m_decorDeps
.
initialize
(
m_inputJets
,
outputJets
)
;
#else
return
StatusCode
::
SUCCESS
;
#endif
}
}
#endif
StatusCode
JetCopier
::
getAndRecordJets
(
SG
::
WriteHandle
<
xAOD
::
JetContainer
>&
jetHandle
)
const
{
StatusCode
JetCopier
::
getAndRecordJets
(
SG
::
WriteHandle
<
xAOD
::
JetContainer
>&
jetHandle
)
const
{
...
...
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