Skip to content

[EVO] fix merge conflict 2026/05/13#50933

Merged
smuzaffar merged 25 commits into
cms-sw:CMSSW_17_0_EVOLUTION_Xfrom
Dr15Jones:evo_merge_2026_05_13
May 13, 2026
Merged

[EVO] fix merge conflict 2026/05/13#50933
smuzaffar merged 25 commits into
cms-sw:CMSSW_17_0_EVOLUTION_Xfrom
Dr15Jones:evo_merge_2026_05_13

Conversation

@Dr15Jones
Copy link
Copy Markdown
Contributor

@Dr15Jones Dr15Jones commented May 13, 2026 •
edited
Loading

PR description:

Fix most recent merge conflict with master and EVOLUTION_X

PR validation:

git no longer complains.

resolves cms-sw/framework-team#2220

VourMa and others added 25 commits May 4, 2026 06:10
@VourMa
Remove redundant tracking modules
6aef925
@VourMa
Remove hltInitialStepSeedTracksLST
8618173
@VourMa
Implement removeOTRechits and sorting+filtering of hits when useProto…
05dc54b 
…TrackKinematics
@VourMa
Improvements for the LST output
64bf303 
- Add flags for tracking/seeding production

- Conditional creation of products

- Per-iteration heap allocations moved out of the loop

- Remove unnecessary OT hit loop + sort for pLS candidates
@smuzaffar
Code updates to use FastSim events as PileUp with FullSim Signal even…
591812c 
…ts through the MixingModule interface to be used during the Digitization step in different sub-systems
@smuzaffar
code related feedback from release managers implemented
9a0beda
@smuzaffar
reverting to std::set again in Muon/Calo Digitizers, removal/replacem…
37afc4c 
…ent of remaining couts
@smuzaffar
Added new parameter skipProductCheck in MixingModule. skipProductChec…
3c093b3 
…k is set to True for FastPU with FastSimPU modifier in python/mix_probFunction_25ns_PoissonOOTPU_cfi.py
@kpedro88 @smuzaffar
add hybrid pileup workflows
0495b4c
@kpedro88 @smuzaffar
include modifier in all subsequent steps
58d3d9b
@smuzaffar
Separate HcalTestNumbering flag for signal and PU which enables signa…
c06e81a 
…l from FullSim and PU frm FastSim
@smuzaffar
Code checks
d459d6a
@smuzaffar
Change back testnumbering in AddCaloSamplesAnalyzer.py
32b38d2
@kpedro88 @smuzaffar
handle multiple input tags in mixing for SimVertex and SimTrack
a36d037
@smuzaffar
dummy comment
49e53cb
@smuzaffar
code format change
db05dee
@smuzaffar
Bug fix in Ecal/Hcal digitizers; removed std::set which stored InputT…
c3eb443 
…ags for Signal/PileUp SimHit collection
@smuzaffar
Sync changes from FASTPU_X branch
4843866
@smuzaffar
Apply code format changes
6653004
@smuzaffar
fix compilation warning and debug build error
7be8e1b
@Dr15Jones
Check for HGCal cluster weight being NaN
fabe766
@cmsbuild
Merge pull request cms-sw#50920 from Dr15Jones/nanHGCalTry2
2e4c8ee 
Check for HGCal cluster weight being NaN
@cmsbuild
Merge pull request cms-sw#50886 from smuzaffar/sync-fastpu-changes
a8ffdd8 
Sync FASTPU_X changes in to main CMSSW
@cmsbuild
Merge pull request cms-sw#50819 from SegmentLinking/simplifyLSTInputO…
c7e5696 
…utput

Simplify LST input & output and some clean up of the HLT tracking-related sequence.
@Dr15Jones
Merge CMSSW_17_0_X into CMSSW_17_0_EVOLUTION_X.
b62f81f
@Dr15Jones
Copy link
Copy Markdown
Contributor Author

Dr15Jones commented May 13, 2026

please test

@Dr15Jones
Copy link
Copy Markdown
Contributor Author

Dr15Jones commented May 13, 2026

type evo

@cmsbuild
Copy link
Copy Markdown
Contributor

cmsbuild commented May 13, 2026 •
edited
Loading

cms-bot internal usage

@cmsbuild
Copy link
Copy Markdown
Contributor

cmsbuild commented May 13, 2026

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-50933/49332

@cmsbuild
Copy link
Copy Markdown
Contributor

cmsbuild commented May 13, 2026

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

It involves the following packages:

  • Configuration/ProcessModifiers (operations)
  • Configuration/PyReleaseValidation (pdmv)
  • HLTrigger/Configuration (hlt)
  • RecoLocalCalo/HGCalRecProducers (reconstruction)
  • RecoTracker/IterativeTracking (reconstruction)
  • RecoTracker/LST (reconstruction)
  • RecoTracker/TkSeedGenerator (reconstruction)
  • SimCalorimetry/EcalSimProducers (simulation)
  • SimCalorimetry/HcalSimProducers (simulation)
  • SimGeneral/MixingModule (simulation)
  • SimGeneral/TrackingAnalysis (simulation)
  • SimMuon/CSCDigitizer (simulation)
  • SimMuon/DTDigitizer (simulation)
  • SimMuon/GEMDigitizer (simulation)
  • SimMuon/RPCDigitizer (simulation)
  • SimTracker/SiPixelDigitizer (simulation)
  • SimTracker/SiStripDigitizer (simulation)

@AdrianoDee, @DickyChant, @Martin-Grunewald, @Moanwar, @antoniovagnerini, @civanch, @davidlange6, @fabiocos, @ftenchini, @jfernan2, @kfjack, @kpedro88, @mandrenguyen, @mdhildreth, @miquork, @mmusich, @srimanob, @sroychow can you please review it and eventually sign? Thanks.
@24LopezR, @CeliaFernandez, @Fedespring, @GiacomoSguazzoni, @HuguesBrun, @Martin-Grunewald, @ReyerBand, @SohamBhattacharya, @VinInn, @VourMa, @abbiendi, @abdoulline, @apsallid, @argiro, @bsunanda, @cericeci, @cseez, @denizsun, @dgulhan, @dkotlins, @echabert, @edjtscott, @elusian, @fabiocos, @felicepantaleo, @ferencek, @fsimone91, @giovanni-mocellin, @gpetruc, @hatakeyamak, @jhgoh, @jshlee, @lecriste, @lgray, @llunerti, @makortel, @mariadalfonso, @martinamalberti, @missirol, @mmasciov, @mmusich, @mroguljic, @mtosi, @pfs, @prolay, @ptcox, @rchatter, @robervalwalsh, @rovere, @salimcerci, @sameasy, @sethzenz, @slomeo, @thomreis, @threus, @trocino, @tsusa, @vandreev11, @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 Dr15Jones mentioned this pull request May 13, 2026
Open
@cmsbuild
Copy link
Copy Markdown
Contributor

cmsbuild commented May 13, 2026

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d49cdb/53238/summary.html
COMMIT: b62f81f
CMSSW: CMSSW_17_0_EVOLUTION_X_2026-05-11-2300/el8_amd64_gcc13
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/50933/53238/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:

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

Comparison Summary

@makortel
Copy link
Copy Markdown
Contributor

makortel commented May 13, 2026

+core

@smuzaffar
Copy link
Copy Markdown
Contributor

smuzaffar commented May 13, 2026

Lets get this in. This is just to resolve the merge conflicts which cmsbot/git itself was not able to resolve.

@smuzaffar smuzaffar merged commit 7801aed into cms-sw:CMSSW_17_0_EVOLUTION_X May 13, 2026
9 checks passed
@cmsbuild cmsbuild mentioned this pull request May 15, 2026
Merged
@Dr15Jones Dr15Jones deleted the evo_merge_2026_05_13 branch May 18, 2026 14:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

code-checks-approved evolution hlt-pending operations-approved orp-pending pdmv-pending pending-signatures reconstruction-pending simulation-pending tests-approved tracking trk

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@Dr15Jones @cmsbuild @makortel @smuzaffar @VourMa @kpedro88