Merge branch 'dev/EG4momcorr_r21tor22' into 'master' (be046d41) · Commits · Peter Sherwood / athena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

be046d41

Commit be046d41 authored 4 years ago by Walter Lampl

Downloads
- Plain Diff

Merge branch 'dev/EG4momcorr_r21tor22' into 'master'

Import ElectronPhotonFourMomentumCorrection r21.2->r22

See merge request atlas/athena!38718

parents 4bea6150 aed6204c

No related branches found

No related tags found

Loading

Changes 47

Expand all Hide whitespace changes

Inline Side-by-side

Showing

PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/util/testEgammaCalibTool.cxx 1 addition, 1 deletion

...PhotonFourMomentumCorrection/util/testEgammaCalibTool.cxx
PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/util/testMomentumSystematics.cxx 1 addition, 1 deletion

...onFourMomentumCorrection/util/testMomentumSystematics.cxx
PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/util/testResolutionParam.cxx 2 additions, 1 deletion

...PhotonFourMomentumCorrection/util/testResolutionParam.cxx
PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/util/testUniformityCorrections.cxx 1 addition, 1 deletion

...FourMomentumCorrection/util/testUniformityCorrections.cxx
Reconstruction/egamma/egammaUtils/CMakeLists.txt 3 additions, 3 deletions

Reconstruction/egamma/egammaUtils/CMakeLists.txt
Reconstruction/egamma/egammaUtils/Root/eg_resolution.cxx 12 additions, 5 deletions

Reconstruction/egamma/egammaUtils/Root/eg_resolution.cxx
Reconstruction/egamma/egammaUtils/egammaUtils/eg_resolution.h 2 additions, 1 deletion

...nstruction/egamma/egammaUtils/egammaUtils/eg_resolution.h

with 22 additions and 13 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