Skip to content

2023-09-19: merge of 23.0 into main

Conflicts:

  1. Calorimeter/CaloRec/python/CaloConfigFlags.py. Caused by !65810 (merged) in main and !65694 (merged) in 23.0. Manually resolved the conflict by keeping additions from both branches. CC @stapiaar and @mhodgkin for info.
  2. ForwardDetectors/ZDC/ZdcAnalysis/Root/ZdcLEDAnalysisTool.cxx. Same code, different formatting. Kept the main version.
  3. Generators/Hijing_i/src/Hijing.cxx. Kept the main version with minor formatting changes. CC @ewelina for info
  4. Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py. Manually resolved conflicts on the line which calls flags.addFlag() for Trigger.Jet.LowPtFilter. CC @khoo and @fwinkl for info

Excluded from the sweep:

This sweep contains the following MRs:

Edited by Vakhtang Tsulaia

Merge request reports

Loading