fixing conflicts for cherry pick (ebc7fb8f) · Commits · Davide Di Croce / athena

Commit ebc7fb8f authored 6 years ago by Tamara Vazquez Schroeder Committed by Roger Felipe Naranjo Garcia 6 years ago

Browse files

fixing conflicts for cherry pick

Former-commit-id: 02d78c27

parent e38473c0

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Reconstruction/egamma/egammaValidation/egammaValidation/EffIDPlots.h 46 additions, 0 deletions

...ion/egamma/egammaValidation/egammaValidation/EffIDPlots.h
Reconstruction/egamma/egammaValidation/egammaValidation/EffRecPlots.h 114 additions, 0 deletions

...on/egamma/egammaValidation/egammaValidation/EffRecPlots.h
Reconstruction/egamma/egammaValidation/egammaValidation/EgammaMonitoring.h 53 additions, 13 deletions

...amma/egammaValidation/egammaValidation/EgammaMonitoring.h
Reconstruction/egamma/egammaValidation/egammaValidation/ElectronPlots.h 46 additions, 0 deletions

.../egamma/egammaValidation/egammaValidation/ElectronPlots.h
Reconstruction/egamma/egammaValidation/egammaValidation/ParticlePlots.h 42 additions, 0 deletions

.../egamma/egammaValidation/egammaValidation/ParticlePlots.h
Reconstruction/egamma/egammaValidation/egammaValidation/PhotonPlots.h 45 additions, 0 deletions

...on/egamma/egammaValidation/egammaValidation/PhotonPlots.h
Reconstruction/egamma/egammaValidation/egammaValidation/ShowerShapesPlots.h 45 additions, 0 deletions

...mma/egammaValidation/egammaValidation/ShowerShapesPlots.h
Reconstruction/egamma/egammaValidation/python/plotsHelper.py 0 additions, 22 deletions

Reconstruction/egamma/egammaValidation/python/plotsHelper.py
Reconstruction/egamma/egammaValidation/python/plotsMaker_electron.py 0 additions, 100 deletions

...ion/egamma/egammaValidation/python/plotsMaker_electron.py
Reconstruction/egamma/egammaValidation/python/plotsMaker_gamma.py 0 additions, 71 deletions

...uction/egamma/egammaValidation/python/plotsMaker_gamma.py
Reconstruction/egamma/egammaValidation/share/__init__.py 0 additions, 0 deletions

Reconstruction/egamma/egammaValidation/share/__init__.py
Reconstruction/egamma/egammaValidation/share/egamma_art_checker_joboptions.py 3 additions, 3 deletions

...a/egammaValidation/share/egamma_art_checker_joboptions.py
Reconstruction/egamma/egammaValidation/share/plotsMaker.py 109 additions, 0 deletions

Reconstruction/egamma/egammaValidation/share/plotsMaker.py
Reconstruction/egamma/egammaValidation/src/EffIDlots.cxx 46 additions, 0 deletions

Reconstruction/egamma/egammaValidation/src/EffIDlots.cxx
Reconstruction/egamma/egammaValidation/src/EffRecPlots.cxx 182 additions, 0 deletions

Reconstruction/egamma/egammaValidation/src/EffRecPlots.cxx
Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.cxx 466 additions, 50 deletions

...truction/egamma/egammaValidation/src/EgammaMonitoring.cxx
Reconstruction/egamma/egammaValidation/src/ElectronPlots.cxx 28 additions, 0 deletions

Reconstruction/egamma/egammaValidation/src/ElectronPlots.cxx
Reconstruction/egamma/egammaValidation/src/ParticlePlots.cxx 28 additions, 0 deletions

Reconstruction/egamma/egammaValidation/src/ParticlePlots.cxx
Reconstruction/egamma/egammaValidation/src/PhotonPlots.cxx 39 additions, 0 deletions

Reconstruction/egamma/egammaValidation/src/PhotonPlots.cxx
Reconstruction/egamma/egammaValidation/src/ShowerShapesPlots.cxx 52 additions, 0 deletions

...ruction/egamma/egammaValidation/src/ShowerShapesPlots.cxx

with 1344 additions and 259 deletions

Please register or to comment