Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #101 from wjp/composite | Willem Jan Palenstijn | 2015-12-04 | 2 | -0/+86 |
|\ | | | | | Add CompositeGeometryManager | ||||
| * | Add sample for experimental composite geometry code | Willem Jan Palenstijn | 2015-12-04 | 2 | -0/+86 |
| | | |||||
* | | Merge pull request #73 from dmpelt/python-plugins | Willem Jan Palenstijn | 2015-12-04 | 8 | -2/+235 |
|\ \ | |/ |/| | Add support for Python algorithm plugins | ||||
| * | Reduce dependency of python code on libastra | Willem Jan Palenstijn | 2015-12-04 | 1 | -5/+77 |
| | | |||||
| * | Merge branch 'master' into python-plugins | Willem Jan Palenstijn | 2015-12-01 | 8 | -16/+47 |
| |\ | | | | | | | | | | | | | Conflicts: python/astra/utils.pyx | ||||
| * | | Also use ProjectorId in ReconstructionAlgorithm3D plugin base | Daniel M. Pelt | 2015-07-23 | 1 | -0/+1 |
| | | | |||||
| * | | Add ReconstructionAlgorithm2D/3D classes for plugins (matching C++ classes) | Daniel M. Pelt | 2015-07-23 | 3 | -1/+55 |
| | | | |||||
| * | | Allow registering plugins without explicit name, and fix exception handling ↵ | Daniel M. Pelt | 2015-07-23 | 2 | -45/+40 |
| | | | | | | | | | | | | when running in Matlab | ||||
| * | | Also allow tuples to be passed in a config dict | Daniel M. Pelt | 2015-07-23 | 1 | -2/+2 |
| | | | |||||
| * | | Show more useful information when a plugin raises an exception | Daniel M. Pelt | 2015-07-23 | 1 | -4/+5 |
| | | | |||||
| * | | Allow plugins without keywords | Daniel M. Pelt | 2015-07-23 | 1 | -1/+4 |
| | | | |||||
| * | | Log error when running Python plugin algorithm | Daniel M. Pelt | 2015-07-23 | 1 | -0/+7 |
| | | | |||||
| * | | Fix passing a python list as option | Daniel M. Pelt | 2015-07-23 | 1 | -0/+2 |
| | | | |||||
| * | | Better way of passing options to Python plugin using inspect | Daniel M. Pelt | 2015-07-23 | 1 | -12/+12 |
| | | | |||||
| * | | Add support for Python algorithm plugins | Daniel M. Pelt | 2015-07-23 | 6 | -67/+169 |
| | | | |||||
* | | | Detect ASTRA_CUDA in Windows CL flags for Python as well | Willem Jan Palenstijn | 2015-12-03 | 1 | -0/+6 |
| | | | |||||
* | | | Let astra_create_vol_geom also generate flexible volume geometries | Willem Jan Palenstijn | 2015-09-25 | 1 | -0/+15 |
| |/ |/| | |||||
* | | Release the gil in algorithm.run | Daniel M. Pelt | 2015-08-10 | 2 | -2/+4 |
| | | |||||
* | | Define a transpose for the OpTomo transpose as well | Daniel M. Pelt | 2015-07-30 | 1 | -0/+8 |
| | | | | | | | | Allows for chaining .T calls. | ||||
* | | Fix Python OpTomo for scipy 0.16 | Daniel M. Pelt | 2015-07-30 | 1 | -1/+9 |
| | | | | | | | | | | | | scipy 0.16 also uses .T to define a transpose, which conflicts with the old OpTomo implementation. OpTomo now also defines the _transpose() method, which .T will call in scipy 0.16. | ||||
* | | Fix formatting when passing strings to log from high-level code | Daniel M. Pelt | 2015-07-17 | 1 | -4/+4 |
| | | |||||
* | | Fix memory leak in configuration code | Daniel M. Pelt | 2015-06-25 | 2 | -4/+16 |
| | | |||||
* | | Fix config to struct/dict translation for array options | Daniel M. Pelt | 2015-06-24 | 1 | -1/+4 |
| | | |||||
* | | Merge pull request #74 from dmpelt/small-fixes | Willem Jan Palenstijn | 2015-06-23 | 1 | -2/+2 |
|\ \ | | | | | | | Small fixes | ||||
| * | | Additional module name fix in documentation | Daniel M. Pelt | 2015-06-22 | 1 | -1/+1 |
| | | | |||||
| * | | Fix wrong module name in documentation | Daniel M. Pelt | 2015-06-20 | 1 | -1/+1 |
| |/ | |||||
* / | Don't take address of temporary. | Valerii Sokolov | 2015-06-22 | 1 | -2/+4 |
|/ | |||||
* | Fix optomo reconstruction for 1D input | Daniel M. Pelt | 2015-05-26 | 1 | -1/+1 |
| | |||||
* | Merge pull request #65 from dmpelt/cython-char-fix | Willem Jan Palenstijn | 2015-05-26 | 1 | -7/+14 |
|\ | | | | | Hold reference to results of six.b calls | ||||
| * | Hold reference to results of six.b calls | Daan Pelt | 2015-05-18 | 1 | -7/+14 |
| | | |||||
* | | Fix range import for old six versions | Daniel M. Pelt | 2015-05-18 | 3 | -3/+18 |
| | | |||||
* | | Merge pull request #61 from wjp/xmlnode_cleanup | Willem Jan Palenstijn | 2015-05-08 | 3 | -50/+26 |
|\ \ | | | | | | | Clean up XMLNode | ||||
| * | | Make XML array handling consistent | Willem Jan Palenstijn | 2015-05-06 | 2 | -26/+11 |
| | | | | | | | | | | | | setContent and getContent were using different XML formats previously. | ||||
| * | | Change XMLNode* to XMLNode | Willem Jan Palenstijn | 2015-05-06 | 3 | -24/+15 |
| |/ | | | | | | | An XMLNode object is already simply a pointer, so no need to dynamically allocate XMLNodes. | ||||
* | | Merge pull request #46 from dmpelt/spot-like-python | Willem Jan Palenstijn | 2015-05-08 | 5 | -139/+201 |
|\ \ | | | | | | | Add SPOT-like object for Python (overrides `__mul__` and works with scipy.sparse.linalg) | ||||
| * | | Rename optomo.py for Python 2 support | Daniel M. Pelt | 2015-05-08 | 2 | -1/+1 |
| | | | |||||
| * | | Use superclass __mul__ in Python OpTomo __mul__ | Daniel M. Pelt | 2015-05-07 | 1 | -22/+11 |
| | | | |||||
| * | | Add SPOT-like object for Python (overrides `__mul__` and works with ↵ | Daan Pelt | 2015-05-04 | 5 | -139/+212 |
| |/ | | | | | | | scipy.sparse.linalg) | ||||
* | | Do not allow 1D input in Python link method | Daniel M. Pelt | 2015-05-07 | 2 | -16/+4 |
| | | |||||
* | | Check data size when using 'link' function in Python | Daan Pelt | 2015-04-30 | 4 | -23/+98 |
|/ | |||||
* | Merge pull request #52 from wjp/change_geometry3d | Willem Jan Palenstijn | 2015-04-14 | 3 | -0/+81 |
|\ | | | | | Add data3d('change_geometry') | ||||
| * | Add python data3d.change_geometry | Willem Jan Palenstijn | 2015-04-10 | 3 | -0/+81 |
| | | |||||
* | | Add 'link' feature to Python (for 2D and 3D data) | Daniel M. Pelt | 2015-04-09 | 6 | -9/+107 |
|/ | |||||
* | Merge branch 'master' into logging | Willem Jan Palenstijn | 2015-03-20 | 11 | -64/+391 |
|\ | |||||
| * | Adjust docstring and samples to new python create_sino function | Willem Jan Palenstijn | 2015-03-06 | 1 | -4/+0 |
| | | |||||
| * | Avoid Python recompilation during installation | Daniel M. Pelt | 2015-03-05 | 1 | -3/+16 |
| | | |||||
| * | Added Python support for CUDA projectors | Daniel M. Pelt | 2015-03-05 | 10 | -57/+375 |
| | | |||||
* | | Add logging support to Python | Daniel M. Pelt | 2015-03-10 | 3 | -0/+250 |
|/ | |||||
* | Make Python get_geometry code match Matlab (after ↵ | Daniel M. Pelt | 2015-03-03 | 8 | -187/+181 |
| | | | | 03a9dd972ada50eedb83386910cecf02fe8d0e35) | ||||
* | Force Cython to use language level 2 to avoid error with Cython 0.22 and python3 | Daan Pelt | 2015-02-27 | 1 | -2/+1 |
| |