From 9820416333058515e97d79147c8423755233413a Mon Sep 17 00:00:00 2001 From: Edoardo Pasca <14138589+paskino@users.noreply.github.com> Date: Mon, 13 May 2024 21:33:58 +0100 Subject: [PATCH 1/2] sapyb to return even if out is not None With CIL https://github.com/TomographicImaging/CIL/pull/1742 `sapyb` returns even if the output is pre-allocated --- src/common/SIRF.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/SIRF.py b/src/common/SIRF.py index ef92a3718..25503ee0a 100644 --- a/src/common/SIRF.py +++ b/src/common/SIRF.py @@ -480,7 +480,7 @@ def sapyb(self, a, y, b, out=None, **kwargs): if out is None: check_status(z.handle) - return z + return z def power(self, other, out=None): '''Power function for DataContainers From 784cc8c0dc4df2c57aae6b7a4d23b7b5da73d6b0 Mon Sep 17 00:00:00 2001 From: Edoardo Pasca <14138589+paskino@users.noreply.github.com> Date: Tue, 14 May 2024 07:20:48 +0100 Subject: [PATCH 2/2] added to changelog [skip ci] --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index e543f7e4a..07d1ff224 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,6 +3,7 @@ ## vx.x.x * CMake/building: + - Python `sapyb` returns the output even if it is pre-allocated - add `DISABLE_Gadgetron_TOOLBOXES` option (defaults to `OFF`) to be able to cope with compilation problems with older Gadgetron versions.