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

Direct method of BlockOperator returns a single DataContainer if the output shape is (1,1) #1802

Conversation

MargaretDuff
Copy link
Member

@MargaretDuff MargaretDuff commented May 9, 2024

Changes

See #1455

Testing you performed

Please add any demo scripts to https://github.com/TomographicImaging/CIL-Demos/tree/main/misc

Related issues/links

Fixes #1455

Checklist

  • I have performed a self-review of my code
  • I have added docstrings in line with the guidance in the developer guide
  • I have updated the relevant documentation
  • I have implemented unit tests that cover any new or modified functionality
  • CHANGELOG.md has been updated with any functionality change
  • Request review from all relevant developers
  • Change pull request label to 'Waiting for review'

Contribution Notes

Please read and adhere to the developer guide and local patterns and conventions.

  • The content of this Pull Request (the Contribution) is intentionally submitted for inclusion in CIL (the Work) under the terms and conditions of the Apache-2.0 License
  • I confirm that the contribution does not violate any intellectual property rights of third parties

--->

@MargaretDuff MargaretDuff requested a review from paskino May 9, 2024 15:48
@MargaretDuff MargaretDuff marked this pull request as draft May 9, 2024 16:08
@MargaretDuff MargaretDuff self-assigned this May 10, 2024
@MargaretDuff MargaretDuff marked this pull request as ready for review May 10, 2024 10:24
@MargaretDuff MargaretDuff added Waiting for review bug Something isn't working and removed Work In Progress labels May 10, 2024
Copy link
Contributor

@paskino paskino left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add to the CHANGELOG

- Bugfix:
  - BlockOperator that would return a BlockDataContainer of shape (1,1) now return the appropriate DataContainer. BlockDataContainer direct and adjoint methods accept DataContainer as parameter x.

Signed-off-by: Margaret Duff <43645617+MargaretDuff@users.noreply.github.com>
Copy link
Contributor

@samdporter samdporter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The direct method looks good but in PR #1766 the range and domain geometries also returned a regular DataContainer if necessary. This would also be nice otherwise the range_geometry may be different to the geometry of the object returned by direct()

MargaretDuff and others added 3 commits May 13, 2024 09:33
Co-authored-by: Casper da Costa-Luis <casper.dcl@physics.org>
Signed-off-by: Margaret Duff <43645617+MargaretDuff@users.noreply.github.com>
@MargaretDuff MargaretDuff merged commit 43ec610 into TomographicImaging:master May 13, 2024
8 checks passed
@MargaretDuff MargaretDuff deleted the blockdatacontainers-with-11-shape branch May 13, 2024 10:30
@MargaretDuff
Copy link
Member Author

image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working Waiting for review
Projects
No open projects
Archived in project
Development

Successfully merging this pull request may close these issues.

BlockDataContainers with (1,1) shape
4 participants