Open
Conversation
AndyChappell
approved these changes
Feb 3, 2026
Member
|
@aliciavr @AndyChappell I took the liberty of fixing the merge conflict present in this branch (as the base was behind develop, specifically behind the revert PR from last night). Please take a look again at whether you are happy with this. The diff should now show the expected diff - the re-inclusion of the EDIT: Following offline conversations, its worth producing a clean branch without the merge commit necessary. |
henrylay97
requested changes
Feb 3, 2026
Member
henrylay97
left a comment
There was a problem hiding this comment.
We'll update this branch after the sim reco meeting to ensure a clean commit history
ydabburi
approved these changes
Feb 3, 2026
…istent state of PFParticles (-1 track scores).
ee999f8 to
cc0cd3a
Compare
henrylay97
approved these changes
Feb 3, 2026
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
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.
Reordering of the shower merging algorithm to avoid inconsistent state of PFParticles (-1 track scores).
Description
Please provide a detailed description of the changes this pull request introduces.
Checklist
Reviewers,AssigneesDevelopementRelevant PR links (optional)
Does this PR require merging another PR in a different repository (such as sbnanobj/sbnobj etc.)?
Link(s) to docdb describing changes (optional)
Is there a docdb describing the issue this solves or the feature added?