Merge remote-tracking branch 'upstream/master' into parallel_vec

Conflicts:
	astra_vc11.vcxproj.filters
	python/astra/functions.py
	src/ParallelBeamBlobKernelProjector2D.cpp
	src/ProjectionGeometry2D.cpp

1 files changed, 7 insertions, 24 deletions

diff --git a/python/astra/functions.py b/python/astra/functions.py
index bbbb355..13ca911 100644
--- a/python/astra/functions.py
+++ b/python/astra/functions.py
@@ -32,12 +32,17 @@
 
 from . import creators as ac
 import numpy as np
-from six.moves import range
+try:
+    from six.moves import range
+except ImportError:
+    # six 1.3.0
+    from six.moves import xrange as range
 
 from . import data2d
 from . import data3d
 from . import projector
 from . import algorithm
+from . import pythonutils
 
 
 
@@ -158,29 +163,7 @@ def geom_size(geom, dim=None):
     :param dim: Optional axis index to return
     :type dim: :class:`int`
     """
-
-    if 'GridSliceCount' in geom:
-        # 3D Volume geometry?
-        s = (geom['GridSliceCount'], geom[
-             'GridRowCount'], geom['GridColCount'])
-    elif 'GridColCount' in geom:
-        # 2D Volume geometry?
-        s = (geom['GridRowCount'], geom['GridColCount'])
-    elif geom['type'] == 'parallel' or geom['type'] == 'fanflat':
-        s = (len(geom['ProjectionAngles']), geom['DetectorCount'])
-    elif geom['type'] == 'parallel3d' or geom['type'] == 'cone':
-        s = (geom['DetectorRowCount'], len(
-            geom['ProjectionAngles']), geom['DetectorColCount'])
-    elif geom['type'] == 'parallel_vec' or geom['type'] == 'fanflat_vec':
-        s = (geom['Vectors'].shape[0], geom['DetectorCount'])
-    elif geom['type'] == 'parallel3d_vec' or geom['type'] == 'cone_vec':
-        s = (geom['DetectorRowCount'], geom[
-             'Vectors'].shape[0], geom['DetectorColCount'])
-
-    if dim != None:
-        s = s[dim]
-
-    return s
+    return pythonutils.geom_size(geom,dim)
 
 
 def geom_2vec(proj_geom):