Fixed sirf.Reg.ImageData.asarray().

[evgueni-ovtchinnikov]

Changes in this pull request

Testing performed

Tested by sirf.Utilities.data_container_algebra_tests.

Related issues

Fixes #1375

Checklist before requesting a review

• I have performed a self-review of my code
• I have added docstrings/doxygen in line with the guidance in the developer guide
• I have implemented unit tests that cover any new or modified functionality
• The code builds and runs on my machine
• CHANGES.md has been updated with any functionality change

Contribution Notes

Please read and adhere to the contribution guidelines.

Please tick the following:

• The content of this Pull Request (the Contribution) is intentionally submitted for inclusion in SIRF (the Work) under the terms and conditions of the Apache-2.0 License.

[KrisThielemans]

Need to say something about the Reg fix in CHANGES.md.

As the new functionality actually tested? As I don't think it's correct.

Also, in #1373 I suggested to duplicate tests with as_array() and asarray(), but maybe that isn't necessary.

Final comment, this is currently on top of #1373. Are we abandoning that one? The history here is rather awful, but a squash merge if the Reg fix and the algebra fix seems rather weird. Would then need some rebasing. Alternatively, we squash merge #1373 first, and then merge master here etc. No easy solutions... @casperdcl, we'll need your help I think.

[evgueni-ovtchinnikov]

@KrisThielemans To clean up the history, I suggest we merge #1373 before #1376.

[KrisThielemans]

ok, this is now a very small PR. Great! Once ready, please use squash-merge.

Question: is the output of the old as_array() and new asarray() (and presumably therefore new as_array(), as you're testing that) the same? (i.e. do they use the same order). I guess so, as you haven't touched Reg.ImageData.as_array(), which is currently

SIRF/src/Registration/pReg/Reg.py

Line 372 in 24483dc

array = numpy.ndarray(dim, dtype=numpy.float32, order='F')

We cannot change that, as otherwise, we'll get into trouble with the registration tools and geometry.

This does explain some choices that Richard made in the geometric info code (which don't work for STIR, but that's another PR)

[evgueni-ovtchinnikov]

yes, as_array returns the same data as asarray

@KrisThielemans please approve, I cannot merge until you approve

[KrisThielemans]

All fine, except that CHANGES.md was based on an old version, so you lost some lines.