2025-02-21: merge of 24.0 into main

The following MRs have been ignored during the sweep:

Several conflicts have been resolved.

  1. AtlasTest/CITest/Athena.cmake. New tests have been added to the end of this file in 24.0 and main (one in each branch). Kept both.
  2. Calorimeter/CaloCondPhysAlgs/src/CaloAddCellPedShift.[h,cxx]. Triggered by !77943 (merged) (CC @wlampl). The conflicts resolved in favor of 24.0
  3. MuonSpectrometer/MuonPhaseII/MuonG4/MuonSensitiveDetectorsR4/python/SensitiveDetectorsCfg.py and Reconstruction/Jet/JetMomentTools/JetMomentTools/JetVertexNNTagger.h. The conflicts triggered by fixes/resolutions applied to the previous sweep MR. Resolved in favor of main
  4. Tracking/TrkConfig/python/TrkConfigFlags.py. Triggered by !77100 (merged) (CC @tstreble). Resolved in favor of main

This sweep contains the following MRs:

Edited by Vakhtang Tsulaia

Merge request reports

Loading