Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'master' into parvec | Willem Jan Palenstijn | 2016-07-28 | 21 | -212/+1728 | |
|\| | ||||||
| * | Merge pull request #29 from wjp/indexmanager | Willem Jan Palenstijn | 2016-04-15 | 1 | -1/+50 | |
| |\ | ||||||
| | * | Merge branch 'master' into indexmanager | Willem Jan Palenstijn | 2016-03-01 | 2 | -9/+85 | |
| | |\ | ||||||
| | * | | Add missing help | Willem Jan Palenstijn | 2016-02-22 | 1 | -1/+1 | |
| | * | | Add astra_mex delete/info based on index manager | Willem Jan Palenstijn | 2016-02-16 | 1 | -0/+49 | |
| * | | | Removed regression from opTomo | Folkert Bleichrodt | 2016-03-14 | 1 | -10/+13 | |
| * | | | opTomo: output type matches input type | Folkert Bleichrodt | 2016-03-02 | 1 | -57/+29 | |
| | |/ | |/| | ||||||
| * | | Merge pull request #111 from wjp/pluginbuild | Willem Jan Palenstijn | 2016-02-22 | 2 | -9/+85 | |
| |\ \ | | |/ | |/| | ||||||
| | * | Move fixLapackLoading to astra_mex_plugin | Willem Jan Palenstijn | 2016-01-27 | 1 | -0/+33 | |
| | * | Use Py_XDECREF to guard against null | Willem Jan Palenstijn | 2016-01-27 | 1 | -1/+1 | |
| | * | Initialize Python plugins when available in Matlab | Willem Jan Palenstijn | 2016-01-21 | 2 | -1/+32 | |
| | * | Fix whitespace | Willem Jan Palenstijn | 2016-01-21 | 1 | -6/+6 | |
| | * | Remove dependency of libastra on libpython by refactoring PluginAlgorithm | Willem Jan Palenstijn | 2016-01-21 | 1 | -3/+15 | |
| * | | Merge pull request #107 from wjp/multi | Willem Jan Palenstijn | 2016-02-02 | 1 | -5/+40 | |
| |\ \ | | |/ | |/| | ||||||
| | * | Add multi-GPU support to CompositeGeometryManager | Willem Jan Palenstijn | 2016-01-19 | 1 | -5/+40 | |
| * | | Fix file permissions | Willem Jan Palenstijn | 2016-01-21 | 1 | -0/+0 | |
| |/ | ||||||
| * | Merge pull request #106 from wjp/credits | Willem Jan Palenstijn | 2016-01-18 | 1 | -9/+12 | |
| |\ | ||||||
| | * | Update credits | Willem Jan Palenstijn | 2016-01-05 | 1 | -9/+12 | |
| * | | Merge pull request #105 from wjp/strings | Willem Jan Palenstijn | 2016-01-18 | 2 | -5/+4 | |
| |\ \ | | |/ | |/| | ||||||
| | * | Replace boost::lexical_cast by stringstreams | Willem Jan Palenstijn | 2016-01-05 | 2 | -5/+4 | |
| * | | Remove (long) obsolete file | Willem Jan Palenstijn | 2016-01-05 | 1 | -124/+0 | |
| |/ | ||||||
| * | Merge pull request #73 from dmpelt/python-plugins | Willem Jan Palenstijn | 2015-12-04 | 3 | -0/+159 | |
| |\ | ||||||
| | * | Merge branch 'master' into python-plugins | Willem Jan Palenstijn | 2015-12-01 | 16 | -19/+1328 | |
| | |\ | ||||||
| | * | | Add matlab plugin .m file | Daniel M. Pelt | 2015-07-23 | 1 | -0/+24 | |
| | * | | Allow registering plugins without explicit name, and fix exception handling w... | Daniel M. Pelt | 2015-07-23 | 1 | -15/+8 | |
| | * | | Fix numpy lapack loading when running in Matlab | Daniel M. Pelt | 2015-07-23 | 1 | -0/+3 | |
| | * | | Add support for Python algorithm plugins | Daniel M. Pelt | 2015-07-23 | 1 | -0/+139 | |
| * | | | Merge branch 'master' into volgeom3d | Willem Jan Palenstijn | 2015-12-02 | 5 | -2/+1317 | |
| |\ \ \ | ||||||
| | * | | | Fix Windows builds of astra_mex_direct | Willem Jan Palenstijn | 2015-12-02 | 2 | -0/+20 | |
| | | |/ | | |/| | ||||||
| | * | | Merge pull request #94 from wjp/cuda_options2 | Willem Jan Palenstijn | 2015-12-01 | 1 | -2/+7 | |
| | |\ \ | ||||||
| | | * | | Add options passing to projectors from matlab | Nicola Vigano | 2015-10-09 | 1 | -2/+7 | |
| | * | | | astra_mex_direct: Don't initialize newly allocated mxArray | Nicola Vigano | 2015-10-09 | 1 | -2/+18 | |
| | * | | | Build astra_mex_direct in MSVC | Willem Jan Palenstijn | 2015-10-07 | 2 | -0/+918 | |
| | * | | | Add astra_mex_direct('FP3D'/'BP3D', ...) | Willem Jan Palenstijn | 2015-10-07 | 2 | -0/+356 | |
| | |/ / | ||||||
| * | | | Merge branch 'master' into volgeom3d | Willem Jan Palenstijn | 2015-11-18 | 3 | -3/+5 | |
| |\| | | ||||||
| | * | | Use mxLogical instead of bool. | Willem Jan Palenstijn | 2015-09-17 | 2 | -3/+3 | |
| | * | | Fix algorithm leak in opTomo | Willem Jan Palenstijn | 2015-09-04 | 1 | -0/+2 | |
| * | | | Let astra_create_vol_geom also generate flexible volume geometries | Willem Jan Palenstijn | 2015-09-25 | 1 | -0/+15 | |
| |/ / | ||||||
| * | | Fix algorithm object leak in astra_create_fbp_reconstruction.m | Willem Jan Palenstijn | 2015-08-12 | 1 | -0/+1 | |
| * | | Fix formatting when passing strings to log from high-level code | Daniel M. Pelt | 2015-07-17 | 2 | -5/+5 | |
| * | | Fix memory leak in configuration code | Daniel M. Pelt | 2015-06-25 | 2 | -5/+12 | |
| * | | Fix config to struct/dict translation for array options | Daniel M. Pelt | 2015-06-24 | 1 | -1/+5 | |
| * | | Actually use the rec_type argument in astra_create_reconstruction_cuda | Daniel M. Pelt | 2015-06-20 | 1 | -1/+1 | |
| * | | Fix matlab compilation without CUDA | Daniel M. Pelt | 2015-06-20 | 1 | -2/+2 | |
| |/ | ||||||
* | | Merge remote-tracking branch 'upstream/master' into parallel_vec | Wim van Aarle | 2015-05-26 | 36 | -1745/+3759 | |
|\| | ||||||
| * | Merge pull request #49 from 3cHeLoN/astra-spot | Willem Jan Palenstijn | 2015-05-15 | 2 | -0/+309 | |
| |\ | ||||||
| | * | Added ASTRA-Spot operator opTomo | Folkert Bleichrodt | 2015-05-15 | 2 | -0/+309 | |
| * | | Make XML array handling consistent | Willem Jan Palenstijn | 2015-05-06 | 1 | -20/+2 | |
| * | | Change XMLNode* to XMLNode | Willem Jan Palenstijn | 2015-05-06 | 6 | -42/+36 | |
| * | | Fix bug in astra_mex_data3d('create') zero-initialization | Willem Jan Palenstijn | 2015-04-15 | 1 | -1/+1 |