Skip to content

2024-10-08: merge of 24.0 into main

A few conflicts had to be resolved:

  1. ForwardDetectors/ZDC/ZdcAnalysis/Root/ZdcAnalysisTool.cxx

Caused by !74686 (merged). Kept the 24.0 version. @mhouseng could you please check that everything looks OK to you. Thanks.

  1. MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/TgcRawDataMonitorAlgorithm.cxx

Caused by !74804 (merged). Given the code has been reorganized in the main, I had to propagate the changes from 24.0 into main manually. @masato, could you please take a look at the result of the manual merge? Thanks.

  1. Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoTool.cxx

Caused by !74459 (merged). Kept the 24.0 version. @dguest could you please check that everything looks OK to you. Thanks.

This sweep contains the following MRs:

Edited by Vakhtang Tsulaia

Merge request reports