summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakob Jorgensen <jakob.jorgensen@manchester.ac.uk>2018-03-08 23:30:48 +0000
committerJakob Jorgensen <jakob.jorgensen@manchester.ac.uk>2018-03-08 23:30:48 +0000
commit0178ae2bf4c84649a28e87ad20f33808ae6eebee (patch)
tree30a71ae7f979b4146b5e2f1ce908252e4711120f
parentb3d82b6bdb27d20b2d5e9a77009110e6cded5d83 (diff)
downloadframework-0178ae2bf4c84649a28e87ad20f33808ae6eebee.tar.gz
framework-0178ae2bf4c84649a28e87ad20f33808ae6eebee.tar.bz2
framework-0178ae2bf4c84649a28e87ad20f33808ae6eebee.tar.xz
framework-0178ae2bf4c84649a28e87ad20f33808ae6eebee.zip
Import also FBPD from algs, move tv demo to wip
-rw-r--r--Wrappers/Python/wip/simple_demo.py2
-rw-r--r--Wrappers/Python/wip/simple_demo_tv.py (renamed from Wrappers/Python/test/simple_demo_tv.py)0
2 files changed, 1 insertions, 1 deletions
diff --git a/Wrappers/Python/wip/simple_demo.py b/Wrappers/Python/wip/simple_demo.py
index 21796b8..da617c1 100644
--- a/Wrappers/Python/wip/simple_demo.py
+++ b/Wrappers/Python/wip/simple_demo.py
@@ -2,7 +2,7 @@
#sys.path.append("..")
from ccpi.framework import VolumeData
-from ccpi.reconstruction.algs import FISTA
+from ccpi.reconstruction.algs import *
from ccpi.reconstruction.funcs import Norm2sq, Norm1
from ccpi.reconstruction.astra_ops import AstraProjectorSimple
from ccpi.reconstruction.geoms import VolumeGeometry, SinogramGeometry
diff --git a/Wrappers/Python/test/simple_demo_tv.py b/Wrappers/Python/wip/simple_demo_tv.py
index 0ae550a..0ae550a 100644
--- a/Wrappers/Python/test/simple_demo_tv.py
+++ b/Wrappers/Python/wip/simple_demo_tv.py