-
Notifications
You must be signed in to change notification settings - Fork 126
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
Added check to match bins before conjoining workspaces. #38478
base: main
Are you sure you want to change the base?
Added check to match bins before conjoining workspaces. #38478
Conversation
d853779
to
0171fc1
Compare
32b166b
to
ddcdd8c
Compare
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.
A nice change, works without crash now.
You'll need to add a release note to docs/release/v6.12.0/Framework/Algorithms/Bugfixes/
in a file named after the issue number
ddcdd8c
to
d03e6c4
Compare
d03e6c4
to
2c81ae2
Compare
👋 Hi, @RabiyaF, Conflicts have been detected against the base branch. Please rebase your branch against the base branch. |
2c81ae2
to
fb7dc8d
Compare
Approved pending CI checks |
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.
Just had a few code/documentation notes before merging:
docs/source/release/6.12.0/Framework/Algorithms/Bugfixes/38090.rst
Outdated
Show resolved
Hide resolved
static bool matchingBins(const std::shared_ptr<const MatrixWorkspace> &ws1, | ||
const std::shared_ptr<const MatrixWorkspace> &ws2, const bool firstOnly = false); |
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.
Is there a reason that this file (and the associated .cpp
) was changed (and resulting in having to change a large number of other files) rather than just dereferencing the pointer in ConjoinWorkspaces.cpp
here?
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.
This update was mentioned by James on Slack discussions in ral-core for this PR. I think/presume this is a change that is being implemented in other refactors of the codebase and would need to be updated eventually. It was linked to work on this PR and seemed like an easy enough change to make. So, that is why these files were updated too.
Co-authored-by: Caila Finn <[email protected]>
e52c26c
to
f9b746d
Compare
I have rebased and addressed the comments. The tests will pass. Just a heads up, tomorrow will be my last working day before the code freeze. As this issue was linked to the next release milestone, let me know if any other changes are required. |
Description of work
Summary of work
Fixes #38090 .
Further detail of work
To test:
Manual Test
cd build
ninja
workbench
-> to launch workbenchRun Test
cd build
ninja AllTests
Reviewer
Please comment on the points listed below (full description).
Your comments will be used as part of the gatekeeper process, so please comment clearly on what you have checked during your review. If changes are made to the PR during the review process then your final comment will be the most important for gatekeepers. In this comment you should make it clear why any earlier review is still valid, or confirm that all requested changes have been addressed.
Code Review
Functional Tests
Does everything look good? Mark the review as Approve. A member of
@mantidproject/gatekeepers
will take care of it.Gatekeeper
If you need to request changes to a PR then please add a comment and set the review status to "Request changes". This will stop the PR from showing up in the list for other gatekeepers.