diff options
| author | Srikanth Nagella <srikanth.nagella@stfc.ac.uk> | 2018-03-16 09:42:02 +0000 |
|---|---|---|
| committer | Srikanth Nagella <srikanth.nagella@stfc.ac.uk> | 2018-03-16 09:42:02 +0000 |
| commit | 6f9d46bf5e66df2c060b732fd8d34efe73df8fd9 (patch) | |
| tree | b781f3b6b22d0b0c346a163f7b509d5048bd9368 | |
| parent | 03021b2c22e86821c1df1f89d5774062120bbc3c (diff) | |
Readers return AcquisitionData along with Geometry
| -rw-r--r-- | Wrappers/Python/ccpi/io/reader.py | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/Wrappers/Python/ccpi/io/reader.py b/Wrappers/Python/ccpi/io/reader.py index 4f7e288..ca5b380 100644 --- a/Wrappers/Python/ccpi/io/reader.py +++ b/Wrappers/Python/ccpi/io/reader.py @@ -166,13 +166,9 @@ class NexusReader(object): This method load the acquisition data and given dimension and returns an AcquisitionData Object
'''
data = self.loadProjection(dimensions)
- return AcquisitionData(data)
+ geometry = AcquisitionGeometry('parallel', '3D', self.getProjectionAngles())
+ return AcquisitionData(data, geometry=geometry)
- def getAcquisitionGeometry(self, dimensions=None):
- '''
- This method creates the acquisition geometry from a given dimension and return the created object
- '''
- return AcquisitionGeometry('parallel', '3D', self.getProjectionAngles())
class XTEKReader(object):
'''
@@ -292,10 +288,5 @@ class XTEKReader(object): This method load the acquisition data and given dimension and returns an AcquisitionData Object
'''
data = self.loadProjection(dimensions)
- return AcquisitionData(data)
+ return AcquisitionData(data, geometry=self.geometry)
- def getAcquisitionGeometry(self, dimensions=None):
- '''
- This method creates the acquisition geometry from a given dimension and return the created object
- '''
- return self.geometry
\ No newline at end of file |