[EVO] fix merge conflicts 2026/04/22

[Dr15Jones]

PR description:

Fix merge conflicts.

PR validation:

git allowed commit.

resolves cms-sw/framework-team#2176

[cmsbuild]

cms-bot internal usage

[Dr15Jones]

type evo

[Dr15Jones]

assign core

[cmsbuild]

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-50787/49100

[cmsbuild]

New categories assigned: core

@Dr15Jones,@makortel,@smuzaffar you have been requested to review this Pull request/Issue and eventually sign? Thanks

[cmsbuild]

A new Pull Request was created by @Dr15Jones for CMSSW_17_0_EVOLUTION_X.

It involves the following packages:

• DQM/Integration (dqm)
• DataFormats/BTauReco (reconstruction)
• DataFormats/CSCRecHit (reconstruction)
• DataFormats/CTPPSReco (reconstruction)
• DataFormats/Candidate (reconstruction)
• DataFormats/DTRecHit (reconstruction)
• DataFormats/EcalRecHit (reconstruction)
• DataFormats/EgammaCandidates (reconstruction)
• DataFormats/EgammaReco (reconstruction)
• DataFormats/GEMRecHit (reconstruction)
• DataFormats/GsfTrackReco (reconstruction)
• DataFormats/HcalRecHit (reconstruction)
• DataFormats/HepMCCandidate (generators)
• DataFormats/JetReco (reconstruction)
• DataFormats/PatCandidates (reconstruction, xpog)
• DataFormats/TauReco (reconstruction)
• DataFormats/VertexReco (reconstruction)
• HLTriggerOffline/Scouting (dqm)

@Dr15Jones, @Moanwar, @battibass, @cmsbuild, @ctarricone, @ftorrresd, @gabrielmscampos, @jfernan2, @lviliani, @makortel, @mandrenguyen, @mkirsano, @nothingface0, @rseidita, @sensrcn, @smuzaffar, @srimanob, @theofil can you please review it and eventually sign? Thanks.
@24LopezR, @AlexDeMoor, @CeliaFernandez, @Fedespring, @HuguesBrun, @Ming-Yan, @Prasant1993, @ReyerBand, @Sam-Harper, @Senphy, @VinInn, @VourMa, @a-kapoor, @abbiendi, @abdoulline, @afiqaize, @ahinzmann, @andrzejnovak, @argiro, @azotz, @batinkov, @battibass, @bsunanda, @castaned, @cericeci, @elusian, @fabferro, @francescobrivio, @fsimone91, @gkasieczka, @gouskos, @gpetruc, @grzanka, @hatakeyamak, @jainshilpi, @jdamgov, @jdolen, @jhgoh, @jshlee, @lgray, @llunerti, @mariadalfonso, @mbluj, @missirol, @mmasciov, @mmusich, @mtosi, @nhanvtran, @pavlo-kashko, @philippgadow, @ptcox, @ram1123, @rappoccio, @rchatter, @rovere, @sameasy, @schoef, @seemasharmafnal, @sobhatta, @thomreis, @threus, @trocino, @varuns23, @wang0jin, @watson-ij this is something you requested to watch as well.
@ftenchini, @mandrenguyen, @sextonkennedy you are the release manager for this.

cms-bot commands are listed here

[Dr15Jones]

please test

[cmsbuild]

-1

Failed Tests: RelVals
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-66f46b/52824/summary.html
COMMIT: 4171e1f
CMSSW: CMSSW_17_0_EVOLUTION_X_2026-04-20-2300/el8_amd64_gcc13
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/50787/52824/install.sh to create a dev area with all the needed externals and cmssw changes.

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:

• @DickyChant Add Angantyr heavy-ion path to Pythia8 hadronizer with LS-safe init #50756
• @stahlleiton Update PbPb EW skim #50757
• @Annnnya Do not call MPI_Finalize on error #50752
• @shimashimarin update SherpaHardronizer for HepMC3 #50591
• @makortel Add dictionaries to avoid header parsing #50705
• @jpata MLPF Run 3 inference code and model update #50316
• @cms-ngt-hlt Phase2 HLT nano workflows: miscelleaneous fixes for TICL-related modules. #50748
• @stahlleiton Update UPCMonopole skim #50743
• @sakura-ngt [online DQM] robust clientTag handling for NGT and improved ScoutingMuon 2D histogram formatting #50761
• @alexstrel Hotfix for multiblock Alpaka multi-depth PF clusterizer. #50746

You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-66f46b/52824/git-recent-commits.json
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-66f46b/52824/git-merge-result

Failed RelVals

ValueError: Undefined workflows: 10224.0, 250202.181, 25202.0

[makortel]

+core

[jfernan2]

+1

[smuzaffar]

merging for evolution branch, this resolves the merge conflicts