summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Simplify travis build using new install typeWillem Jan Palenstijn2016-11-221-2/+2
* Show installation paths at end of configureWillem Jan Palenstijn2016-11-221-7/+42
* Clean up linking against libpython for oct/mexWillem Jan Palenstijn2016-11-221-13/+4
* Disable octave interface by defaultWillem Jan Palenstijn2016-11-221-2/+2
* Build astra_mex_plugin for octaveWillem Jan Palenstijn2016-11-221-5/+18
* Overhaul package installationWillem Jan Palenstijn2016-11-213-70/+134
* Update python package name from PyASTRAToolbox to astra-toolboxWillem Jan Palenstijn2016-11-211-1/+1
* Update tested cuda compute capabilitiesWillem Jan Palenstijn2016-11-211-2/+2
* Separate python build and install stepsWillem Jan Palenstijn2016-11-211-6/+7
* Show NVCCFLAGS helpWillem Jan Palenstijn2016-11-211-0/+2
* Fix hardcoded delim in splitStringWillem Jan Palenstijn2016-11-211-1/+1
* Add install-octave to .PHONYWillem Jan Palenstijn2016-11-211-1/+1
* Merge pull request #73 from wjp/octaveWillem Jan Palenstijn2016-11-184-7/+123
|\
| * Add experimental support for OctaveWillem Jan Palenstijn2016-11-184-2/+118
| * Improve consts in matlab undocumented function declarationsWillem Jan Palenstijn2016-11-181-5/+5
|/
* Merge pull request #66 from wjp/iter_pluginsWillem Jan Palenstijn2016-11-187-1/+234
|\
| * Use SIRTPlugin, CGLSPlugin in exampleWillem Jan Palenstijn2016-11-181-0/+12
| * Add CGLS pluginWillem Jan Palenstijn2016-11-182-0/+100
| * Add SIRT pluginWillem Jan Palenstijn2016-11-185-1/+122
|/
* Merge pull request #72 from buzmakov/masterWillem Jan Palenstijn2016-11-186-0/+6
|\
| * Fix build with MS VS 2015 CEAlexey Buzmakov2016-11-046-0/+6
|/
* Update README.mdJan Sijbers2016-10-241-2/+5
* Update README.txtJan Sijbers2016-10-241-2/+4
* Fix Python create_projector docstringWillem Jan Palenstijn2016-10-191-1/+1
* Clean up unused variablesWillem Jan Palenstijn2016-10-131-29/+0
* Increase max angle count for Parker WeightingWillem Jan Palenstijn2016-10-131-1/+1
* Merge pull request #42 from wjp/FDKWillem Jan Palenstijn2016-10-0713-254/+208
|\
| * Merge branch 'master' into FDKWillem Jan Palenstijn2016-10-070-0/+0
| |\ | |/ |/|
* | Merge pull request #41 from wjp/anisoWillem Jan Palenstijn2016-10-0719-238/+386
|\ \
| * \ Merge branch 'master' into anisoWillem Jan Palenstijn2016-04-225-311/+3330
| |\ \
| | | * Merge branch 'master' into FDKWillem Jan Palenstijn2016-10-0620-408/+450
| | | |\ | |_|_|/ |/| | |
* | | | Merge pull request #62 from wjp/stringutilWillem Jan Palenstijn2016-07-294-38/+37
|\ \ \ \
| * | | | Replace use of boost::split by own functionWillem Jan Palenstijn2016-07-284-29/+31
| * | | | Convert one more string parsing function to stringToDoubleWillem Jan Palenstijn2016-07-281-9/+6
* | | | | Merge pull request #58 from wjp/volume_reductionWillem Jan Palenstijn2016-07-291-137/+184
|\ \ \ \ \
| * | | | | Fix inefficient block split logicWillem Jan Palenstijn2016-06-201-5/+19
| * | | | | Improve volume block reductionWillem Jan Palenstijn2016-06-201-132/+165
* | | | | | Remove leftover code from SingletonWillem Jan Palenstijn2016-07-281-5/+1
| |/ / / / |/| | | |
* | | | | Merge pull request #59 from wjp/spatial_filterWillem Jan Palenstijn2016-07-281-7/+39
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Compute FBP filter in spatial domainWillem Jan Palenstijn2016-06-241-7/+39
|/ / / /
* | | | Merge pull request #55 from wjp/singleton_constructionWillem Jan Palenstijn2016-05-171-4/+18
|\ \ \ \
| * | | | Add sanity checkWillem Jan Palenstijn2016-05-171-2/+2
| * | | | Avoid defining singleton construction in header fileWillem Jan Palenstijn2016-05-171-4/+18
|/ / / /
* | | | Merge pull request #47 from wjp/OpTomo_outWillem Jan Palenstijn2016-04-262-43/+87
|\ \ \ \
| * | | | Use FP/BP out argument in sample pluginWillem Jan Palenstijn2016-04-261-13/+21
| * | | | Give OpTomo FP/BP functions with optional out argumentWillem Jan Palenstijn2016-04-251-30/+66
* | | | | Merge pull request #46 from dmpelt/python_cxxWillem Jan Palenstijn2016-04-252-2/+6
|\ \ \ \ \
| * | | | | Add comment about setting CC to CXXDaniel M. Pelt2016-04-191-0/+2
| * | | | | Use CXX for Python compilation as wellDaniel M. Pelt2016-04-192-2/+4
* | | | | | Merge pull request #50 from wjp/data3d_dimensionsWillem Jan Palenstijn2016-04-251-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |