Remove tabs from python code

3 files changed, 202 insertions, 202 deletions

diff --git a/python/astra/PyIncludes.pxd b/python/astra/PyIncludes.pxd
index d5da17c..b40d787 100644
--- a/python/astra/PyIncludes.pxd
+++ b/python/astra/PyIncludes.pxd
@@ -30,262 +30,262 @@ from .PyXMLDocument cimport XMLNode
 include "config.pxi"
 
 cdef extern from "astra/Globals.h" namespace "astra":
-	ctypedef float float32
-	ctypedef double float64
-	ctypedef unsigned short int uint16
-	ctypedef signed short int sint16
-	ctypedef unsigned char uchar8
-	ctypedef signed char schar8
-	ctypedef int int32
-	ctypedef short int int16
+    ctypedef float float32
+    ctypedef double float64
+    ctypedef unsigned short int uint16
+    ctypedef signed short int sint16
+    ctypedef unsigned char uchar8
+    ctypedef signed char schar8
+    ctypedef int int32
+    ctypedef short int int16
 
 cdef extern from "astra/Config.h" namespace "astra":
-	cdef cppclass Config:
-		Config()
-		void initialize(string rootname)
-		XMLNode self
+    cdef cppclass Config:
+        Config()
+        void initialize(string rootname)
+        XMLNode self
 
 cdef extern from "astra/VolumeGeometry2D.h" namespace "astra":
-	cdef cppclass CVolumeGeometry2D:
-		bool initialize(Config)
-		int getGridColCount()
-		int getGridRowCount()
-		int getGridTotCount()
-		float32 getWindowLengthX()
-		float32 getWindowLengthY()
-		float32 getWindowArea()
-		float32 getPixelLengthX()
-		float32 getPixelLengthY()
-		float32 getPixelArea()
-		float32 getWindowMinX()
-		float32 getWindowMinY()
-		float32 getWindowMaxX()
-		float32 getWindowMaxY()
-		Config* getConfiguration()
-		bool isEqual(CVolumeGeometry2D*)
+    cdef cppclass CVolumeGeometry2D:
+        bool initialize(Config)
+        int getGridColCount()
+        int getGridRowCount()
+        int getGridTotCount()
+        float32 getWindowLengthX()
+        float32 getWindowLengthY()
+        float32 getWindowArea()
+        float32 getPixelLengthX()
+        float32 getPixelLengthY()
+        float32 getPixelArea()
+        float32 getWindowMinX()
+        float32 getWindowMinY()
+        float32 getWindowMaxX()
+        float32 getWindowMaxY()
+        Config* getConfiguration()
+        bool isEqual(CVolumeGeometry2D*)
 
 cdef extern from "astra/Float32Data2D.h" namespace "astra":
-	cdef cppclass CFloat32CustomMemory:
-		pass
+    cdef cppclass CFloat32CustomMemory:
+        pass
 
 cdef extern from "astra/Float32VolumeData2D.h" namespace "astra":
-	cdef cppclass CFloat32VolumeData2D:
-		CFloat32VolumeData2D(CVolumeGeometry2D*)
-		CFloat32VolumeData2D(CVolumeGeometry2D*, CFloat32CustomMemory*)
-		CVolumeGeometry2D * getGeometry()
-		int getWidth()
-		int getHeight()
-		void changeGeometry(CVolumeGeometry2D*)
-		Config* getConfiguration()
+    cdef cppclass CFloat32VolumeData2D:
+        CFloat32VolumeData2D(CVolumeGeometry2D*)
+        CFloat32VolumeData2D(CVolumeGeometry2D*, CFloat32CustomMemory*)
+        CVolumeGeometry2D * getGeometry()
+        int getWidth()
+        int getHeight()
+        void changeGeometry(CVolumeGeometry2D*)
+        Config* getConfiguration()
 
 
 
 cdef extern from "astra/ProjectionGeometry2D.h" namespace "astra":
