summaryrefslogtreecommitdiffstats
path: root/Wrappers/Python/wip
diff options
context:
space:
mode:
authorEdoardo Pasca <edo.paskino@gmail.com>2018-04-03 15:43:54 +0100
committerEdoardo Pasca <edo.paskino@gmail.com>2018-04-03 15:43:54 +0100
commit2aa72d55525739d3a25a2477443eabb1e6b7a7c0 (patch)
treedfbb1dd575026b7c0e351dcfe949c16df5cf07d3 /Wrappers/Python/wip
parentd6f9bb8e7d9eae126c90d2cf74110ac53c859d37 (diff)
downloadastra-wrapper-2aa72d55525739d3a25a2477443eabb1e6b7a7c0.tar.gz
astra-wrapper-2aa72d55525739d3a25a2477443eabb1e6b7a7c0.tar.bz2
astra-wrapper-2aa72d55525739d3a25a2477443eabb1e6b7a7c0.tar.xz
astra-wrapper-2aa72d55525739d3a25a2477443eabb1e6b7a7c0.zip
renamed processors ops and utils
fixed examples
Diffstat (limited to 'Wrappers/Python/wip')
-rwxr-xr-xWrappers/Python/wip/demo_sophiabeads.py4
-rwxr-xr-xWrappers/Python/wip/simple_demo_astra.py6
-rwxr-xr-xWrappers/Python/wip/simple_mc_demo.py6
3 files changed, 8 insertions, 8 deletions
diff --git a/Wrappers/Python/wip/demo_sophiabeads.py b/Wrappers/Python/wip/demo_sophiabeads.py
index e3c7f3a..33ce9ec 100755
--- a/Wrappers/Python/wip/demo_sophiabeads.py
+++ b/Wrappers/Python/wip/demo_sophiabeads.py
@@ -3,8 +3,8 @@ from ccpi.io.reader import XTEKReader
import numpy as np
import matplotlib.pyplot as plt
from ccpi.framework import ImageGeometry, AcquisitionGeometry, AcquisitionData, ImageData
-from ccpi.astra.astra_ops import AstraProjectorSimple
-from ccpi.reconstruction.algs import CGLS
+from ccpi.astra.ops import AstraProjectorSimple
+from ccpi.optimisation.algs import CGLS
# Set up reader object and read the data
datareader = XTEKReader("C:/Users/mbbssjj2/Documents/SophiaBeads_256_averaged/SophiaBeads_256_averaged.xtekct")
diff --git a/Wrappers/Python/wip/simple_demo_astra.py b/Wrappers/Python/wip/simple_demo_astra.py
index 3365504..26f3ff4 100755
--- a/Wrappers/Python/wip/simple_demo_astra.py
+++ b/Wrappers/Python/wip/simple_demo_astra.py
@@ -2,9 +2,9 @@
#sys.path.append("..")
from ccpi.framework import ImageData , ImageGeometry, AcquisitionGeometry
-from ccpi.reconstruction.algs import FISTA, FBPD, CGLS
-from ccpi.reconstruction.funcs import Norm2sq, Norm1 , TV2D
-from ccpi.astra.astra_ops import AstraProjectorSimple
+from ccpi.optimisation.algs import FISTA, FBPD, CGLS
+from ccpi.optimisation.funcs import Norm2sq, Norm1 , TV2D
+from ccpi.astra.ops import AstraProjectorSimple
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 f77a678..7369d8f 100755
--- a/Wrappers/Python/wip/simple_mc_demo.py
+++ b/Wrappers/Python/wip/simple_mc_demo.py
@@ -2,9 +2,9 @@
#sys.path.append("..")
from ccpi.framework import ImageData, AcquisitionData, ImageGeometry, AcquisitionGeometry
-from ccpi.reconstruction.algs import FISTA
-from ccpi.reconstruction.funcs import Norm2sq, Norm1
-from ccpi.astra.astra_ops import AstraProjectorMC
+from ccpi.optimisation.algs import FISTA
+from ccpi.optimisation.funcs import Norm2sq, Norm1
+from ccpi.astra.ops import AstraProjectorMC
import numpy
import matplotlib.pyplot as plt