summaryrefslogtreecommitdiffstats
path: root/Wrappers/Python/ccpi
diff options
context:
space:
mode:
authorjakobsj <jakobsj@users.noreply.github.com>2018-04-20 09:12:11 +0100
committerGitHub <noreply@github.com>2018-04-20 09:12:11 +0100
commitbfae83abc0e92b0c2415ed8fe20b8cc1138a1122 (patch)
treeb9496bf7c3c803652e3d9e560991d8b670188847 /Wrappers/Python/ccpi
parent510cb3e98b30184beab96f908c6105df1e348030 (diff)
parent679268b9582e6de7d780e2b3b482b84905bb7657 (diff)
downloadastra-wrapper-bfae83abc0e92b0c2415ed8fe20b8cc1138a1122.tar.gz
astra-wrapper-bfae83abc0e92b0c2415ed8fe20b8cc1138a1122.tar.bz2
astra-wrapper-bfae83abc0e92b0c2415ed8fe20b8cc1138a1122.tar.xz
astra-wrapper-bfae83abc0e92b0c2415ed8fe20b8cc1138a1122.zip
Merge pull request #3 from vais-ral/cleandemos
Tidy up all astra demos except demoIP
Diffstat (limited to 'Wrappers/Python/ccpi')
-rw-r--r--[-rwxr-xr-x]Wrappers/Python/ccpi/astra/processors.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/Wrappers/Python/ccpi/astra/processors.py b/Wrappers/Python/ccpi/astra/processors.py
index 16c1f78..02c9070 100755..100644
--- a/Wrappers/Python/ccpi/astra/processors.py
+++ b/Wrappers/Python/ccpi/astra/processors.py
@@ -3,7 +3,7 @@ from ccpi.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)
@@ -202,4 +202,4 @@ class AstraBackProjectorMC(AstraBackProjector):
DATA.as_array()[k],
self.proj_id)
astra.data2d.delete(rec_id)
- return IM \ No newline at end of file
+ return IM