diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2020-07-02 16:15:25 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2020-07-02 16:15:25 +0200 |
| commit | b126aefdda9148143971b95460f6f52010cc2358 (patch) | |
| tree | ffe468575dcf47d3411e7c2467e72ddf8626c988 /python/astra/data3d.py | |
| parent | 82fc179f39ed6da308b0f229769f899570a1d9ea (diff) | |
| parent | 69ab4daf439164eb37203b69b0cca3efe4c2232e (diff) | |
| download | astra-b126aefdda9148143971b95460f6f52010cc2358.tar.gz astra-b126aefdda9148143971b95460f6f52010cc2358.tar.bz2 astra-b126aefdda9148143971b95460f6f52010cc2358.tar.xz astra-b126aefdda9148143971b95460f6f52010cc2358.zip | |
Merge branch 'direct_fpbp'
Diffstat (limited to 'python/astra/data3d.py')
| -rw-r--r-- | python/astra/data3d.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/python/astra/data3d.py b/python/astra/data3d.py index b0d54b2..3eea0e3 100644 --- a/python/astra/data3d.py +++ b/python/astra/data3d.py @@ -26,7 +26,7 @@ from . import data3d_c as d import numpy as np -from .pythonutils import GPULink +from .pythonutils import GPULink, checkArrayForLink def create(datatype,geometry,data=None): """Create a 3D object. @@ -57,10 +57,7 @@ def link(datatype, geometry, data): if not isinstance(data,np.ndarray) and not isinstance(data,GPULink): raise TypeError("Input should be a numpy ndarray or GPULink object") if isinstance(data, np.ndarray): - if data.dtype != np.float32: - raise ValueError("Numpy array should be float32") - if not (data.flags['C_CONTIGUOUS'] and data.flags['ALIGNED']): - raise ValueError("Numpy array should be C_CONTIGUOUS and ALIGNED") + checkArrayForLink(data) return d.create(datatype,geometry,data,True) |