2025-03-25: merge of 24.0 into main

One conflict in MuonSpectrometer/MuonCalib/NSWCalib/NSWCalibTools/src/NSWCalibTool.cxx triggered by !78615 (merged) (@mvozak). It conflicts with code changes implemented by @jojungge a few months ago. I resolved the conflict manually. Please confirm that the resolution is OK.

This sweep contains the following MRs:

Edited by Vakhtang Tsulaia

Merge request reports

Loading