-	cdef cppclass CProjectionGeometry2D:
-		CProjectionGeometry2D()
-		bool initialize(Config)
-		int getDetectorCount()
-		int getProjectionAngleCount()
-		bool isOfType(string)
-		float32 getProjectionAngle(int)
-		float32 getDetectorWidth()
-		Config* getConfiguration()
-		bool isEqual(CProjectionGeometry2D*)
+    cdef cppclass CProjectionGeometry2D:
+        CProjectionGeometry2D()
+        bool initialize(Config)
+        int getDetectorCount()
+        int getProjectionAngleCount()
+        bool isOfType(string)
+        float32 getProjectionAngle(int)
+        float32 getDetectorWidth()
+        Config* getConfiguration()
+        bool isEqual(CProjectionGeometry2D*)
 
 cdef extern from "astra/Float32Data2D.h" namespace "astra::CFloat32Data2D":
-	cdef enum TWOEDataType "astra::CFloat32Data2D::EDataType":
-		TWOPROJECTION "astra::CFloat32Data2D::PROJECTION"
-		TWOVOLUME "astra::CFloat32Data2D::VOLUME"
+    cdef enum TWOEDataType "astra::CFloat32Data2D::EDataType":
+        TWOPROJECTION "astra::CFloat32Data2D::PROJECTION"
+        TWOVOLUME "astra::CFloat32Data2D::VOLUME"
 
 cdef extern from "astra/Float32Data3D.h" namespace "astra::CFloat32Data3D":
-	cdef enum THREEEDataType "astra::CFloat32Data3D::EDataType":
-		THREEPROJECTION "astra::CFloat32Data3D::PROJECTION"
-		THREEVOLUME "astra::CFloat32Data3D::VOLUME"
+    cdef enum THREEEDataType "astra::CFloat32Data3D::EDataType":
+        THREEPROJECTION "astra::CFloat32Data3D::PROJECTION"
+        THREEVOLUME "astra::CFloat32Data3D::VOLUME"
 
 
 cdef extern from "astra/Float32Data2D.h" namespace "astra":
-	cdef cppclass CFloat32Data2D:
-		bool isInitialized()
-		int getSize()
-		float32 *getData()
-		float32 **getData2D()
-		int getWidth()
-		int getHeight()
-		TWOEDataType getType()
+    cdef cppclass CFloat32Data2D:
+        bool isInitialized()
+        int getSize()
+        float32 *getData()
+        float32 **getData2D()
+        int getWidth()
+        int getHeight()
+        TWOEDataType getType()
 
 
 
 
 cdef extern from "astra/SparseMatrixProjectionGeometry2D.h" namespace "astra":
-	cdef cppclass CSparseMatrixProjectionGeometry2D:
-		CSparseMatrixProjectionGeometry2D()
+    cdef cppclass CSparseMatrixProjectionGeometry2D:
+        CSparseMatrixProjectionGeometry2D()
 
 cdef extern from "astra/FanFlatProjectionGeometry2D.h" namespace "astra":
-	cdef cppclass CFanFlatProjectionGeometry2D:
-		CFanFlatProjectionGeometry2D()
+    cdef cppclass CFanFlatProjectionGeometry2D:
+        CFanFlatProjectionGeometry2D()
 
 cdef extern from "astra/FanFlatVecProjectionGeometry2D.h" namespace "astra":
-	cdef cppclass CFanFlatVecProjectionGeometry2D:
-		CFanFlatVecProjectionGeometry2D()
+    cdef cppclass CFanFlatVecProjectionGeometry2D:
+        CFanFlatVecProjectionGeometry2D()
 
 cdef extern from "astra/ParallelProjectionGeometry2D.h" namespace "astra":
-	cdef cppclass CParallelProjectionGeometry2D:
-		CParallelProjectionGeometry2D()
+    cdef cppclass CParallelProjectionGeometry2D:
+        CParallelProjectionGeometry2D()
 
 
 cdef extern from "astra/Float32ProjectionData2D.h" namespace "astra":
-	cdef cppclass CFloat32ProjectionData2D:
-		CFloat32ProjectionData2D(CProjectionGeometry2D*)
-		CFloat32ProjectionData2D(CProjectionGeometry2D*, CFloat32CustomMemory*)
-		CProjectionGeometry2D * getGeometry()
-		void changeGeometry(CProjectionGeometry2D*)
-		int getDetectorCount()
-		int getAngleCount()
+    cdef cppclass CFloat32ProjectionData2D:
+        CFloat32ProjectionData2D(CProjectionGeometry2D*)
+        CFloat32ProjectionData2D(CProjectionGeometry2D*, CFloat32CustomMemory*)
+        CProjectionGeometry2D * getGeometry()
+        void changeGeometry(CProjectionGeometry2D*)
+        int getDetectorCount()
+        int getAngleCount()
 
 cdef extern from "astra/Algorithm.h" namespace "astra":
-	cdef cppclass CAlgorithm:
-		bool initialize(Config)
-		void run(int) nogil
-		bool isInitialized()
+    cdef cppclass CAlgorithm:
+        bool initialize(Config)
+        void run(int) nogil
+        bool isInitialized()
 
 cdef extern from "astra/ReconstructionAlgorithm2D.h" namespace "astra":
-	cdef cppclass CReconstructionAlgorithm2D:
-		bool getResidualNorm(float32&)
+    cdef cppclass CReconstructionAlgorithm2D:
+        bool getResidualNorm(float32&)
 
 cdef extern from "astra/Projector2D.h" namespace "astra":
-	cdef cppclass CProjector2D:
-		bool isInitialized()
-		CProjectionGeometry2D* getProjectionGeometry()
-		CVolumeGeometry2D* getVolumeGeometry()
-		CSparseMatrix* getMatrix()
+    cdef cppclass CProjector2D:
+        bool isInitialized()
+        CProjectionGeometry2D* getProjectionGeometry()
+        CVolumeGeometry2D* getVolumeGeometry()
+        CSparseMatrix* getMatrix()
 
 cdef extern from "astra/Projector3D.h" namespace "astra":
-	cdef cppclass CProjector3D:
-		bool isInitialized()
-		CProjectionGeometry3D* getProjectionGeometry()
-		CVolumeGeometry3D* getVolumeGeometry()
+    cdef cppclass CProjector3D:
+        bool isInitialized()
+        CProjectionGeometry3D* getProjectionGeometry()
+        CVolumeGeometry3D* getVolumeGeometry()
 
 IF HAVE_CUDA==True:
-	cdef extern from "astra/CudaProjector3D.h" namespace "astra":
-		cdef cppclass CCudaProjector3D
+    cdef extern from "astra/CudaProjector3D.h" namespace "astra":
+        cdef cppclass CCudaProjector3D
 
-	cdef extern from "astra/CudaProjector2D.h" namespace "astra":
-		cdef cppclass CCudaProjector2D
+    cdef extern from "astra/CudaProjector2D.h" namespace "astra":
+        cdef cppclass CCudaProjector2D
 
-	cdef extern from "astra/Float32Data3DGPU.h" namespace "astraCUDA3d":
-		cdef cppclass MemHandle3D:
-			pass
+    cdef extern from "astra/Float32Data3DGPU.h" namespace "astraCUDA3d":
+        cdef cppclass MemHandle3D:
+            pass
 
-	cdef extern from "astra/Float32Data3DGPU.h" namespace "astraCUDA3d":
-		cdef MemHandle3D wrapHandle(float *D_ptr, unsigned int x, unsigned int y, unsigned int z, unsigned int pitch)
+    cdef extern from "astra/Float32Data3DGPU.h" namespace "astraCUDA3d":
+        cdef MemHandle3D wrapHandle(float *D_ptr, unsigned int x, unsigned int y, unsigned int z, unsigned int pitch)
 
 
 cdef extern from "astra/SparseMatrix.h" namespace "astra":
