diff options
author | Jakob Jorgensen, WS at HMXIF <jakob.jorgensen@manchester.ac.uk> | 2019-04-16 16:17:12 +0100 |
---|---|---|
committer | Jakob Jorgensen, WS at HMXIF <jakob.jorgensen@manchester.ac.uk> | 2019-04-16 16:17:12 +0100 |
commit | 490aedb50630a162b7914e27917c074c10bada8e (patch) | |
tree | efc604c009a1eb877b6892470c904bb4580cc36f | |
parent | 162129a93b0a1d42cff1c1c44f1ce01e67e3b1fe (diff) | |
download | framework-490aedb50630a162b7914e27917c074c10bada8e.tar.gz framework-490aedb50630a162b7914e27917c074c10bada8e.tar.bz2 framework-490aedb50630a162b7914e27917c074c10bada8e.tar.xz framework-490aedb50630a162b7914e27917c074c10bada8e.zip |
bugfixes, whitespace
-rw-r--r-- | Wrappers/Python/ccpi/optimisation/algorithms/SIRT.py | 8 | ||||
-rw-r--r-- | Wrappers/Python/wip/demo_test_sirt.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Wrappers/Python/ccpi/optimisation/algorithms/SIRT.py b/Wrappers/Python/ccpi/optimisation/algorithms/SIRT.py index 389ec99..9fc3b8e 100644 --- a/Wrappers/Python/ccpi/optimisation/algorithms/SIRT.py +++ b/Wrappers/Python/ccpi/optimisation/algorithms/SIRT.py @@ -28,15 +28,15 @@ Created on Thu Feb 21 11:11:23 2019 @author: ofn77899 """ - from ccpi.optimisation.algorithms import Algorithm +from ccpi.optimisation.algorithms import Algorithm from ccpi.framework import ImageData, AcquisitionData #from collections.abc import Iterable class SIRT(Algorithm): - '''Simultaneous Iterative Reconstruction Technique - Parameters: - x_init: initial guess + '''Simultaneous Iterative Reconstruction Technique + Parameters: + x_init: initial guess operator: operator for forward/backward projections data: data to operate on constraint: Function with prox-method, for example IndicatorBox to diff --git a/Wrappers/Python/wip/demo_test_sirt.py b/Wrappers/Python/wip/demo_test_sirt.py index c7a3c76..d3f27cf 100644 --- a/Wrappers/Python/wip/demo_test_sirt.py +++ b/Wrappers/Python/wip/demo_test_sirt.py @@ -5,7 +5,7 @@ from ccpi.framework import ImageData, ImageGeometry, AcquisitionGeometry, \ AcquisitionData from ccpi.optimisation.algs import FISTA, FBPD, CGLS, SIRT -from ccpi.optimisation.funcs import Norm2sq, Norm1, TV2D, IndicatorBox +from ccpi.optimisation.funcs import Norm2sq, Norm1, IndicatorBox from ccpi.astra.ops import AstraProjectorSimple from ccpi.optimisation.algorithms import CGLS as CGLSALG |