Skip to content

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

Merged
MargaretDuff merged 7 commits into
TomographicImaging:masterfrom
MargaretDuff:blockdatacontainers-with-11-shape
May 13, 2024
Merged

Direct method of BlockOperator returns a single DataContainer if the output shape is (1,1)#1802
MargaretDuff merged 7 commits into
TomographicImaging:masterfrom
MargaretDuff:blockdatacontainers-with-11-shape

Conversation

@MargaretDuff

@MargaretDuff MargaretDuff commented May 9, 2024

Copy link
Copy Markdown
Member

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 requested a review from samdporter May 10, 2024 10:21
@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
@MargaretDuff
MargaretDuff requested a review from casperdcl May 10, 2024 10:26

@paskino paskino left a comment

Copy link
Copy Markdown
Contributor

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 <[email protected]>

@samdporter samdporter left a comment

Copy link
Copy Markdown
Contributor

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()

Comment thread Wrappers/Python/cil/optimisation/operators/BlockOperator.py Outdated
@MargaretDuff
MargaretDuff merged commit 43ec610 into TomographicImaging:master May 13, 2024
@MargaretDuff
MargaretDuff deleted the blockdatacontainers-with-11-shape branch May 13, 2024 10:30
@MargaretDuff

Copy link
Copy Markdown
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