Skip to content

[EVO] fix merge conflicts 2026/04/30#50838

Merged
cmsbuild merged 70 commits intocms-sw:CMSSW_17_0_EVOLUTION_Xfrom
Dr15Jones:evo_merge_2026_04_30
Apr 30, 2026
Merged

[EVO] fix merge conflicts 2026/04/30#50838
cmsbuild merged 70 commits intocms-sw:CMSSW_17_0_EVOLUTION_Xfrom
Dr15Jones:evo_merge_2026_04_30

Conversation

@Dr15Jones
Copy link
Copy Markdown
Contributor

@Dr15Jones Dr15Jones commented Apr 30, 2026 •
edited
Loading

PR description:

Fix merge conflict with master

PR validation:

git doesn't complain.

resolves cms-sw/framework-team#2195

brandiskip and others added 30 commits November 13, 2025 20:17
@brandiskip
Add Phase2 OT efficiency client to standalone harvesting sequence
e7b2f37
@brandiskip
use DQMGenericClient for Phase2OT track efficiencies; drop manual code
1c9bd03
@brandiskip
added helper functions for booking histograms
5cdca81
@brandiskip
code using DQMGenericClient for Phase2OT track efficiencies
378849f
@brandiskip
reduced many lines of code by use of helper functions
405d956
@brandiskip
fixed error causing compile issues
290ca3a
@brandiskip
got rid of unnecessary helper function calls and added histograms del…
18190eb 
…eted in error
@brandiskip
got rid of unnecessary helper functions
ccc774f
@brandiskip
added code to calculate stub efficiencies
5571675
@brandiskip
removed Phase2OTHarvestStub.cc as efficiency calculations are now don…
bf2dc78 
…e in Phase2OTEffClient_cff.py
@brandiskip
add helper function for resolution hists
0f11897
@brandiskip
reduced several hundred lines of code by use of helper function
e21bd88
@brandiskip
add detailed hists to sub-folder and reduce range for deltaPhi hists
39e2092
@brandiskip
edit comments
f73480f
@brandiskip
add weights for stub efficiency hists
1c8648f
@brandiskip
add code to make number of stubs per event hist
4cf52e5
Including EXOnanoAODv1 custom constent
8901e72
@kerstinlovisa @makortel
Update PhysicsTools/NanoAOD/python/custom_displacedtau_cff.py
91ee1bc 
Co-authored-by: Matti Kortelainen <matti.kortelainen@cern.ch>
code-format correction
9953a84
@brandiskip
fix res_pt and res_eta axis labels
98e74f2
@brandiskip
Changed folder naming logic
5c58adf
@brandiskip
remove manual efficiency calculation
a8bc657
@brandiskip
remove Phase2OTHarvestStub as file as been removed
939b587
@brandiskip
Merged work_branch from repository brandiskip with cms-merge-topic
68a6558
Corrected for additional PR comments
e514f2b
code format
8263cc1
@brandiskip
ensure both num and den for efficiency hists have same selections
6391c87
@brandiskip
update geometry and sample
a07d05b
@brandiskip
add missing histograms for efficiency plots
cfc35b0
@brandiskip
Reduce code duplication in fillDescriptions
0dda3df
@Dr15Jones Dr15Jones force-pushed the evo_merge_2026_04_30 branch from 30edef7 to b5afe87 Compare April 30, 2026 15:32
@cmsbuild
Copy link
Copy Markdown
Contributor

cmsbuild commented Apr 30, 2026

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-50838/49187

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

@Dr15Jones Dr15Jones force-pushed the evo_merge_2026_04_30 branch from b5afe87 to 83dbac1 Compare April 30, 2026 15:36
@cmsbuild
Copy link
Copy Markdown
Contributor

cmsbuild commented Apr 30, 2026

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-50838/49188

@cmsbuild
Copy link
Copy Markdown
Contributor

cmsbuild commented Apr 30, 2026

New categories assigned: core

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

@cmsbuild
Copy link
Copy Markdown
Contributor

cmsbuild commented Apr 30, 2026

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

It involves the following packages:

  • Configuration/PyReleaseValidation (pdmv)
  • DQM/DTMonitorClient (dqm)
  • DQM/HLTEvF (dqm, hlt)
  • DQM/Integration (dqm)
  • DQM/SiTrackerPhase2 (dqm)
  • DQM/TrackingMonitorSource (dqm)
  • FastSimulation/Tracking (fastsim)
  • HeterogeneousCore/MPICore (heterogeneous)
  • PhysicsTools/NanoAOD (xpog)
  • RecoMTD/TimingIDTools (reconstruction)
  • RecoTracker/FinalTrackSelectors (reconstruction)
  • RecoTracker/IterativeTracking (reconstruction)
  • SimDataFormats/CaloAnalysis (simulation)
  • SimDataFormats/TrackingHit (simulation)
  • SimG4CMS/Forward (simulation)
  • SimG4Core/Application (simulation)
  • SimG4Core/Notification (simulation)
  • SimGeneral/CaloAnalysis (simulation)
  • SimGeneral/MixingModule (simulation)
  • Validation/MtdValidation (dqm)
  • Validation/SiTrackerPhase2V (dqm)

@AdrianoDee, @DickyChant, @Dr15Jones, @Martin-Grunewald, @Moanwar, @antoniovagnerini, @battibass, @civanch, @cmsbuild, @ctarricone, @ftorrresd, @fwyzard, @gabrielmscampos, @jfernan2, @kfjack, @kpedro88, @makortel, @mandrenguyen, @mdhildreth, @miquork, @mmusich, @nothingface0, @rseidita, @smuzaffar, @srimanob, @sroychow, @ssekmen can you please review it and eventually sign? Thanks.
@GiacomoSguazzoni, @Martin-Grunewald, @ReyerBand, @VinInn, @VourMa, @apsallid, @arossi83, @batinkov, @battibass, @bsunanda, @denizsun, @dgulhan, @elusian, @fabiocos, @felicepantaleo, @fioriNTU, @francescobrivio, @gpetruc, @idebruyn, @jandrea, @makortel, @martinamalberti, @matt-komm, @missirol, @mmasciov, @mmusich, @mtosi, @richa2710, @rovere, @salimcerci, @sbein, @slomeo, @sroychow, @thomreis, @threus, @wang0jin 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
Copy link
Copy Markdown
Contributor Author

Dr15Jones commented Apr 30, 2026

please test

@cmsbuild
Copy link
Copy Markdown
Contributor

cmsbuild commented Apr 30, 2026

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-9b842d/52985/summary.html
COMMIT: 83dbac1
CMSSW: CMSSW_17_0_EVOLUTION_X_2026-04-27-2300/el8_amd64_gcc13
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/50838/52985/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-9b842d/52985/git-recent-commits.json
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-9b842d/52985/git-merge-result

Comparison Summary

@makortel
Copy link
Copy Markdown
Contributor

makortel commented Apr 30, 2026

+core

@mandrenguyen
Copy link
Copy Markdown
Contributor

mandrenguyen commented Apr 30, 2026

merge

@cmsbuild cmsbuild merged commit 75fc18f into cms-sw:CMSSW_17_0_EVOLUTION_X Apr 30, 2026
9 checks passed
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 core-approved dqm-pending evolution fastsim-pending heterogeneous-pending hlt-pending orp-approved pdmv-pending pending-signatures reconstruction-pending simulation-pending tests-approved tracking trk xpog-pending

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.