Skip to content

2024-09-09: merge of 24.0 into main

A few conflicts on this sweep

  • InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysHitDecoratorAlg.cxx. A small change introduced by @smh in !74129 (merged) conflicted with a large cleanup of this class implemented by @ncalace in !73610 (merged). I propagated the change from 24.0 into main. It would be good to double-check that I did the right thing, though. Thanks!
  • InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU40_reco.sh. The conflict was resolved following a suggestion by @tstreble. Thanks!
  • Trigger/TrigTools/TrigInDetConfig/python/BuildSignatureFlags.py and Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_ITk_ttbar200PU_build.py. Conflicts were resolved after a discussion with @jmasik. Please confirm that the resolutions look good. Thanks!

This sweep contains the following MRs:

Edited by Vakhtang Tsulaia

Merge request reports

Loading