-	cdef cppclass CSparseMatrix:
-		CSparseMatrix(unsigned int,unsigned int,unsigned long)
-		unsigned int m_iWidth
-		unsigned int m_iHeight
-		unsigned long m_lSize
-		bool isInitialized()
-		float32* m_pfValues
-		unsigned int* m_piColIndices
-		unsigned long* m_plRowStarts
+    cdef cppclass CSparseMatrix:
+        CSparseMatrix(unsigned int,unsigned int,unsigned long)
+        unsigned int m_iWidth
+        unsigned int m_iHeight
+        unsigned long m_lSize
+        bool isInitialized()
+        float32* m_pfValues
+        unsigned int* m_piColIndices
+        unsigned long* m_plRowStarts
 
 cdef extern from "astra/Float32Data3D.h" namespace "astra":
-	cdef cppclass CFloat32Data3D:
-		bool isInitialized()
-		int getSize()
-		int getWidth()
-		int getHeight()
-		int getDepth()
+    cdef cppclass CFloat32Data3D:
+        bool isInitialized()
+        int getSize()
+        int getWidth()
+        int getHeight()
+        int getDepth()
 
 
 cdef extern from "astra/Float32Data3DMemory.h" namespace "astra":
-	cdef cppclass CFloat32Data3DMemory(CFloat32Data3D):
-		CFloat32Data3DMemory()
-		void updateStatistics()
-		float32 *getData()
-		float32 ***getData3D()
-		THREEEDataType getType()
+    cdef cppclass CFloat32Data3DMemory(CFloat32Data3D):
+        CFloat32Data3DMemory()
+        void updateStatistics()
+        float32 *getData()
+        float32 ***getData3D()
+        THREEEDataType getType()
 
 
 cdef extern from "astra/VolumeGeometry3D.h" namespace "astra":
-	cdef cppclass CVolumeGeometry3D:
-		CVolumeGeometry3D()
-		bool initialize(Config)
-		Config * getConfiguration()
-		int getGridColCount()
-		int getGridRowCount()
-		int getGridSliceCount()
+    cdef cppclass CVolumeGeometry3D:
+        CVolumeGeometry3D()
+        bool initialize(Config)
+        Config * getConfiguration()
+        int getGridColCount()
+        int getGridRowCount()
+        int getGridSliceCount()
 
 cdef extern from "astra/ProjectionGeometry3D.h" namespace "astra":
-	cdef cppclass CProjectionGeometry3D:
-		CProjectionGeometry3D()
-		bool initialize(Config)
-		Config * getConfiguration()
-		int getProjectionCount()
-		int getDetectorColCount()
-		int getDetectorRowCount()
+    cdef cppclass CProjectionGeometry3D:
+        CProjectionGeometry3D()
+        bool initialize(Config)
+        Config * getConfiguration()
+        int getProjectionCount()
+        int getDetectorColCount()
+        int getDetectorRowCount()
 
 
 cdef extern from "astra/Float32VolumeData3DMemory.h" namespace "astra":
-	cdef cppclass CFloat32VolumeData3DMemory:
-		CFloat32VolumeData3DMemory(CVolumeGeometry3D*)
-		CFloat32VolumeData3DMemory(CVolumeGeometry3D*, CFloat32CustomMemory*)
-		CVolumeGeometry3D* getGeometry()
-		void changeGeometry(CVolumeGeometry3D*)
-		int getRowCount()
-		int getColCount()
-		int getSliceCount()
-		bool isInitialized()
+    cdef cppclass CFloat32VolumeData3DMemory:
+        CFloat32VolumeData3DMemory(CVolumeGeometry3D*)
+        CFloat32VolumeData3DMemory(CVolumeGeometry3D*, CFloat32CustomMemory*)
+        CVolumeGeometry3D* getGeometry()
+        void changeGeometry(CVolumeGeometry3D*)
+        int getRowCount()
+        int getColCount()
+        int getSliceCount()
+        bool isInitialized()
 
 cdef extern from "astra/ParallelProjectionGeometry3D.h" namespace "astra":
