summaryrefslogtreecommitdiffstats
path: root/python/astra/functions.py
diff options
context:
space:
mode:
authorDaan Pelt <daan.pelt@gmail.com>2015-04-30 11:02:50 +0200
committerDaan Pelt <daan.pelt@gmail.com>2015-04-30 11:56:09 +0200
commitf69d9f6bc1704560518da3c30c46e495c0228aac (patch)
treeada5b18e9de0b195c6df99103a62674ebe6eac38 /python/astra/functions.py
parent6fe3adab8ef3c9ab93a92c132f9809851a4dda74 (diff)
downloadastra-f69d9f6bc1704560518da3c30c46e495c0228aac.tar.gz
astra-f69d9f6bc1704560518da3c30c46e495c0228aac.tar.bz2
astra-f69d9f6bc1704560518da3c30c46e495c0228aac.tar.xz
astra-f69d9f6bc1704560518da3c30c46e495c0228aac.zip
Check data size when using 'link' function in Python
Diffstat (limited to 'python/astra/functions.py')
-rw-r--r--python/astra/functions.py25
1 files changed, 2 insertions, 23 deletions
diff --git a/python/astra/functions.py b/python/astra/functions.py
index 4025468..b826b86 100644
--- a/python/astra/functions.py
+++ b/python/astra/functions.py
@@ -38,6 +38,7 @@ from . import data2d
from . import data3d
from . import projector
from . import algorithm
+from . import pythonutils
@@ -158,29 +159,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'] == '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):