Skip to content

Conversation

@henrylay97
Copy link
Member

@henrylay97 henrylay97 commented Apr 25, 2025

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.fcl file 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

  • Added at least 1 label from available labels.
  • Assigned at least 1 reviewer under Reviewers,
  • Assigned all contributers including yourself under Assignees
  • Linked any relevant issues under Developement
  • Does this PR affect CAF data format? If so, please assign a CAF maintainer (PetrilloAtWork or JosiePaton) as additional reviewer.
  • Does this affect the standard workflow?

Relevant 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?

@henrylay97 henrylay97 added bug Something isn't working crt Cosmic Ray Tagger reco1/reco2 Reconstruction labels Apr 25, 2025
@henrylay97 henrylay97 requested a review from kjplows April 25, 2025 09:17
@henrylay97 henrylay97 self-assigned this Apr 25, 2025
@kjplows kjplows moved this to Open pull requests in SBN software development Apr 25, 2025
Copy link
Contributor

@kjplows kjplows left a 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 !

@nathanielerowe
Copy link
Contributor

trigger build LArSoft/lar*@LARSOFT_SUITE_v10_05_00 SBNSoftware/sbncode#533

@nathanielerowe
Copy link
Contributor

@kjplows Merged in some other stuff which have merge conflict. Can you resolve this?

@FNALbuild
Copy link
Collaborator

✔️ CI build for LArSoft Succeeded on slf7 for e26:prof -- details available through the CI dashboard

@FNALbuild
Copy link
Collaborator

✔️ CI build for LArSoft Succeeded on slf7 for c14:prof -- details available through the CI dashboard

@kjplows
Copy link
Contributor

kjplows commented Apr 25, 2025

Yep we need the CRT track and space point matching, I see tpcpmtbarycentermatching which I'm leaving in (if it was in develop we should keep it there)
Resolved.

@FNALbuild
Copy link
Collaborator

❌ 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

@nathanielerowe
Copy link
Contributor

trigger build LArSoft/lar*@LARSOFT_SUITE_v10_05_00 SBNSoftware/sbncode#533

@FNALbuild
Copy link
Collaborator

⚠️ CI build for SBND Warning at phase ci_tests SBND 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

@FNALbuild
Copy link
Collaborator

✔️ CI build for LArSoft Succeeded on slf7 for c14:prof -- details available through the CI dashboard

@FNALbuild
Copy link
Collaborator

✔️ CI build for LArSoft Succeeded on slf7 for e26:prof -- details available through the CI dashboard

@FNALbuild
Copy link
Collaborator

❌ 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

@FNALbuild
Copy link
Collaborator

⚠️ CI build for SBND Warning at phase ci_tests SBND 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

@kjplows kjplows moved this from Open pull requests to Urgent checks in SBN software development Apr 25, 2025
@nathanielerowe
Copy link
Contributor

Approved

@nathanielerowe
Copy link
Contributor

@henrylay97 Can you reserve these merge conflicts?

@nathanielerowe
Copy link
Contributor

Fixed merge conflict since it was simple

@nathanielerowe nathanielerowe merged commit 86884db into develop Apr 29, 2025
@github-project-automation github-project-automation bot moved this from Urgent checks to Done in SBN software development Apr 29, 2025
@henrylay97
Copy link
Member Author

Thanks @nathanielerowe - conflict resolution looks good to me!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working crt Cosmic Ray Tagger reco1/reco2 Reconstruction

Projects

Status: Done
Status: Todo

Development

Successfully merging this pull request may close these issues.

5 participants