2025-02-25: merge of 24.0 into main

This sweep contains the following MRs:

Conflicts resolved:

  • InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU40_reco.sh: double addition
  • LArCalorimeter/LArL1Sim/src/LArTTL1Maker.cxx: manual resolve
  • MuonSpectrometer/MuonDetDescr/MuonGeoModelTest/python/PlotNSWGeo.py: logically identical change
  • MuonSpectrometer/MuonDetDescr/MuonGeoModelTest/python/testGeoModel.py: Take main version
  • MuonSpectrometer/MuonPhaseII/MuonDetDescr/MuonGeoModelTestR4/python/testGeoModel.py: Take main version
  • Reconstruction/VKalVrt/NewVrtSecInclusiveTool/python/NewVrtSecInclusive.py: delete
  • Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorTruthAlgorithm.cxx: manual resolve

Not resolvable (for me):

Edited by Walter Lampl

Merge request reports

Loading