Merge branch 'cherry_pick_changes_for_Egamma_Analysis_from_21.2' into '21.0-mc16d' (cbddcf3f) · Commits · Peter Sherwood / athena

Commit cbddcf3f authored 7 years ago by Tamara Vazquez Schroeder Committed by Jovan Mitrevski 7 years ago

Merge branch 'cherry_pick_changes_for_Egamma_Analysis_from_21.2' into '21.0-mc16d'

Cherry pick latest Egamma Analysis related packages (Selectors/corrections etc) from 21.2 to 21.0-mc16d . ATLASRECTS-4218

See merge request !5823


Former-commit-id: a413cd9d

parent f9516f0c

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

PhysicsAnalysis/AnalysisCommon/PileupReweighting/CMakeLists.txt 2 additions, 1 deletion

...sAnalysis/AnalysisCommon/PileupReweighting/CMakeLists.txt
PhysicsAnalysis/AnalysisCommon/PileupReweighting/Root/TPileupReweighting.cxx 7 additions, 0 deletions

...lysisCommon/PileupReweighting/Root/TPileupReweighting.cxx
PhysicsAnalysis/AnalysisCommon/PileupReweighting/share/debugExample.C 37 additions, 0 deletions

...sis/AnalysisCommon/PileupReweighting/share/debugExample.C
PhysicsAnalysis/AnalysisCommon/PileupReweighting/share/generatePRW_jobOptions.py 1 addition, 3 deletions

...sCommon/PileupReweighting/share/generatePRW_jobOptions.py
PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/CMakeLists.txt 5 additions, 5 deletions

...ivationFramework/DerivationFrameworkEGamma/CMakeLists.txt
PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/DerivationFrameworkEGamma/EGSelectionToolWrapper.h 2 additions, 4 deletions

...EGamma/DerivationFrameworkEGamma/EGSelectionToolWrapper.h
PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/python/ElectronsCPContent.py 1 addition, 1 deletion

...rk/DerivationFrameworkEGamma/python/ElectronsCPContent.py
PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/src/EGSelectionToolWrapper.cxx 2 additions, 2 deletions

.../DerivationFrameworkEGamma/src/EGSelectionToolWrapper.cxx
PhysicsAnalysis/ElectronPhotonID/EgammaAnalysisHelpers/CMakeLists.txt 33 additions, 0 deletions

...sis/ElectronPhotonID/EgammaAnalysisHelpers/CMakeLists.txt
PhysicsAnalysis/ElectronPhotonID/EgammaAnalysisHelpers/EgammaAnalysisHelpers/EgammaAnalysisHelpersDict.h 10 additions, 0 deletions

...Helpers/EgammaAnalysisHelpers/EgammaAnalysisHelpersDict.h
PhysicsAnalysis/ElectronPhotonID/EgammaAnalysisHelpers/EgammaAnalysisHelpers/PhotonHelpers.h 21 additions, 0 deletions

...ammaAnalysisHelpers/EgammaAnalysisHelpers/PhotonHelpers.h
PhysicsAnalysis/ElectronPhotonID/EgammaAnalysisHelpers/EgammaAnalysisHelpers/selection.xml 4 additions, 0 deletions

...EgammaAnalysisHelpers/EgammaAnalysisHelpers/selection.xml
PhysicsAnalysis/ElectronPhotonID/EgammaAnalysisHelpers/Root/PhotonHelpers.cxx 47 additions, 0 deletions

...tronPhotonID/EgammaAnalysisHelpers/Root/PhotonHelpers.cxx
PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/CMakeLists.txt 2 additions, 2 deletions

...ctronPhotonID/ElectronEfficiencyCorrection/CMakeLists.txt
PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/ElectronEfficiencyCorrection/AsgElectronEfficiencyCorrectionTool.h 9 additions, 2 deletions

...fficiencyCorrection/AsgElectronEfficiencyCorrectionTool.h
PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/ElectronEfficiencyCorrection/ElectronChargeEfficiencyCorrectionTool.h 1 addition, 1 deletion

...ciencyCorrection/ElectronChargeEfficiencyCorrectionTool.h
PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/ElectronEfficiencyCorrection/ElectronEfficiencyCorrectionDict.h 0 additions, 1 deletion

...onEfficiencyCorrection/ElectronEfficiencyCorrectionDict.h
PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/ElectronEfficiencyCorrection/IAsgElectronEfficiencyCorrectionTool.h 2 additions, 27 deletions

...ficiencyCorrection/IAsgElectronEfficiencyCorrectionTool.h
PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/ElectronEfficiencyCorrection/TElectronEfficiencyCorrectionTool.h 15 additions, 12 deletions

...nEfficiencyCorrection/TElectronEfficiencyCorrectionTool.h
PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/ElectronEfficiencyCorrection/selection.xml 0 additions, 1 deletion

...encyCorrection/ElectronEfficiencyCorrection/selection.xml

with 201 additions and 62 deletions

Please register or to comment