-	cdef cppclass CParallelProjectionGeometry3D:
-		CParallelProjectionGeometry3D()
+    cdef cppclass CParallelProjectionGeometry3D:
+        CParallelProjectionGeometry3D()
 
 cdef extern from "astra/ParallelVecProjectionGeometry3D.h" namespace "astra":
-	cdef cppclass CParallelVecProjectionGeometry3D:
-		CParallelVecProjectionGeometry3D()
+    cdef cppclass CParallelVecProjectionGeometry3D:
+        CParallelVecProjectionGeometry3D()
 
 cdef extern from "astra/ConeProjectionGeometry3D.h" namespace "astra":
-	cdef cppclass CConeProjectionGeometry3D:
-		CConeProjectionGeometry3D()
-		bool initialize(Config)
+    cdef cppclass CConeProjectionGeometry3D:
+        CConeProjectionGeometry3D()
+        bool initialize(Config)
 
 cdef extern from "astra/ConeVecProjectionGeometry3D.h" namespace "astra":
-	cdef cppclass CConeVecProjectionGeometry3D:
-		CConeVecProjectionGeometry3D()
+    cdef cppclass CConeVecProjectionGeometry3D:
+        CConeVecProjectionGeometry3D()
 
 cdef extern from "astra/Float32ProjectionData3DMemory.h" namespace "astra":
-	cdef cppclass CFloat32ProjectionData3DMemory:
-		CFloat32ProjectionData3DMemory(CProjectionGeometry3D*)
-		CFloat32ProjectionData3DMemory(CConeProjectionGeometry3D*)
-		CFloat32ProjectionData3DMemory(CProjectionGeometry3D*, CFloat32CustomMemory*)
-		CFloat32ProjectionData3DMemory(CConeProjectionGeometry3D*, CFloat32CustomMemory*)
-		CProjectionGeometry3D* getGeometry()
-		void changeGeometry(CProjectionGeometry3D*)
-		int getDetectorColCount()
-		int getDetectorRowCount()
-		int getAngleCount()
-		bool isInitialized()
+    cdef cppclass CFloat32ProjectionData3DMemory:
+        CFloat32ProjectionData3DMemory(CProjectionGeometry3D*)
+        CFloat32ProjectionData3DMemory(CConeProjectionGeometry3D*)
+        CFloat32ProjectionData3DMemory(CProjectionGeometry3D*, CFloat32CustomMemory*)
+        CFloat32ProjectionData3DMemory(CConeProjectionGeometry3D*, CFloat32CustomMemory*)
+        CProjectionGeometry3D* getGeometry()
+        void changeGeometry(CProjectionGeometry3D*)
+        int getDetectorColCount()
+        int getDetectorRowCount()
+        int getAngleCount()
+        bool isInitialized()
 
 IF HAVE_CUDA==True:
