summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #34 from wjp/msvc_genWillem Jan Palenstijn2015-03-2020-5241/+7014
|\
| * Add command line option to generate vc09/vc11/all filesWillem Jan Palenstijn2015-03-201-24/+33
| * Generate MSVC 2008/2012 project files with a Python scriptWillem Jan Palenstijn2015-03-1920-5241/+7005
|/
* Merge pull request #28 from dmpelt/projector3d-pythonWillem Jan Palenstijn2015-03-1818-83/+410
|\
| * Adjust docstring and samples to new python create_sino functionWillem Jan Palenstijn2015-03-068-23/+19
| * Avoid Python recompilation during installationDaniel M. Pelt2015-03-051-3/+16
| * Added Python support for CUDA projectorsDaniel M. Pelt2015-03-0510-57/+375
* | Merge pull request #29 from wjp/optional_boostutfWillem Jan Palenstijn2015-03-102-2/+26
|\ \
| * | Add check for required boost headersWillem Jan Palenstijn2015-03-091-0/+11
| * | Make boost-unit-test-framework optional in configureWillem Jan Palenstijn2015-03-062-2/+15
|/ /
* / Force clang to use libstdc++ on OSX (fixes Cython compilation)Daniel M. Pelt2015-03-052-0/+15
|/
* Also clean up generated Cython files during `make clean`Daniel M. Pelt2015-03-041-0/+2
* Fix getConfiguration type for vec geometriesWillem Jan Palenstijn2015-03-032-2/+2
* Merge pull request #25 from dmpelt/python-get-geometryWillem Jan Palenstijn2015-03-038-187/+181
|\
| * Make Python get_geometry code match Matlab (after 03a9dd972ada50eedb83386910c...Daniel M. Pelt2015-03-038-187/+181
* | Fix getConfiguration for vec geometries and non-square detectorsWillem Jan Palenstijn2015-03-032-6/+6
|/
* Merge pull request #24 from wjp/cuda_includesWillem Jan Palenstijn2015-03-0211-64/+151
|\
| * Untangle cuda and astra includesWillem Jan Palenstijn2015-03-0211-64/+151
|/
* Merge pull request #23 from dmpelt/cython0.22-fixWillem Jan Palenstijn2015-02-271-2/+1
|\
| * Force Cython to use language level 2 to avoid error with Cython 0.22 and python3Daan Pelt2015-02-271-2/+1
|/
* Merge pull request #20 from wvaarle/matlab-get-geometryWillem Jan Palenstijn2015-02-2738-702/+724
|\
| * code cleanupWim van Aarle2015-02-2612-519/+288
| * updated docsWim van Aarle2015-02-2610-83/+19
| * get_geometry now uses XML config object (for projections)Wim van Aarle2015-02-2625-274/+328
| * get_geometry now uses XML config object (for volumes)Wim van Aarle2015-02-2512-39/+160
| * deleted tmp test fileWim van Aarle2015-02-241-50/+0
| * re-enabled get_geometry for 3d projectorsWim van Aarle2015-02-243-10/+10
| * added get_geometry for 3d projection data objectsWim van Aarle2015-02-246-20/+141
| * fixed get_geometry for fanflat_vecWim van Aarle2015-02-243-35/+59
| * added get_geometry for 3d volume objectsWim van Aarle2015-02-244-53/+100
* | Merge pull request #16 from dmpelt/python-interfaceWillem Jan Palenstijn2015-02-26155-9/+15448
|\ \
| * | Add logging for python module checksWillem Jan Palenstijn2015-02-262-12/+28
| * | Simplify with-python handlingWillem Jan Palenstijn2015-02-261-2/+13
| * | Better Python configure checksDaniel M. Pelt2015-02-261-7/+24
| * | Merge branch 'master' into python-interfaceWillem Jan Palenstijn2015-02-2621-179/+1081
| |\ \ | |/ / |/| |
* | | Fix include orderWillem Jan Palenstijn2015-02-261-1/+1
* | | Merge pull request #17 from wjp/nvcc_configWillem Jan Palenstijn2015-02-252-34/+40
|\ \ \
| * | | Also output prefix at end of configureWillem Jan Palenstijn2015-02-251-4/+4
| * | | Output summary of results at end of configureWillem Jan Palenstijn2015-02-251-1/+7
| * | | Clean up configure check for nvccWillem Jan Palenstijn2015-02-251-26/+19
| * | | Fix copy-paste error in boost-unit-test-framework checkWillem Jan Palenstijn2015-02-251-1/+1
| * | | Improve logging for nvcc hackWillem Jan Palenstijn2015-02-251-4/+11
| | |/ | |/|
* | | Merge pull request #19 from wjp/osx-supportWillem Jan Palenstijn2015-02-256-62/+14
|\ \ \ | |/ / |/| |
| * | Moved pthreads defines to Globals.hDaan Pelt2015-02-253-4/+9
| * | Added libtool check for OSXDaniel M. Pelt2015-02-251-2/+5
| * | Remove CAsyncAlgorithm::timedJoinWillem Jan Palenstijn2015-02-253-56/+0
|/ /
* | Merge pull request #13 from astra-toolbox/matlab-data3d-logicalWillem Jan Palenstijn2015-02-245-23/+53
|\ \
| * | Added support for logical matrices in mex_data3dWim van Aarle2015-02-245-23/+53
|/ /
* | fixed matlab DART implementationWim van Aarle2015-02-236-82/+885
* | Updated Visual Studio 2012 project fileWim van Aarle2015-02-231-2/+2