diff options
| author | Edoardo Pasca <edo.paskino@gmail.com> | 2018-04-19 23:24:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-19 23:24:08 +0200 |
| commit | 510cb3e98b30184beab96f908c6105df1e348030 (patch) | |
| tree | 4ac36b8644be7b340321b820f07ff390661a07c3 /Wrappers/Python/wip | |
| parent | e19a7eafb496fca9dbaa648451bb0cefac4b0662 (diff) | |
| parent | bf2da3ac3484a671815e95d7f4d622586301ba7d (diff) | |
| download | astra-wrapper-510cb3e98b30184beab96f908c6105df1e348030.tar.gz astra-wrapper-510cb3e98b30184beab96f908c6105df1e348030.tar.bz2 astra-wrapper-510cb3e98b30184beab96f908c6105df1e348030.tar.xz astra-wrapper-510cb3e98b30184beab96f908c6105df1e348030.zip | |
Merge pull request #1 from vais-ral/merge_modular
Merge modular
Diffstat (limited to 'Wrappers/Python/wip')
| -rwxr-xr-x | Wrappers/Python/wip/demo_sophiabeads.py | 4 | ||||
| -rwxr-xr-x | Wrappers/Python/wip/simple_demo_astra.py | 6 | ||||
| -rwxr-xr-x | Wrappers/Python/wip/simple_mc_demo.py | 6 |
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 |