2025-02-19: merge of 24.0 into main

Two conflicts:

  1. InnerDetector/InDetConfig/python/InDetConfigFlags.py related to !75251 (merged). I kept the 24.0 version. @tstreble please confirm that it was the right thing to do. Thanks
  2. MuonSpectrometer/MuonPhaseII/MuonG4/MuonSensitiveDetectorsR4/python/SensitiveDetectorsCfg.py related to !77889 (merged). I think the resolution was pretty obvious. Still, it would be appreciated if @jchapman and @jojungge could confirm that they are happy with it.

This sweep contains the following MRs:

Edited by Vakhtang Tsulaia

Merge request reports

Loading