Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into fdk_custom_filter | Willem Jan Palenstijn | 2016-10-13 | 30 | -714/+863 |
|\ | |||||
| * | Clean up unused variables | Willem Jan Palenstijn | 2016-10-13 | 1 | -29/+0 |
| * | Increase max angle count for Parker Weighting | Willem Jan Palenstijn | 2016-10-13 | 1 | -1/+1 |
| * | Merge pull request #42 from wjp/FDK | Willem Jan Palenstijn | 2016-10-07 | 13 | -254/+208 |
| |\ | |||||
| | * | Merge branch 'master' into FDK | Willem Jan Palenstijn | 2016-10-07 | 0 | -0/+0 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #41 from wjp/aniso | Willem Jan Palenstijn | 2016-10-07 | 19 | -238/+386 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into aniso | Willem Jan Palenstijn | 2016-04-22 | 5 | -311/+3330 |
| | |\ \ | |||||
| | | | * | Merge branch 'master' into FDK | Willem Jan Palenstijn | 2016-10-06 | 20 | -408/+450 |
| | | | |\ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge pull request #62 from wjp/stringutil | Willem Jan Palenstijn | 2016-07-29 | 4 | -38/+37 |
| |\ \ \ \ | |||||
| | * | | | | Replace use of boost::split by own function | Willem Jan Palenstijn | 2016-07-28 | 4 | -29/+31 |
| | * | | | | Convert one more string parsing function to stringToDouble | Willem Jan Palenstijn | 2016-07-28 | 1 | -9/+6 |
| * | | | | | Merge pull request #58 from wjp/volume_reduction | Willem Jan Palenstijn | 2016-07-29 | 1 | -137/+184 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix inefficient block split logic | Willem Jan Palenstijn | 2016-06-20 | 1 | -5/+19 |
| | * | | | | | Improve volume block reduction | Willem Jan Palenstijn | 2016-06-20 | 1 | -132/+165 |
| * | | | | | | Remove leftover code from Singleton | Willem Jan Palenstijn | 2016-07-28 | 1 | -5/+1 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Merge pull request #59 from wjp/spatial_filter | Willem Jan Palenstijn | 2016-07-28 | 1 | -7/+39 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Compute FBP filter in spatial domain | Willem Jan Palenstijn | 2016-06-24 | 1 | -7/+39 |
| |/ / / / | |||||
| | | | * | Merge branch 'master' into FDK | Willem Jan Palenstijn | 2016-04-22 | 4 | -327/+3395 |
| | | | |\ | |||||
| | | | * | | Use CompositeGeometryManager for FDK | Willem Jan Palenstijn | 2016-04-18 | 11 | -249/+240 |
| | | | * | | Add FDKWeighting option to standard cone_bp | Willem Jan Palenstijn | 2016-04-18 | 2 | -4/+12 |
| | | |/ / | | |/| | | |||||
| | * | | | Merge branch 'master' into aniso | Willem Jan Palenstijn | 2016-04-18 | 73 | -874/+1693 |
| | |\ \ \ | |||||
| | * | | | | Restrict FDK_CUDA to cube voxels for now | Willem Jan Palenstijn | 2016-04-18 | 1 | -0/+11 |
| | * | | | | Adapt 3D BP scaling to voxel size | Willem Jan Palenstijn | 2016-04-18 | 2 | -4/+8 |
| | * | | | | Move detector-independent vars out of loop | Willem Jan Palenstijn | 2016-04-18 | 1 | -14/+12 |
| | * | | | | Add voxel-size scaling to par3d_fp | Willem Jan Palenstijn | 2016-04-18 | 1 | -16/+92 |
| | * | | | | Refactor voxel size scaling CUDA kernel, and special-case cubes | Willem Jan Palenstijn | 2016-04-18 | 1 | -26/+62 |
| | * | | | | Process non-cubic-voxel astra geometries | Willem Jan Palenstijn | 2016-02-10 | 2 | -30/+37 |
| | * | | | | Add cone_fp kernel support for anisotropic voxels | Willem Jan Palenstijn | 2016-02-10 | 2 | -10/+31 |
| | * | | | | Refactor CUDA projector params into struct | Willem Jan Palenstijn | 2016-02-10 | 17 | -190/+185 |
* | | | | | | Add option to specify custom filter for FDK | Daniel M. Pelt | 2016-05-20 | 6 | -7/+48 |
|/ / / / / | |||||
* | | | | | Merge pull request #55 from wjp/singleton_construction | Willem Jan Palenstijn | 2016-05-17 | 1 | -4/+18 |
|\ \ \ \ \ | |||||
| * | | | | | Add sanity check | Willem Jan Palenstijn | 2016-05-17 | 1 | -2/+2 |
| * | | | | | Avoid defining singleton construction in header file | Willem Jan Palenstijn | 2016-05-17 | 1 | -4/+18 |
|/ / / / / | |||||
* | | | | | Merge pull request #47 from wjp/OpTomo_out | Willem Jan Palenstijn | 2016-04-26 | 2 | -43/+87 |
|\ \ \ \ \ | |||||
| * | | | | | Use FP/BP out argument in sample plugin | Willem Jan Palenstijn | 2016-04-26 | 1 | -13/+21 |
| * | | | | | Give OpTomo FP/BP functions with optional out argument | Willem Jan Palenstijn | 2016-04-25 | 1 | -30/+66 |
* | | | | | | Merge pull request #46 from dmpelt/python_cxx | Willem Jan Palenstijn | 2016-04-25 | 2 | -2/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add comment about setting CC to CXX | Daniel M. Pelt | 2016-04-19 | 1 | -0/+2 |
| * | | | | | | Use CXX for Python compilation as well | Daniel M. Pelt | 2016-04-19 | 2 | -2/+4 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #50 from wjp/data3d_dimensions | Willem Jan Palenstijn | 2016-04-25 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Reverse output of astra.data3d.dimensions | Willem Jan Palenstijn | 2016-04-25 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #49 from dmpelt/flatten_to_ravel | Willem Jan Palenstijn | 2016-04-25 | 4 | -7/+7 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Change flatten to ravel in Python code | Daniel M. Pelt | 2016-04-25 | 4 | -7/+7 |
|/ / / / | |||||
* | | | | Fix build | Willem Jan Palenstijn | 2016-04-22 | 1 | -1/+1 |
* | | | | Fix build | Willem Jan Palenstijn | 2016-04-22 | 3 | -132/+78 |
* | | | | Merge pull request #43 from adler-j/patch-1 | Willem Jan Palenstijn | 2016-04-22 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Fix missing backslash in readme.md install | Jonas Adler | 2016-04-19 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #48 from dmpelt/cpu_fft_fix | Willem Jan Palenstijn | 2016-04-22 | 3 | -309/+3382 |
|\ \ \ | |/ / |/| | | |||||
| * | | Change CPU FFT implementation | Daniel M. Pelt | 2016-04-22 | 3 | -309/+3382 |
|/ / | |||||
* | | Fix stringToInt parsing doubles | Willem Jan Palenstijn | 2016-04-18 | 1 | -1/+1 |