Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into parallel_vec | Willem Jan Palenstijn | 2017-10-11 | 4 | -8/+27 |
|\ | |||||
| * | Improve object creation error messages | Willem Jan Palenstijn | 2017-10-11 | 3 | -6/+22 |
| * | added vol_geom and proj_geom to the properties (#120) | vincentvn | 2017-10-05 | 1 | -0/+5 |
| * | Remove duplicate creation of projector in opTomo | Willem Jan Palenstijn | 2017-09-22 | 1 | -2/+0 |
* | | Merge branch 'master' into parallel_vec | Willem Jan Palenstijn | 2017-09-15 | 103 | -6249/+393 |
|\| | |||||
| * | Use standard _OPENMP directive for checking openmp | Willem Jan Palenstijn | 2017-03-20 | 1 | -4/+2 |
| * | Remove using namespace std; from headers | Willem Jan Palenstijn | 2017-02-16 | 1 | -2/+2 |
| * | Make python -sinocone a synonym of -sino. | Willem Jan Palenstijn | 2017-02-08 | 1 | -1/+1 |
| * | Remove unused 3d global min/max | Willem Jan Palenstijn | 2017-02-08 | 3 | -17/+0 |
| * | Fix warnings | Willem Jan Palenstijn | 2017-01-17 | 1 | -5/+5 |
| * | Update headers (website+2016) | Willem Jan Palenstijn | 2016-11-28 | 84 | -289/+253 |
| * | Add VS2015 build files | Willem Jan Palenstijn | 2016-11-24 | 9 | -0/+2766 |
| * | Remove VS2008/VS2012 build files | Willem Jan Palenstijn | 2016-11-24 | 19 | -8611/+0 |
| * | Add experimental support for Octave | Willem Jan Palenstijn | 2016-11-18 | 2 | -1/+45 |
| * | Improve consts in matlab undocumented function declarations | Willem Jan Palenstijn | 2016-11-18 | 1 | -5/+5 |
* | | Merge branch 'master' into parallel_vec | Willem Jan Palenstijn | 2016-10-07 | 1 | -18/+10 |
|\| | |||||
| * | Replace use of boost::split by own function | Willem Jan Palenstijn | 2016-07-28 | 1 | -9/+4 |
| * | Convert one more string parsing function to stringToDouble | Willem Jan Palenstijn | 2016-07-28 | 1 | -9/+6 |
* | | 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 |