2025-05-01: merge of 24.0 into main

This sweep triggered several conflicts:

  1. InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.cxx caused by !79654 (merged), CC @tstreble. Given the previous MR on 24.0 that touched this file was labeled as sweep:ignore, I assumed that I should ignore this change too.
  2. Trigger/TrigHypothesis/TrigEgammaHypo/CMakeLists.txt caused by !79659 (merged), CC @martindl. The changes conflicted with a several-month-old MR on the main branch by @xju. Resolved the conflicts manually.
  3. Trigger/TrigTools/TrigInDetConfig/python/BuildSignatureFlags.py, Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronRecoSequences.py, Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTracks_GSFRefittedSequence.py caused by !79670 (merged), CC @jmasik. Again, these changes conflicted with some developments in the main branch. I used an "educated guess" approach for resolving the conflicts (mostly in favor of the main revisions). @jmasik, please confirm that you are happy with the outcome of the conflict resolution. Thanks

The following MR has been excluded from the sweep:

This sweep contains the following MRs:

Edited by Vakhtang Tsulaia

Merge request reports

Loading