diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2015-05-08 14:02:41 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <wjp@usecode.org> | 2015-05-08 14:02:41 +0200 |
| commit | 5e25feb74f0d810af581db32fc5f9ed0560fa841 (patch) | |
| tree | 13c78d5aa78fb300913d5b4855644e8b7abcd88b /python/astra/data2d_c.pyx | |
| parent | bf31003d74f538a9096ef5999b31b0daa58c38c9 (diff) | |
| parent | f730efe78367e8fe8e589c2b43fb0886d384f5c8 (diff) | |
| download | astra-5e25feb74f0d810af581db32fc5f9ed0560fa841.tar.gz astra-5e25feb74f0d810af581db32fc5f9ed0560fa841.tar.bz2 astra-5e25feb74f0d810af581db32fc5f9ed0560fa841.tar.xz astra-5e25feb74f0d810af581db32fc5f9ed0560fa841.zip | |
Merge pull request #58 from dmpelt/python-link-size-check
Check data size when using 'link' function in Python
Diffstat (limited to 'python/astra/data2d_c.pyx')
| -rw-r--r-- | python/astra/data2d_c.pyx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/python/astra/data2d_c.pyx b/python/astra/data2d_c.pyx index ac54898..4919bf2 100644 --- a/python/astra/data2d_c.pyx +++ b/python/astra/data2d_c.pyx @@ -47,6 +47,12 @@ from .PyIncludes cimport * cimport utils from .utils import wrap_from_bytes +from .pythonutils import geom_size + +import operator + +from six.moves import reduce + cdef CData2DManager * man2d = <CData2DManager * >PyData2DManager.getSingletonPtr() cdef extern from "CFloat32CustomPython.h": @@ -71,6 +77,10 @@ def create(datatype, geometry, data=None, link=False): cdef CProjectionGeometry2D * ppGeometry cdef CFloat32Data2D * pDataObject2D cdef CFloat32CustomMemory * pCustom + + if link and data.shape!=geom_size(geometry): + raise Exception("The dimensions of the data do not match those specified in the geometry.") + if datatype == '-vol': cfg = utils.dictToConfig(six.b('VolumeGeometry'), geometry) pGeometry = new CVolumeGeometry2D() |