Skip to content

26.09.2022: daily merge merge of 22.0 into master

Edward Moyse requested to merge emoyse/athena:sweep_22.0_master_2022-09-26 into master

I had a few conflicts:

        both modified:   InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonZmumu.cxx
        both modified:   InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValDecorationConfig.py
        both modified:   InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValFlags.py
        both modified:   InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValMonitoringConfig.py

I think I resolved them correctly - notably InDetValFlags.py is quite different in master, so I just removed the doValidateDBMTracks line.

cc @npetters @tstreble

Merge request reports