Skip to content
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

Fix conjoin workspaces bug ornl next #38685

Merged
merged 6 commits into from
Jan 27, 2025

Conversation

walshmm
Copy link
Contributor

@walshmm walshmm commented Jan 23, 2025

ornl-next version of #38619 and #38478

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

  • Is the code of an acceptable quality?
  • Does the code conform to the coding standards?
  • Are the unit tests small and test the class in isolation?
  • If there is GUI work does it follow the GUI standards?
  • If there are changes in the release notes then do they describe the changes appropriately?
  • Do the release notes conform to the release notes guide?

Functional Tests

  • Do changes function as described? Add comments below that describe the tests performed?
  • Do the changes handle unexpected situations, e.g. bad input?
  • Has the relevant (user and developer) documentation been added/updated?

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.

@walshmm walshmm added ORNL Team Issues and pull requests managed by the ORNL development team ornl-next A copy of a branch into the ornl-next fork labels Jan 23, 2025
@walshmm
Copy link
Contributor Author

walshmm commented Jan 23, 2025

err I seemed to have pulled too many commits in my cherry-pick...

RabiyaF and others added 6 commits January 23, 2025 16:00
* Added check to match bins before conjoining

* Added the optional boolean argument to ConjoinWorkspaces

* Fixed some of the failing python interface tests

* Updated the documentation for ConjoinWorkspaces

* Fixed the qt tests

* Fixed tests for RunDescriptor.py

* Fixed the conjoin workspaces c++  tests

* Added a new test to verify error msg when bins don't match

* Updated some files to fix system test failures

* Updated SANSDarkRunSubtractionTest.py

* Updated isis_reduction_steps.py

* Fixed the doc tests

* Updated Workspaces::matchingBins to accept shared_ptr

* Added release note

* Updated the release note to include algorithm link

* Updated docs and release note

Co-authored-by: Caila Finn <[email protected]>

---------

Co-authored-by: Caila Finn <[email protected]>
It doesn't make any sense and just confused me
The function does not compare sizes of workspaces,
so the comment was wrong.
@walshmm walshmm force-pushed the fix_conjoin_workspaces_bug_ornl_next branch from 095e703 to 2ff9bdb Compare January 23, 2025 21:00
@walshmm walshmm merged commit f0b92e8 into ornl-next Jan 27, 2025
10 checks passed
@walshmm walshmm deleted the fix_conjoin_workspaces_bug_ornl_next branch January 27, 2025 15:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ORNL Team Issues and pull requests managed by the ORNL development team ornl-next A copy of a branch into the ornl-next fork
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants