-
Notifications
You must be signed in to change notification settings - Fork 54
Update reco2_data.fcl #731
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
kjplows
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Matches sbndcode/#694:reco2_data.fcl:physics.reco2 - huge huge thanks @henrylay97 !
|
trigger build LArSoft/lar*@LARSOFT_SUITE_v10_05_00 SBNSoftware/sbncode#533 |
|
@kjplows Merged in some other stuff which have merge conflict. Can you resolve this? |
|
✔️ CI build for LArSoft Succeeded on slf7 for e26:prof -- details available through the CI dashboard |
|
✔️ CI build for LArSoft Succeeded on slf7 for c14:prof -- details available through the CI dashboard |
|
Yep we need the CRT track and space point matching, I see |
|
❌ 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 |
|
trigger build LArSoft/lar*@LARSOFT_SUITE_v10_05_00 SBNSoftware/sbncode#533 |
|
🚨 For more details about the warning phase, check the ci_tests SBND phase logs parent CI build details are available through the CI dashboard |
|
✔️ CI build for LArSoft Succeeded on slf7 for c14:prof -- details available through the CI dashboard |
|
✔️ CI build for LArSoft Succeeded on slf7 for e26: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 |
|
🚨 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 |
|
@henrylay97 Can you reserve these merge conflicts? |
|
Fixed merge conflict since it was simple |
|
Thanks @nathanielerowe - conflict resolution looks good to me! |
Description
This got incorrectly removed during a merge develop commit in #682 - another age old reminder to be really careful with merge conflicts!!
Note the difference in the diff for the
reco2_data.fclfile between:https://github.com/SBNSoftware/sbndcode/pull/682/files/b04973509f6356ac9e872ccde95ff543c899a389 (first 4 commits)
and
https://github.com/SBNSoftware/sbndcode/pull/682/files (once the develop merge has been applied)
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?