summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Reverse output of astra.data3d.dimensionsWillem Jan Palenstijn2016-04-251-1/+1
| | | |_|/ | | |/| |
| * | | | Merge pull request #49 from dmpelt/flatten_to_ravelWillem Jan Palenstijn2016-04-254-7/+7
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Change flatten to ravel in Python codeDaniel M. Pelt2016-04-254-7/+7
| |/ / /
| * | | Fix buildWillem Jan Palenstijn2016-04-221-1/+1
| * | | Fix buildWillem Jan Palenstijn2016-04-223-132/+78
| * | | Merge pull request #43 from adler-j/patch-1Willem Jan Palenstijn2016-04-221-1/+1
| |\ \ \
| | * | | Fix missing backslash in readme.md installJonas Adler2016-04-191-1/+1
| | |/ /
* | | | Merge branch 'master' into FDKWillem Jan Palenstijn2016-04-224-327/+3395
|\| | |
| * | | Merge pull request #48 from dmpelt/cpu_fft_fixWillem Jan Palenstijn2016-04-223-309/+3382
| |\ \ \ | | |/ / | |/| |
| | * | Change CPU FFT implementationDaniel M. Pelt2016-04-223-309/+3382
| |/ /
* | | Use CompositeGeometryManager for FDKWillem Jan Palenstijn2016-04-1811-249/+240
* | | Add FDKWeighting option to standard cone_bpWillem Jan Palenstijn2016-04-182-4/+12
| |/ |/|
* | Merge branch 'master' into anisoWillem Jan Palenstijn2016-04-1873-874/+1693
|\|
| * Fix stringToInt parsing doublesWillem Jan Palenstijn2016-04-181-1/+1
| * Merge pull request #29 from wjp/indexmanagerWillem Jan Palenstijn2016-04-159-45/+243
| |\
| | * Fix buildWillem Jan Palenstijn2016-03-011-6/+6
| | * Merge branch 'master' into indexmanagerWillem Jan Palenstijn2016-03-0125-677/+1097
| | |\
| | * | Add missing helpWillem Jan Palenstijn2016-02-221-1/+1
| | * | Add python astra.astra delete/info based on index managerWillem Jan Palenstijn2016-02-173-2/+88
| | * | Slightly simplify CAstraObjectManager::removeWillem Jan Palenstijn2016-02-161-3/+2
| | * | Add astra_mex delete/info based on index managerWillem Jan Palenstijn2016-02-162-0/+50
| | * | Also remove objects from index managerWillem Jan Palenstijn2016-02-161-1/+10
| | * | Refactor AstraObjectManager to add an AstraIndexManagerWillem Jan Palenstijn2016-02-165-38/+94
| * | | Merge pull request #35 from wjp/relaxationWillem Jan Palenstijn2016-04-1424-52/+173
| |\ \ \
| | * | | Add relaxation parameters to SIRT3DWillem Jan Palenstijn2016-03-236-2/+37
| | * | | Add relaxation parameters to SIRT, SARTWillem Jan Palenstijn2016-03-2314-12/+96
| | * | | Rename ART lambda option to RelaxationWillem Jan Palenstijn2016-03-232-5/+9