diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2016-03-02 16:00:01 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <wjp@usecode.org> | 2016-03-02 16:00:01 +0100 |
| commit | f24d9457f56f60aa927600261500e4ca681d0033 (patch) | |
| tree | 6a0265038fbc6520703b41f1b684aa401a47bbdc | |
| parent | 14bef5ea534e4aa4e6d0819e728d0a8d2b0b7925 (diff) | |
| parent | 0fb04ca6fb4fca23b9d1b885b9f075a90542997b (diff) | |
| download | astra-f24d9457f56f60aa927600261500e4ca681d0033.tar.gz astra-f24d9457f56f60aa927600261500e4ca681d0033.tar.bz2 astra-f24d9457f56f60aa927600261500e4ca681d0033.tar.xz astra-f24d9457f56f60aa927600261500e4ca681d0033.zip | |
Merge pull request #31 from dmpelt/small-fixes
Fix small Python errors
| -rw-r--r-- | python/astra/data3d.py | 2 | ||||
| -rw-r--r-- | python/astra/functions.py | 2 | ||||
| -rw-r--r-- | python/astra/optomo.py | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/python/astra/data3d.py b/python/astra/data3d.py index e5ef6b0..f143659 100644 --- a/python/astra/data3d.py +++ b/python/astra/data3d.py @@ -89,7 +89,7 @@ def get_single(i): :returns: :class:`numpy.ndarray` -- The object data. """ - return g.get_single(i) + return d.get_single(i) def store(i,data): """Fill existing 3D object with data. diff --git a/python/astra/functions.py b/python/astra/functions.py index e38b5bc..3f4aa82 100644 --- a/python/astra/functions.py +++ b/python/astra/functions.py @@ -115,7 +115,7 @@ def add_noise_to_sino(sinogram_in, I0, seed=None): sinogram_out = -max_sinogramRaw * np.log(sinogramCT_D) if not isinstance(sinogram_in, np.ndarray): - at.data2d.store(sinogram_in, sinogram_out) + data2d.store(sinogram_in, sinogram_out) if not seed==None: np.random.set_state(curstate) diff --git a/python/astra/optomo.py b/python/astra/optomo.py index 4a64150..dd10713 100644 --- a/python/astra/optomo.py +++ b/python/astra/optomo.py @@ -160,7 +160,7 @@ class OpTomo(scipy.sparse.linalg.LinearOperator): return self._matvec(v) return scipy.sparse.linalg.LinearOperator.__mul__(self, v) - def reconstruct(self, method, s, iterations=1, extraOptions = {}): + def reconstruct(self, method, s, iterations=1, extraOptions = None): """Reconstruct an object. :param method: Method to use for reconstruction. @@ -172,6 +172,8 @@ class OpTomo(scipy.sparse.linalg.LinearOperator): :param extraOptions: Extra options to use during reconstruction (i.e. for cfg['option']). :type extraOptions: :class:`dict` """ + if extraOptions is None: + extraOptions={} s = self.__checkArray(s, self.sshape) sid = self.data_mod.link('-sino',self.pg,s) v = np.zeros(self.vshape,dtype=np.float32) |