Skip to content

[EVO] Fixed merged conflict 2026/04/03#50657

Merged
smuzaffar merged 42 commits intocms-sw:CMSSW_16_1_EVOLUTION_Xfrom
Dr15Jones:evo_merge_4_3
Apr 3, 2026
Merged

[EVO] Fixed merged conflict 2026/04/03#50657
smuzaffar merged 42 commits intocms-sw:CMSSW_16_1_EVOLUTION_Xfrom
Dr15Jones:evo_merge_4_3

Conversation

@Dr15Jones
Copy link
Copy Markdown
Contributor

@Dr15Jones Dr15Jones commented Apr 3, 2026 •
edited
Loading

PR description:

Fixed a merge conflict that arose with master

PR validation:

Code compiles.

resolves cms-sw/framework-team#2134

drkovalskyi and others added 30 commits February 18, 2026 21:17
@drkovalskyi
first draft
7675b10
@drkovalskyi
first working version
0e55213
@drkovalskyi
Add HLTSCOUT to PAT to NANO support
d95908b
@drkovalskyi
Save scouting MET
fa59b31
@drkovalskyi
L1 object producers
b347931
@drkovalskyi
added rho producer
760a1d9
@drkovalskyi
pf candidate producer
c754247
@drkovalskyi
additional dependencies
8af34e0
@drkovalskyi
set isolation properly
03d3bc0
@drkovalskyi
moved convertion logic to the pat object contructors
d625d1b
@drkovalskyi
use standard collection names
b4e3278
@drkovalskyi
use standard collection names
041f7eb
@drkovalskyi
add missing config files
530219b
@drkovalskyi
fill missing information
ff23eb2
@drkovalskyi
added new muon type
9d15c7f
@drkovalskyi
added derived information from scouting muon
1a2c143
@drkovalskyi
fixed tests for 16_0_X
f5572e8
@drkovalskyi
added documentation
133f8ea
@drkovalskyi
Add scouting electron support to pat::Electron
1b09a9f 
  Add a constructor from Run3ScoutingElectron that populates kinematics,
  shower shapes, ID variables, track parameters, isolation, and ECAL
  crystal-level information. Scouting-derived quantities are stored as
  userFloats/userInts where GsfElectron members are not directly writable,
  and as dedicated private members for track and ECAL data.

  Provide universal accessors (trkEta, trkPhi, trkpMode, trketaMode,
  trkphiMode, trkqoverpModeError, seedId, nClusters, nCrystals) that
  dispatch to gsfTrack()/superCluster() for standard electrons and to
  the stored scouting values for scouting electrons, controlled by an
  isScoutingElectron() flag. Scouting-only quantities with no standard
  equivalent (energyMatrix, timingMatrix, detIds, rechitZeroSuppression)
  keep their scouting-prefixed accessors.
Add scouting photon support to pat::Photon
d111409 
Add a constructor from Run3ScoutingPhoton that populates kinematics,
shower shapes, energy variables, and isolation. Scouting-derived
quantities are stored as userFloats where reco::Photon members are not
directly writable, and as dedicated private members for ECAL crystal
data.

Provide universal accessors (seedId, nClusters, nCrystals) that
dispatch to superCluster() for standard photons and to stored scouting
values for scouting photons, controlled by an isScoutingPhoton() flag.
Scouting-only quantities with no standard equivalent (energyMatrix,
timingMatrix, detIds, rechitZeroSuppression) keep their scouting-
prefixed accessors.
@drkovalskyi
Added support for jet constituents. Not very useful for Run2024 data,…
a8e7c9a 
… since scouting jets don't have constituent indices filled. Still can be useful in the future.
@drkovalskyi
unify inner track hitpattern information acccess
6a788e1
@drkovalskyi
Added off-diagonal covariance terms (xyCov, xzCov, yzCov) to makeReco…
e6bfba6 
…Vertex
@drkovalskyi
added hit pattern information to the reco::Track collection and used …
1aeb044 
…it to fill PackedCandidate tracking info
@drkovalskyi
added hit pattern information to the reco::Track collection and used …
59fd069 
…it to fill PackedCandidate tracking info
@drkovalskyi
bumped up version for Electron, Muon and Photon
8ff4cca
@drkovalskyi
fixed test
e829eee
@drkovalskyi
code-format
2c78dbd
@drkovalskyi
added slimmedMuonsNoVtx
5f52241
@drkovalskyi
added dimuon vertex collections
f40b6ca
cmsbuild and others added 4 commits April 2, 2026 22:58
@cmsbuild
Merge pull request cms-sw#50634 from smuzaffar/TestIOPoolInputNoParen…
9cc962b 
…tDictionary-fix

TestObjects: Added missing dependency to fix the failing unit test
@cmsbuild
Merge pull request cms-sw#50640 from smuzaffar/sa-ignore-system-header
6f7af94 
SA: Ignore system header in FunctionChecker
@cmsbuild
Merge pull request cms-sw#50645 from Dr15Jones/fixExternalGeneratorFi…
23481cb 
…lter

Fix ExternalGeneratorFilter calling endLumiProduce twice
@Dr15Jones
Merge CMSSW_16_1_X into CMSSW_16_1_EVOLUTION_X.
68b3dd1
@Dr15Jones
Copy link
Copy Markdown
Contributor Author

Dr15Jones commented Apr 3, 2026

type evo

@Dr15Jones Dr15Jones mentioned this pull request Apr 3, 2026
Open
@cmsbuild
Copy link
Copy Markdown
Contributor

cmsbuild commented Apr 3, 2026 •
edited
Loading

cms-bot internal usage

@Dr15Jones
Copy link
Copy Markdown
Contributor Author

Dr15Jones commented Apr 3, 2026

please test

@smuzaffar
Copy link
Copy Markdown
Contributor

smuzaffar commented Apr 3, 2026

please build

thanks @Dr15Jones for taking care of it

@cmsbuild
Copy link
Copy Markdown
Contributor

cmsbuild commented Apr 3, 2026

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-50657/48863

@cmsbuild
Copy link
Copy Markdown
Contributor

cmsbuild commented Apr 3, 2026

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

It involves the following packages:

  • Configuration/Applications (operations)
  • DataFormats/MuonReco (reconstruction)
  • DataFormats/PatCandidates (reconstruction, xpog)
  • DataFormats/TestObjects (core)
  • GeneratorInterface/Core (generators)
  • PhysicsTools/PatFromScouting (xpog)
  • Utilities/StaticAnalyzers (core)

@Dr15Jones, @Moanwar, @battibass, @davidlange6, @fabiocos, @ftenchini, @ftorrresd, @jfernan2, @lviliani, @makortel, @mandrenguyen, @mkirsano, @sensrcn, @smuzaffar, @srimanob, @theofil can you please review it and eventually sign? Thanks.
@24LopezR, @CeliaFernandez, @Fedespring, @HuguesBrun, @Martin-Grunewald, @abbiendi, @alberto-sanchez, @amagitte, @battibass, @cericeci, @fabiocos, @fsimone91, @gouskos, @gpetruc, @hatakeyamak, @jhgoh, @llunerti, @makortel, @missirol, @mkirsano, @mmusich, @rovere, @trocino, @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

@cmsbuild
Copy link
Copy Markdown
Contributor

cmsbuild commented Apr 3, 2026

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-6ff239/52464/summary.html
COMMIT: 68b3dd1
CMSSW: CMSSW_16_1_EVOLUTION_X_2026-03-30-2300/el8_amd64_gcc13
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/50657/52464/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-6ff239/52464/git-recent-commits.json
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-6ff239/52464/git-merge-result

@smuzaffar
Copy link
Copy Markdown
Contributor

smuzaffar commented Apr 3, 2026

looks good, merging this for EVO branch as this PR is just to resolve the merge conflicts which bot was not able to resolve automatically

@smuzaffar smuzaffar merged commit 77346ac into cms-sw:CMSSW_16_1_EVOLUTION_X Apr 3, 2026
7 of 8 checks passed
@Dr15Jones Dr15Jones deleted the evo_merge_4_3 branch April 7, 2026 13:25
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

changes-dataformats code-checks-approved core-pending evolution generators-pending operations-pending orp-pending pending-signatures reconstruction-pending tests-started xpog-pending

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@Dr15Jones @cmsbuild @smuzaffar @drkovalskyi @mbluj