Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 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 branch 'master' into FDK | Willem Jan Palenstijn | 2016-04-22 | 4 | -327/+3395 |
| | | |\ | |_|_|/ |/| | | | |||||
* | | | | 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 |
|/ / / | |||||
| | * | 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 |
| |\ | |/ |/| | |||||
* | | Fix stringToInt parsing doubles | Willem Jan Palenstijn | 2016-04-18 | 1 | -1/+1 |
* | | Merge pull request #29 from wjp/indexmanager | Willem Jan Palenstijn | 2016-04-15 | 9 | -45/+243 |
|\ \ | |||||
| * | | Fix build | Willem Jan Palenstijn | 2016-03-01 | 1 | -6/+6 |
| * | | Merge branch 'master' into indexmanager | Willem Jan Palenstijn | 2016-03-01 | 25 | -677/+1097 |
| |\ \ | |||||
| * | | | Add missing help | Willem Jan Palenstijn | 2016-02-22 | 1 | -1/+1 |
| * | | | Add python astra.astra delete/info based on index manager | Willem Jan Palenstijn | 2016-02-17 | 3 | -2/+88 |
| * | | | Slightly simplify CAstraObjectManager::remove | Willem Jan Palenstijn | 2016-02-16 | 1 | -3/+2 |
| * | | | Add astra_mex delete/info based on index manager | Willem Jan Palenstijn | 2016-02-16 | 2 | -0/+50 |
| * | | | Also remove objects from index manager | Willem Jan Palenstijn | 2016-02-16 | 1 | -1/+10 |
| * | | | Refactor AstraObjectManager to add an AstraIndexManager | Willem Jan Palenstijn | 2016-02-16 | 5 | -38/+94 |
* | | | | Merge pull request #35 from wjp/relaxation | Willem Jan Palenstijn | 2016-04-14 | 24 | -52/+173 |
|\ \ \ \ | |||||
| * | | | | Add relaxation parameters to SIRT3D | Willem Jan Palenstijn | 2016-03-23 | 6 | -2/+37 |
| * | | | | Add relaxation parameters to SIRT, SART | Willem Jan Palenstijn | 2016-03-23 | 14 | -12/+96 |