diff options
| -rw-r--r-- | Wrappers/Python/ccpi/astra/astra_processors.py | 10 | ||||
| -rwxr-xr-x | Wrappers/Python/wip/simple_demo_astra.py | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Wrappers/Python/ccpi/astra/astra_processors.py b/Wrappers/Python/ccpi/astra/astra_processors.py index 3de43bf..fac4551 100644 --- a/Wrappers/Python/ccpi/astra/astra_processors.py +++ b/Wrappers/Python/ccpi/astra/astra_processors.py @@ -1,9 +1,9 @@ -from ccpi.framework import DataSetProcessor, ImageData, AcquisitionData +from ccpi.framework import DataProcessor, ImageData, AcquisitionData from ccpi.astra.astra_utils import convert_geometry_to_astra import astra -class AstraForwardProjector(DataSetProcessor): +class AstraForwardProjector(DataProcessor): '''AstraForwardProjector Forward project ImageData to AcquisitionData using ASTRA proj_id. @@ -25,7 +25,7 @@ class AstraForwardProjector(DataSetProcessor): 'device' : device } - #DataSetProcessor.__init__(self, **kwargs) + #DataProcessor.__init__(self, **kwargs) super(AstraForwardProjector, self).__init__(**kwargs) self.set_ImageGeometry(volume_geometry) @@ -77,7 +77,7 @@ class AstraForwardProjector(DataSetProcessor): #return AcquisitionData(array=DATA, geometry=self.sinogram_geometry) return DATA -class AstraBackProjector(DataSetProcessor): +class AstraBackProjector(DataProcessor): '''AstraBackProjector Back project AcquisitionData to ImageData using ASTRA proj_id. @@ -99,7 +99,7 @@ class AstraBackProjector(DataSetProcessor): 'device' : device } - #DataSetProcessor.__init__(self, **kwargs) + #DataProcessor.__init__(self, **kwargs) super(AstraBackProjector, self).__init__(**kwargs) self.set_ImageGeometry(volume_geometry) diff --git a/Wrappers/Python/wip/simple_demo_astra.py b/Wrappers/Python/wip/simple_demo_astra.py index 3365504..e9586b0 100755 --- a/Wrappers/Python/wip/simple_demo_astra.py +++ b/Wrappers/Python/wip/simple_demo_astra.py @@ -2,8 +2,8 @@ #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.optimisation.algs import FISTA, FBPD, CGLS +from ccpi.optimisation.funcs import Norm2sq, Norm1 , TV2D from ccpi.astra.astra_ops import AstraProjectorSimple import numpy as np |