Skip to content

2023-04-25: merge 23.0 into master

This sweep contains the following MRs:

I had the following conflicts to resolve:

  • InnerDetector/InDetConfig/python/ITkConfigFlags.py
  • InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py
  • InnerDetector/InDetConfig/python/ITkTrackingSiPatternConfig.py
  • InnerDetector/InDetConfig/python/InDetTrackClusterAssValidationConfig.py
  • InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_mu100_FTF.sh
  • Trigger/TrigAlgorithms/TrigFastTrackFinder/python/ITkFastTrackFinderStandaloneConfig.py

In all cases I took the change from 23.0 i.e. from !62521 (merged).

cc @tstreble

Merge request reports