Commit 508dcb82 authored 5 years ago by Edward Moyse

Merge branch 'mmc' into 'master'

Merge MuonMomentumCorrections package from 21.2 into master

Closes ATLASRECTS-5275

See merge request atlas/athena!29976

parents 8ff219a1 47fe5fe8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/CPAnalysisExamples/MyToolProvider.h 2 additions, 4 deletions

...on/CPAnalysisExamples/CPAnalysisExamples/MyToolProvider.h
PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/CPAnalysisExamples/ToolExamplesAlg.h 3 additions, 3 deletions

...n/CPAnalysisExamples/CPAnalysisExamples/ToolExamplesAlg.h
PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint/Root/ConstraintFit.cxx 2 additions, 11 deletions

...hys/Run2/HZZ/Tools/ZMassConstraint/Root/ConstraintFit.cxx
PhysicsAnalysis/JetTagging/JetTagTools/src/JetVertexCharge.cxx 1 addition, 1 deletion

...csAnalysis/JetTagging/JetTagTools/src/JetVertexCharge.cxx
PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/CMakeLists.txt 10 additions, 11 deletions

...nID/MuonIDAnalysis/MuonMomentumCorrections/CMakeLists.txt
PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/MuonMomentumCorrections/IMuonCalibrationAndSmearingTool.h 0 additions, 61 deletions

...MuonMomentumCorrections/IMuonCalibrationAndSmearingTool.h
PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/MuonMomentumCorrections/MuonCalibrationAndSmearingTool.h 206 additions, 193 deletions

.../MuonMomentumCorrections/MuonCalibrationAndSmearingTool.h
PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/MuonMomentumCorrections/MuonCalibrationPeriodTool.h 114 additions, 0 deletions

...tions/MuonMomentumCorrections/MuonCalibrationPeriodTool.h
PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/MuonMomentumCorrections/MuonMomentumCorrectionsDict.h 3 additions, 2 deletions

...ons/MuonMomentumCorrections/MuonMomentumCorrectionsDict.h
PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/MuonMomentumCorrections/selection.xml 1 addition, 1 deletion

...MomentumCorrections/MuonMomentumCorrections/selection.xml
PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/Root/MuonCalibrationAndSmearingTool.cxx 2379 additions, 1998 deletions

...mentumCorrections/Root/MuonCalibrationAndSmearingTool.cxx
PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/Root/MuonCalibrationPeriodTool.cxx 305 additions, 0 deletions

...uonMomentumCorrections/Root/MuonCalibrationPeriodTool.cxx
PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/src/CalibratedMuonsProvider.cxx 35 additions, 25 deletions

...s/MuonMomentumCorrections/src/CalibratedMuonsProvider.cxx
PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/src/CalibratedMuonsProvider.h 6 additions, 6 deletions

...sis/MuonMomentumCorrections/src/CalibratedMuonsProvider.h
PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/src/CalibratedTracksProvider.cxx 83 additions, 0 deletions

.../MuonMomentumCorrections/src/CalibratedTracksProvider.cxx
PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/src/CalibratedTracksProvider.h 46 additions, 0 deletions

...is/MuonMomentumCorrections/src/CalibratedTracksProvider.h
PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/src/TestMCASTTool.h 1 addition, 1 deletion

...uonIDAnalysis/MuonMomentumCorrections/src/TestMCASTTool.h
PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/src/components/MuonCalibrationAndSmearing_entries.cxx 8 additions, 0 deletions

...ons/src/components/MuonCalibrationAndSmearing_entries.cxx
PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/util/MCAST_Tester.cxx 139 additions, 108 deletions

...nIDAnalysis/MuonMomentumCorrections/util/MCAST_Tester.cxx
PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonResonanceTools/MuonResonanceTools/IMuonResonanceSelectionTool.h 1 addition, 1 deletion

...nceTools/MuonResonanceTools/IMuonResonanceSelectionTool.h

with 3345 additions and 2426 deletions

Please register or to comment