-	cdef extern from "astra/Float32VolumeData3DGPU.h" namespace "astra":
-		cdef cppclass CFloat32VolumeData3DGPU:
-			CFloat32VolumeData3DGPU(CVolumeGeometry3D*, MemHandle3D)
-			CVolumeGeometry3D* getGeometry()
-			void changeGeometry(CVolumeGeometry3D*)
-			int getRowCount()
-			int getColCount()
-			int getSliceCount()
-			bool isInitialized()
-
-	cdef extern from "astra/Float32ProjectionData3DGPU.h" namespace "astra":
-		cdef cppclass CFloat32ProjectionData3DGPU:
-			CFloat32ProjectionData3DGPU(CProjectionGeometry3D*, MemHandle3D)
-			CProjectionGeometry3D* getGeometry()
-			void changeGeometry(CProjectionGeometry3D*)
-			int getRowCount()
-			int getColCount()
-			int getSliceCount()
-			bool isInitialized()
+    cdef extern from "astra/Float32VolumeData3DGPU.h" namespace "astra":
+        cdef cppclass CFloat32VolumeData3DGPU:
+            CFloat32VolumeData3DGPU(CVolumeGeometry3D*, MemHandle3D)
+            CVolumeGeometry3D* getGeometry()
+            void changeGeometry(CVolumeGeometry3D*)
+            int getRowCount()
+            int getColCount()
+            int getSliceCount()
+            bool isInitialized()
+
+    cdef extern from "astra/Float32ProjectionData3DGPU.h" namespace "astra":
+        cdef cppclass CFloat32ProjectionData3DGPU:
+            CFloat32ProjectionData3DGPU(CProjectionGeometry3D*, MemHandle3D)
+            CProjectionGeometry3D* getGeometry()
+            void changeGeometry(CProjectionGeometry3D*)
+            int getRowCount()
+            int getColCount()
+            int getSliceCount()
+            bool isInitialized()
diff --git a/python/astra/creators.py b/python/astra/creators.py
index f45fd52..aa16221 100644
--- a/python/astra/creators.py
+++ b/python/astra/creators.py
@@ -258,7 +258,7 @@ This method can be called in a number of ways:
     elif intype == 'cone':
         if len(args) < 7:
             raise Exception('not enough variables: astra_create_proj_geom(cone, detector_spacing_x, detector_spacing_y, det_row_count, det_col_count, angles, source_origin, origin_det)')
-        return {'type':	'cone','DetectorSpacingX':args[0], 'DetectorSpacingY':args[1], 'DetectorRowCount':args[2],'DetectorColCount':args[3],'ProjectionAngles':args[4],'DistanceOriginSource':	args[5],'DistanceOriginDetector':args[6]}
+        return {'type': 'cone','DetectorSpacingX':args[0], 'DetectorSpacingY':args[1], 'DetectorRowCount':args[2],'DetectorColCount':args[3],'ProjectionAngles':args[4],'DistanceOriginSource': args[5],'DistanceOriginDetector':args[6]}
     elif intype == 'cone_vec':
         if len(args) < 3:
             raise Exception('not enough variables: astra_create_proj_geom(cone_vec, det_row_count, det_col_count, V)')
diff --git a/python/astra/extrautils.pyx b/python/astra/extrautils.pyx
index 502cc78..248c6ee 100644
--- a/python/astra/extrautils.pyx
+++ b/python/astra/extrautils.pyx
@@ -26,19 +26,19 @@
 
 
 def clipCircle(img):
-	cdef int i,j
-	cdef double x2,y2,mid,bnd
-	cdef long sz,sz2
-	sz = img.shape[0]
-	sz2 = sz*sz
-	bnd = sz2/4.
-	mid = (sz-1.)/2.
-	nDel=0
-	for i in range(sz):
-		for j in range(sz):
-			x2 = (i-mid)*(i-mid)
-			y2 = (j-mid)*(j-mid)
-			if x2+y2>bnd:
-				img[i,j]=0
-				nDel=nDel+1
-	return nDel
+    cdef int i,j
+    cdef double x2,y2,mid,bnd
+    cdef long sz,sz2
+    sz = img.shape[0]
+    sz2 = sz*sz
+    bnd = sz2/4.
+    mid = (sz-1.)/2.
+    nDel=0
+    for i in range(sz):
+        for j in range(sz):
+            x2 = (i-mid)*(i-mid)
+            y2 = (j-mid)*(j-mid)
+            if x2+y2>bnd:
+                img[i,j]=0
+                nDel=nDel+1
+    return nDel