BlockOperator direct and adjoint methods: can pass out as a DataContainer instead of a (1,1) BlockDataContainer where geometry permits #1926
Conversation
|
So in #1802 we changed BlockOperator direct (and adjoint) methods to return a DataContainer in the case it would previously return a (1,1) BlockDataContainer. We also changed the range (and domain) to output the required geometry in this case. In this PR we allow BlockOperator direct (and adjoint) methods to accept both a (1,1) BlockDataContainer or a DataContainer to The question is: should a BlockOperator always return a BlockDataContainer or are (1,1) BlockDataContainers an unnecessary wrapper and they should be DataContainers? In the first case, we should write an as_array() method for (1,1) BlockDataContainers to fix the original CIL-SIRF issue #1455 and probably leave this fix in. In the second case, we leave #1802 as it is and implement this fix. |
| if not isinstance(out, BlockDataContainer): | ||
| if 1 == shape[0] == shape[1]: | ||
| out = BlockDataContainer(out) | ||
| flag_return_data_container = True |
There was a problem hiding this comment.
Flag should be called something like "flag_single_block"
|
After discussion with Edo and Gemma we decided that this should go in but that we would still further investigate #1863 |
Description
Linked to #1863
Changes
Testing you performed
Related issues/links
Checklist
Contribution Notes
Please read and adhere to the developer guide and local patterns and conventions.