Conversation
|
@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
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
…istent state of PFParticles (-1 track scores).
ee999f8 to
cc0cd3a
Compare
|
trigger build ci_ref=v10_14_02_03 LArSoft/lar*@LARSOFT_SUITE_v10_14_02_02 SBNSoftware/sbndaq-artdaq-core@v1_10_06 SBNSoftware/sbn*@SBN_SUITE_v10_14_02_03 |
|
✔️ CI build for LArSoft Succeeded on slf7 for c14:prof -- details available through the CI dashboard |
|
❌ CI build for SBND Failed at phase build SBND on slf7 for c14:prof -- details available through the CI dashboard 🚨 For more details about the failed phase, check the build SBND phase logs parent CI build details are available through the CI dashboard |
|
✔️ CI build for LArSoft Succeeded on slf7 for e26:prof -- details available through the CI dashboard |
|
🚨 For more details about the warning phase, check the ci_tests SBND phase logs parent CI build details are available through the CI dashboard |
|
Approved |
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?