Merge branch 'Merge21.0.99into21.3' into '21.3' (e161dc1f) · Commits · Martina Javurkova / athena

Commit e161dc1f authored 5 years ago by John Derek Chapman

Merge branch 'Merge21.0.99into21.3' into '21.3'

Merge 21.0.99 into 21.3 branch

See merge request atlas/athena!24614

parents 05e24612 d9dd5a6d

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

DataQuality/DataQualityTools/src/DQTGlobalWZFinderTool.cxx 113 additions, 97 deletions

DataQuality/DataQualityTools/src/DQTGlobalWZFinderTool.cxx
DataQuality/DataQualityUtils/src/HanOutputFile.cxx 3 additions, 3 deletions

DataQuality/DataQualityUtils/src/HanOutputFile.cxx
InnerDetector/InDetDigitization/PixelRadDamDigitization/src/SensorSimPlanarTool.cxx 21 additions, 23 deletions

...ation/PixelRadDamDigitization/src/SensorSimPlanarTool.cxx
InnerDetector/InDetExample/InDetRecExample/python/InDetKeys.py 28 additions, 0 deletions

...Detector/InDetExample/InDetRecExample/python/InDetKeys.py
InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py 4 additions, 4 deletions

...InDetExample/InDetRecExample/share/InDetRec_jobOptions.py
InnerDetector/InDetRecTools/TRT_ToT_Tools/TRT_ToT_Tools/TRT_ToT_dEdx.h 3 additions, 0 deletions

.../InDetRecTools/TRT_ToT_Tools/TRT_ToT_Tools/TRT_ToT_dEdx.h
InnerDetector/InDetRecTools/TRT_ToT_Tools/src/TRT_ToT_dEdx.cxx 166 additions, 56 deletions

...Detector/InDetRecTools/TRT_ToT_Tools/src/TRT_ToT_dEdx.cxx
MuonSpectrometer/MuonOverlay/CscOverlay/CscOverlay/CscOverlay.h 1 addition, 0 deletions

...ectrometer/MuonOverlay/CscOverlay/CscOverlay/CscOverlay.h
MuonSpectrometer/MuonOverlay/CscOverlay/share/CscOverlay_jobOptions.py 1 addition, 0 deletions

...ter/MuonOverlay/CscOverlay/share/CscOverlay_jobOptions.py
MuonSpectrometer/MuonOverlay/CscOverlay/src/CscOverlay.cxx 10 additions, 4 deletions

MuonSpectrometer/MuonOverlay/CscOverlay/src/CscOverlay.cxx
Reconstruction/egamma/egammaValidation/scripts/EgammaARTmonitoring_plotsMaker.py 34 additions, 11 deletions

...gammaValidation/scripts/EgammaARTmonitoring_plotsMaker.py
Reconstruction/egamma/egammaValidation/src/ClusterHistograms.cxx 10 additions, 7 deletions

...ruction/egamma/egammaValidation/src/ClusterHistograms.cxx
Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.cxx 18 additions, 15 deletions

...truction/egamma/egammaValidation/src/EgammaMonitoring.cxx
Reconstruction/egamma/egammaValidation/test/test_electron_pileup.sh 72 additions, 0 deletions

...tion/egamma/egammaValidation/test/test_electron_pileup.sh
Reconstruction/egamma/egammaValidation/test/test_gamma_pileup.sh 73 additions, 0 deletions

...ruction/egamma/egammaValidation/test/test_gamma_pileup.sh
Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx 8 additions, 1 deletion

.../FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx
Simulation/G4Utilities/G4UserActions/G4UserActions/RadiationMapsMaker.h 13 additions, 1 deletion

...tilities/G4UserActions/G4UserActions/RadiationMapsMaker.h
Simulation/G4Utilities/G4UserActions/share/jobOptions.RadiationMapsMaker.py 3 additions, 0 deletions

...ties/G4UserActions/share/jobOptions.RadiationMapsMaker.py
Simulation/G4Utilities/G4UserActions/src/RadiationMapsMaker.cxx 61 additions, 10 deletions

...tion/G4Utilities/G4UserActions/src/RadiationMapsMaker.cxx
Simulation/G4Utilities/G4UserActions/src/RadiationMapsMakerTool.cxx 130 additions, 83 deletions

.../G4Utilities/G4UserActions/src/RadiationMapsMakerTool.cxx

with 772 additions and 315 deletions

Please register or to comment