Commit message (Collapse) | 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 | |
| |\ | | | | | | | Add an AstraIndexManager | |||||
| | * | 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 | |
| | |/ | |/| | | | | | | | | | | | | | | | | If opTomo is used to do a forward or backprojection, the precision of the output data now matches the precision of the input data. So the output will be single precision only if the input is stored in single precision. | |||||
| * | | Merge pull request #111 from wjp/pluginbuild | Willem Jan Palenstijn | 2016-02-22 | 2 | -9/+85 | |
| |\ \ | | |/ | |/| | Remove dependency of libastra on libpython | |||||
| | * | 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 | |||||
| | * | 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 | |||||
| | * | 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 | |||||
| | * | Replace boost::lexical_cast by stringstreams | Willem Jan Palenstijn | 2016-01-05 | 2 | -5/+4 | |
| | | | | | | | | | | | | | | | | | | This is to avoid the dependence of lexical_cast on the current locale. The stringstreams used for the new string parsing/output functions are explicitly imbued with the C/classic locale. | |||||
| * | | 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 | |
| |\ | | | | | | | Add support for Python algorithm plugins | |||||
| | * | Merge branch 'master' into python-plugins | Willem Jan Palenstijn | 2015-12-01 | 16 | -19/+1328 | |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: python/astra/utils.pyx | |||||
| | * | | Add matlab plugin .m file | Daniel M. Pelt | 2015-07-23 | 1 | -0/+24 | |
| | | | | ||||||
| | * | | Allow registering plugins without explicit name, and fix exception handling ↵ | Daniel M. Pelt | 2015-07-23 | 1 | -15/+8 | |
| | | | | | | | | | | | | | | | | when running in Matlab | |||||
| | * | | 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 | |
| | |\ \ | | | | | | | | | | | Improve option passing via CudaProjector(2D/3D) | |||||
| | | * | | Add options passing to projectors from matlab | Nicola Vigano | 2015-10-09 | 1 | -2/+7 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr> | |||||
| | * | | | astra_mex_direct: Don't initialize newly allocated mxArray | Nicola Vigano | 2015-10-09 | 1 | -2/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This avoids letting matlab initialize the memory we will overwrite shortly after. | |||||
| | * | | | 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 | |
| | | | | | | | | | | | | | | | | This should improve compatibility with Octave according to Christian Häggström. | |||||
| | * | | 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 | |
|\| | | | | | | | | | | | | | | | Conflicts: astra_vc11.vcxproj.filters python/astra/functions.py src/ParallelBeamBlobKernelProjector2D.cpp src/ProjectionGeometry2D.cpp | |||||
| * | Merge pull request #49 from 3cHeLoN/astra-spot | Willem Jan Palenstijn | 2015-05-15 | 2 | -0/+309 | |
| |\ | | | | | | | Astra spot | |||||
| | * | Added ASTRA-Spot operator opTomo | Folkert Bleichrodt | 2015-05-15 | 2 | -0/+309 | |
| | | | | | | | | | | | | | | | | | | A Spot operator for the ASTRA projectors. Wraps the forward and backprojection operation into a Spot operator, which can be used with matrix-vector syntax in Matlab. | |||||
| * | | Make XML array handling consistent | Willem Jan Palenstijn | 2015-05-06 | 1 | -20/+2 | |
| | | | | | | | | | | | | setContent and getContent were using different XML formats previously. | |||||
| * | | Change XMLNode* to XMLNode | Willem Jan Palenstijn | 2015-05-06 | 6 | -42/+36 | |
| | | | | | | | | | | | | An XMLNode object is already simply a pointer, so no need to dynamically allocate XMLNodes. | |||||
| * | | Fix bug in astra_mex_data3d('create') zero-initialization | Willem Jan Palenstijn | 2015-04-15 | 1 | -1/+1 | |
| | | |