Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

athena
- Activity
- Members
- Labels
- Terraform modules
- Incidents

Snippets Groups Projects

00ea0855

Commit 00ea0855 authored 6 years ago by Adam Edward Barton

Downloads
- Plain Diff

Merge branch 'xAODCaloEvent_setSignalState_nonConst' into 'master'

Make Calo Cluster setSignalState non const: ATLASRECTS-4598

See merge request atlas/athena!14465

parents 372ee60c 762f6900

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

Event/xAOD/xAODCaloEvent/Root/CaloClusterChangeSignalState.cxx 2 additions, 2 deletions

.../xAOD/xAODCaloEvent/Root/CaloClusterChangeSignalState.cxx
Event/xAOD/xAODCaloEvent/Root/CaloCluster_v1.cxx 41 additions, 77 deletions

Event/xAOD/xAODCaloEvent/Root/CaloCluster_v1.cxx
Event/xAOD/xAODCaloEvent/xAODCaloEvent/CaloClusterChangeSignalState.h 5 additions, 5 deletions

...AODCaloEvent/xAODCaloEvent/CaloClusterChangeSignalState.h
Event/xAOD/xAODCaloEvent/xAODCaloEvent/versions/CaloCluster_v1.h 10 additions, 17 deletions

...AOD/xAODCaloEvent/xAODCaloEvent/versions/CaloCluster_v1.h
Reconstruction/Jet/JetMomentTools/Root/JetConstitFourMomTool.cxx 3 additions, 4 deletions

...ruction/Jet/JetMomentTools/Root/JetConstitFourMomTool.cxx
Reconstruction/MET/METReconstruction/Root/METAssociationTool.cxx 0 additions, 15 deletions

...ruction/MET/METReconstruction/Root/METAssociationTool.cxx
Reconstruction/MET/METReconstruction/Root/METSoftAssociator.cxx 5 additions, 5 deletions

...truction/MET/METReconstruction/Root/METSoftAssociator.cxx
Reconstruction/MET/METReconstruction/Root/METSoftTermsTool.cxx 13 additions, 18 deletions

...struction/MET/METReconstruction/Root/METSoftTermsTool.cxx
Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/ClusterToPseudoJetConverter.h 1 addition, 1 deletion

...TrigHLTJetRec/TrigHLTJetRec/ClusterToPseudoJetConverter.h

with 80 additions and 144 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment