From 6f9d46bf5e66df2c060b732fd8d34efe73df8fd9 Mon Sep 17 00:00:00 2001 From: Srikanth Nagella Date: Fri, 16 Mar 2018 09:42:02 +0000 Subject: Readers return AcquisitionData along with Geometry --- Wrappers/Python/ccpi/io/reader.py | 15 +++------------ 1 file 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 -- cgit v1.2.3