summaryrefslogtreecommitdiffstats
path: root/python/docSRC
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <wjp@usecode.org>2015-05-08 14:03:01 +0200
committerWillem Jan Palenstijn <wjp@usecode.org>2015-05-08 14:03:01 +0200
commit63307fca7a82bfea7592d9c8d3a359333e622495 (patch)
tree5c2478fdeace55cad57bedec88017e948f09f56e /python/docSRC
parent5e25feb74f0d810af581db32fc5f9ed0560fa841 (diff)
parent89da933904262d6b7e80e8adf85ca9d1273881b3 (diff)
downloadastra-63307fca7a82bfea7592d9c8d3a359333e622495.tar.gz
astra-63307fca7a82bfea7592d9c8d3a359333e622495.tar.bz2
astra-63307fca7a82bfea7592d9c8d3a359333e622495.tar.xz
astra-63307fca7a82bfea7592d9c8d3a359333e622495.zip
Merge pull request #46 from dmpelt/spot-like-python
Add SPOT-like object for Python (overrides `__mul__` and works with scipy.sparse.linalg)
Diffstat (limited to 'python/docSRC')
-rw-r--r--python/docSRC/index.rst2
-rw-r--r--python/docSRC/operator.rst (renamed from python/docSRC/ASTRAProjector.rst)4
2 files changed, 3 insertions, 3 deletions
diff --git a/python/docSRC/index.rst b/python/docSRC/index.rst
index 8d17a4a..b7cc6d6 100644
--- a/python/docSRC/index.rst
+++ b/python/docSRC/index.rst
@@ -18,7 +18,7 @@ Contents:
matrix
creators
functions
- ASTRAProjector
+ operator
matlab
astra
.. astra
diff --git a/python/docSRC/ASTRAProjector.rst b/python/docSRC/operator.rst
index 1c267e3..f5369fa 100644
--- a/python/docSRC/ASTRAProjector.rst
+++ b/python/docSRC/operator.rst
@@ -1,7 +1,7 @@
-Helper class: the :mod:`ASTRAProjector` module
+OpTomo class: the :mod:`operator` module
==============================================
-.. automodule:: astra.ASTRAProjector
+.. automodule:: astra.operator
:members:
:undoc-members:
:show-inheritance: