Skip to content

2023-09-24: merge of 23.0 into main

Reverted/Removed:

Conflicts:

  • DataQuality/dqm_algorithms/src/TRTWeightedAverage.cxx Kept the main version
  • Reconstruction/Jet/JetMonitoring/python/JetMonitoringStandard.py Kept the 23.0 version. CC @cdelitzs (!65911 (merged))
  • Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py Manual merge. Combined lambda with the help message for the Trigger.Jet.pflowCalibKey flag. CC @cantel (!65831 (merged))
  • Simulation/G4Extensions/RHadrons/src/CustomParticleFactory.cxx Kept the 23.0 version. CC @jchapman (!65834 (merged))

This sweep contains the following MRs:

Edited by Johannes Elmsheuser

Merge request reports