[EVO] Fix merge conflicts 2026/04/20

[Dr15Jones]

PR description:

Fix conflicts between EVO and master.

PR validation:

resolves cms-sw/framework-team#2170

[cmsbuild]

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-50767/49080

Code check has found code style and quality issues which could be resolved by applying following patch(s)

• code-format:
  https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-50767/49080/code-format.patch
  e.g. curl -k https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-50767/49080/code-format.patch | patch -p1
  You can also run scram build code-format to apply code format directly

[cmsbuild]

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-50767/49081

[cmsbuild]

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

It involves the following packages:

• Configuration/Eras (operations)
• Configuration/ProcessModifiers (operations)
• DQM/CSCMonitorModule (dqm)
• DQM/HLTEvF (dqm, hlt)
• DQM/Integration (dqm)
• DQMOffline/HLTScouting (dqm)
• DQMServices/FwkIO (dqm)
• DQMServices/StreamerIO (dqm)
• DataFormats/ForwardDetId (simulation)
• DataFormats/L1TParticleFlow (l1)
• DataFormats/ParticleFlowReco (reconstruction)
• EventFilter/CSCRawToDigi (reconstruction)
• FWCore/Framework (core)
• FWCore/Integration (core)
• FWCore/Modules (core)
• FWCore/Sources (core)
• FWIO/RNTupleTempInput (core)
• Geometry/HGCalCommonData (geometry)
• Geometry/HGCalGeometry (geometry)
• HLTrigger/Configuration (hlt)
• HLTrigger/Egamma (hlt)
• HLTriggerOffline/Common (dqm)
• HLTriggerOffline/Scouting (dqm)
• IOPool/Input (core)
• L1Trigger/Phase2L1ParticleFlow (l1)
• PhysicsTools/NanoAOD (xpog)
• RecoHGCal/TICL (reconstruction)
• RecoLocalCalo/HcalRecProducers (reconstruction)
• SimCalorimetry/HGCalAssociatorProducers (simulation)
• SimG4CMS/Calo (simulation)
• Utilities/ReleaseScripts (core)
• Validation/Configuration (dqm, simulation)
• Validation/HGCalValidation (dqm)

@BenjaminRS, @Dr15Jones, @Martin-Grunewald, @Moanwar, @battibass, @bsunanda, @civanch, @cmsbuild, @ctarricone, @davidlange6, @fabiocos, @ftenchini, @ftorrresd, @gabrielmscampos, @jfernan2, @kpedro88, @makortel, @mandrenguyen, @mdhildreth, @mmusich, @nothingface0, @quinnanm, @rseidita, @smuzaffar, @srimanob can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @ReyerBand, @SohamBhattacharya, @VourMa, @abdoulline, @apsallid, @barvic, @batinkov, @bsunanda, @cseez, @denizsun, @fabiocos, @felicepantaleo, @forthommel, @francescobrivio, @gpetruc, @hatakeyamak, @lecriste, @lgray, @makortel, @mariadalfonso, @martinamalberti, @missirol, @mmusich, @mtosi, @pfs, @ptcox, @rociovilar, @rovere, @salimcerci, @sameasy, @sethzenz, @slomeo, @sobhatta, @thomreis, @threus, @vandreev11, @wang0jin, @wddgit 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: UnitTests RelVals
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-12b2ae/52775/summary.html
COMMIT: e493203
CMSSW: CMSSW_17_0_EVOLUTION_X_2026-04-17-2300/el8_amd64_gcc13
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/50767/52775/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:

• @makortel Account for possible io_vN namespace in dictionary package checks. #50732
• @arizzi Add NANOGENMinimal, i.e. NANOGEN as in "same GEN content of NANOAOD" #50720
• @jsamudio Remove extra modules in MDPF HLT customization #50723
• @makortel Add missing dictionary to RecoEgamma/EgammaTools/src/classes_def.xml #50739
• @Dr15Jones [EVO] Fix merge conflict 2026/04/17 #50751
• @Dr15Jones Rewrote statemachine test using catch2 #50708
• @AuroraPerego Move ConversionTrack.h to RecoEgamma/EgammaTools to avoid FWLite build errors #50694
• @bsunanda Phase20hgx366 Bug fix to get the correct DetId for the scinitllator part in HGCal (for v17/v18/v19) #50726
• @saumyaphor4252 Fix for Phase2 HLT Egamma trigger inefficiency dip #50714
• @bfonta TICL-barrel validation @ HLT #50588
• @tcuisset Fix clang build errors due to #define accidentally removed #50701
• @sakura-ngt HLT Scouting DQM: add monitoring of scouting track properties and other optimizations #50715
• @Dr15Jones Avoid type conversion in InputSource::ItemTypeInfo #50749
• @hjbossi Enable RPD reconstruction for 2025 and 2026 heavy-ion data #50063
• @cerminar Phase-2 L1T: Update correlator emulator chain #50174
• @sakura-ngt DQM/Integration: Make HLT PB and NGT client tag configurable via command line options #50643
• @barvic CMSSW_17_0_X - Unpacking support for CSC Run3-b OTMB LCT ME11-GEM data format changes #50745
• @Parsifal-2045 Improve handling of missing/invalid inputs in TrackingAssocValueMapsProducer #50730

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

Failed Unit Tests

I found 2 errors in the following unit tests:

---> test TestFWCoreIntegrationStandalone had ERRORS
---> test TestIOPoolCommonTP had ERRORS

Failed RelVals

ValueError: Undefined workflows: 10224.0, 250202.181, 25202.0

[Dr15Jones]

ignore tests-rejected with ib-failure

The unit test failures are because of the ConversionTrack issue in the master.

[Dr15Jones]

@smuzaffar this looks good to go to me.

[smuzaffar]

Lets get this in evo ibs

[jfernan2]

+1
For the records