summaryrefslogtreecommitdiffstats
path: root/Wrappers
diff options
context:
space:
mode:
Diffstat (limited to 'Wrappers')
-rw-r--r--Wrappers/Python/wip/simple_demo.py19
-rwxr-xr-xWrappers/Python/wip/simple_mc_demo.py15
2 files changed, 13 insertions, 21 deletions
diff --git a/Wrappers/Python/wip/simple_demo.py b/Wrappers/Python/wip/simple_demo.py
index de2cc99..7c5f43e 100644
--- a/Wrappers/Python/wip/simple_demo.py
+++ b/Wrappers/Python/wip/simple_demo.py
@@ -1,14 +1,11 @@
-
-import sys
-
-sys.path.append("..")
-
-from ccpi.framework import *
-from ccpi.reconstruction.algs import *
-from ccpi.reconstruction.funcs import *
-from ccpi.reconstruction.ops import *
-from ccpi.reconstruction.astra_ops import *
-from ccpi.reconstruction.geoms import *
+#import sys
+#sys.path.append("..")
+
+from ccpi.framework import VolumeData
+from ccpi.reconstruction.algs import FISTA
+from ccpi.reconstruction.funcs import Norm2sq, Norm1
+from ccpi.reconstruction.astra_ops import AstraProjectorSimple
+from ccpi.reconstruction.geoms import VolumeGeometry, SinogramGeometry
import numpy as np
import matplotlib.pyplot as plt
diff --git a/Wrappers/Python/wip/simple_mc_demo.py b/Wrappers/Python/wip/simple_mc_demo.py
index beec717..0d976d7 100755
--- a/Wrappers/Python/wip/simple_mc_demo.py
+++ b/Wrappers/Python/wip/simple_mc_demo.py
@@ -1,14 +1,10 @@
-
-
-import sys
-
-sys.path.append("..")
+#import sys
+#sys.path.append("..")
from ccpi.framework import VolumeData, SinogramData
-from ccpi.reconstruction.algs import *
-from ccpi.reconstruction.funcs import *
-from ccpi.reconstruction.ops import *
-from ccpi.reconstruction.astra_ops import *
+from ccpi.reconstruction.algs import FISTA
+from ccpi.reconstruction.funcs import Norm2sq, Norm1
+from ccpi.reconstruction.astra_ops import AstraProjectorMC
from ccpi.reconstruction.geoms import VolumeGeometry, SinogramGeometry
import numpy
@@ -89,7 +85,6 @@ elif test_case==2:
channels=numchannels)
# ASTRA operator using volume and sinogram geometries
-print("create Projector")
Aop = AstraProjectorMC(vg, pg, 'cpu')