[EVO] Fix merge conflict 2026/04/17#50751
Merged
cmsbuild merged 15 commits intocms-sw:CMSSW_17_0_EVOLUTION_Xfrom Apr 19, 2026
Merged
[EVO] Fix merge conflict 2026/04/17#50751cmsbuild merged 15 commits intocms-sw:CMSSW_17_0_EVOLUTION_Xfrom
cmsbuild merged 15 commits intocms-sw:CMSSW_17_0_EVOLUTION_Xfrom
Conversation
…ded to compile with clang
- removed old comparison files
Rewrote statemachine test using catch2
Move `ConversionTrack.h` to `RecoEgamma/EgammaTools` to avoid `FWLite` build errors
Remove extra modules in MDPF HLT customization
Add missing dictionary to RecoEgamma/EgammaTools/src/classes_def.xml
Add NANOGENMinimal, i.e. NANOGEN as in "same GEN content of NANOAOD"
Fix clang build errors due to #define accidentally removed
Contributor
Author
|
please test |
Contributor
|
cms-bot internal usage |
Contributor
|
+code-checks Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-50751/49045 |
Contributor
|
ignore tests-rejected with manual-override |
Contributor
|
+1 |
cmsbuild
added
fastsim-approved
simulation-approved
and removed
simulation-pending
fastsim-pending
labels
Contributor
Author
|
Type evo |
Contributor
|
+hlt |
Contributor
|
+xpog |
Contributor
|
+1 |
cmsbuild
added
reconstruction-approved
fully-signed
orp-approved
and removed
reconstruction-pending
pending-signatures
orp-pending
labels
Contributor
|
This pull request is fully signed and it will be integrated in one of the next CMSSW_17_0_EVOLUTION_X IBs (test failures were overridden) and once validation in the development release cycle CMSSW_17_0_X is complete. This pull request will be automatically merged. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR description:
Fix the conflict.
PR validation:
resolves cms-sw/framework-team#2166