Skip to content

2024-12-05: merge of 24.0 into main

This sweep contains the following MRs:

Had to resolve merge conflicts or compilation problems in:

Event/xAOD/xAODMetaDataCnv/python/InfileMetaDataConfig.py
InnerDetector/InDetConfig/python/InDetPriVxFinderConfig.py
InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_zprime_tide.sh
MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonSegmentRegionRecoveryTool.cxx
PhysicsAnalysis/TauID/TauAnalysisTools/Root/BuildTruthTaus.cxx
Tracking/Acts/ActsDataPreparation/src/ClusterizationAlg.ipp
Trigger/TrigValidation/TrigValTools/share/TrigValInputs.json
Tracking/Acts/ActsDataPreparation/src/details/ClusterizationAlg.icc
Trigger/TrigTools/TrigInDetPattRecoTools/src/TrigInDetTrackSeedingTool.cxx
Edited by Johannes Elmsheuser

Merge request reports

Loading