summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | 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
| * | | | Move CUDA algorithm initialization to its own functionWillem Jan Palenstijn2016-03-234-33/+31
* | | | | Merge pull request #36 from wjp/sart_raylengthWillem Jan Palenstijn2016-04-141-5/+19
|\ \ \ \ \
| * | | | | Fix accumulating multiple raylengths in SARTWillem Jan Palenstijn2016-03-231-5/+19
| |/ / / /
* | | | | Merge pull request #37 from wjp/cppcheckWillem Jan Palenstijn2016-04-144-10/+11
|\ \ \ \ \
| * | | | | Fix memory leakWillem Jan Palenstijn2016-03-241-6/+8
| * | | | | Fix cppcheck warningsWillem Jan Palenstijn2016-03-243-4/+3
|/ / / / /
* | | | | Merge pull request #116 from 3cHeLoN/opTomoWillem Jan Palenstijn2016-03-241-53/+28
|\ \ \ \ \
| * | | | | Removed regression from opTomoFolkert Bleichrodt2016-03-141-10/+13
| * | | | | opTomo: output type matches input typeFolkert Bleichrodt2016-03-021-57/+29
* | | | | | Merge pull request #117 from dmpelt/python-bool-fixWillem Jan Palenstijn2016-03-241-4/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Encode Python bool as int in XML instead of strDaniel M. Pelt2016-03-041-4/+8
* | | | | | Fix Windows buildWillem Jan Palenstijn2016-03-081-10/+10
|/ / / / /
* | | | | Remove outdated cuda pathsWillem Jan Palenstijn2016-03-031-2/+2
* | | | | Merge pull request #32 from dmpelt/split-condaWillem Jan Palenstijn2016-03-035-13/+43
|\ \ \ \ \
| * | | | | Remove with-python from libastra conda buildDaniel M. Pelt2016-03-031-1/+1
| * | | | | Include PluginAlgorithm in non-Python builds as wellDaniel M. Pelt2016-03-031-1/+1
| * | | | | Split conda package into c++ lib and python partsDaniel M. Pelt2016-03-034-12/+42
* | | | | | Merge pull request #33 from wjp/travis-testWillem Jan Palenstijn2016-03-032-5/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use travis-ci's apt packages for cudaWillem Jan Palenstijn2016-03-031-3/+5
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 12:20:32 +0000