Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into parallel_vec | Willem Jan Palenstijn | 2017-11-22 | 2 | -20/+24 |
|\ | |||||
| * | Allow cone_vec for FDK | Willem Jan Palenstijn | 2017-11-22 | 2 | -3/+5 |
| | | | | | | | | | | | | NB: This will let you do mathematically nonsensical things, since FDK does not support non-circular cone geometries. However, this does let you use translated detectors, for example. | ||||
| * | Add experimental accumulate_FP/BP/FDK python functions | Willem Jan Palenstijn | 2017-11-22 | 1 | -17/+19 |
| | | |||||
* | | Merge branch 'master' into parallel_vec | Willem Jan Palenstijn | 2017-11-22 | 9 | -94/+54 |
|\| | |||||
| * | Remove unused code | Willem Jan Palenstijn | 2017-11-14 | 1 | -33/+0 |
| | | |||||
| * | Separate cuda from astra headers further | Willem Jan Palenstijn | 2017-11-01 | 4 | -0/+4 |
| | | |||||
| * | Remove unused code | Willem Jan Palenstijn | 2017-11-01 | 1 | -46/+0 |
| | | |||||
| * | Remove some unnecessary includes | Willem Jan Palenstijn | 2017-11-01 | 1 | -9/+0 |
| | | |||||
| * | Fix output initialization for MODE_ADD CGM jobs | Willem Jan Palenstijn | 2017-10-19 | 1 | -0/+6 |
| | | |||||
| * | Improve stringToFloatVector to match stringToDoubleVector | Willem Jan Palenstijn | 2017-10-17 | 1 | -8/+13 |
| | | |||||
| * | Add trailing ,/; to string repr of float vector/matrix | Willem Jan Palenstijn | 2017-10-17 | 2 | -8/+10 |
| | | | | | | | | | | This makes it possible to differentiate between a scalar and a one-element vector, and fixes #111. | ||||
| * | Reduce stringstream creation/imbue overhead | Willem Jan Palenstijn | 2017-10-17 | 2 | -7/+29 |
| | | |||||
* | | Fix warning | Willem Jan Palenstijn | 2017-10-16 | 1 | -1/+1 |
| | | |||||
* | | Fix geometry computation in unused function | Willem Jan Palenstijn | 2017-10-12 | 1 | -1/+1 |
| | | |||||
* | | Fix some warnings | Willem Jan Palenstijn | 2017-10-12 | 1 | -13/+0 |
| | | |||||
* | | Merge branch 'master' into parallel_vec | Willem Jan Palenstijn | 2017-10-11 | 1 | -5/+7 |
|\| | |||||
| * | Improve object creation error messages | Willem Jan Palenstijn | 2017-10-11 | 1 | -5/+7 |
| | | |||||
* | | Make geometry config checks slightly less numerically strict | Willem Jan Palenstijn | 2017-10-11 | 6 | -15/+15 |
| | | |||||
* | | Unify some parallel_vec parameter computations | Willem Jan Palenstijn | 2017-09-27 | 1 | -5/+19 |
| | | |||||
* | | Merge branch 'master' into parallel_vec | Willem Jan Palenstijn | 2017-09-15 | 85 | -1093/+814 |
|\| | |||||
| * | Fix misleading indentation | Willem Jan Palenstijn | 2017-05-22 | 1 | -2/+2 |
| | | |||||
| * | Fix warnings | Willem Jan Palenstijn | 2017-02-08 | 1 | -8/+9 |
| | | |||||
| * | Start work on CFloat32Data3DGPU to allow persistent/external GPU memory | Willem Jan Palenstijn | 2017-02-08 | 11 | -66/+486 |
| | | |||||
| * | Remove unused 3d global min/max | Willem Jan Palenstijn | 2017-02-08 | 1 | -38/+0 |
| | | |||||
| * | Remove unused data3d functions | Willem Jan Palenstijn | 2017-02-08 | 4 | -634/+0 |
| | | |||||
| * | Remove unused function | Willem Jan Palenstijn | 2017-02-08 | 1 | -0/+1 |
| | | |||||
| * | Fix VolumeGeometry class name in error messages | Willem Jan Palenstijn | 2017-01-12 | 2 | -5/+5 |
| | | |||||
| * | Expose the density weighting option of cone_bp | Willem Jan Palenstijn | 2016-12-01 | 2 | -1/+14 |
| | | | | | | | | It is now exposed via the new DensityWeighting option of CudaProjector3D. | ||||
| * | Fix warnings | Willem Jan Palenstijn | 2016-11-28 | 2 | -2/+2 |
| | | |||||
| * | Update headers (website+2016) | Willem Jan Palenstijn | 2016-11-28 | 82 | -327/+246 |
| | | |||||
| * | Merge branch 'fdk_custom_filter' | Willem Jan Palenstijn | 2016-11-28 | 2 | -5/+38 |
| |\ | |||||
| | * | Merge branch 'master' into fdk_custom_filter | Willem Jan Palenstijn | 2016-10-13 | 3 | -160/+279 |
| | |\ | |||||
| | * | | Add option to specify custom filter for FDK | Daniel M. Pelt | 2016-05-20 | 1 | -1/+32 |
| | | | | |||||
| * | | | Change order of template instantiations for clang | Willem Jan Palenstijn | 2016-11-25 | 2 | -11/+11 |
| | | | | | | | | | | | | | | | | At least Apple's clang-703.0.31 needs this. | ||||
| * | | | Fix hardcoded delim in splitString | Willem Jan Palenstijn | 2016-11-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix build with MS VS 2015 CE | Alexey Buzmakov | 2016-11-04 | 6 | -0/+6 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' into parallel_vec | Willem Jan Palenstijn | 2016-10-07 | 3 | -154/+271 |
|\| | | |||||
| * | | Merge branch 'master' into FDK | Willem Jan Palenstijn | 2016-10-06 | 4 | -282/+281 |
| |\ \ | |||||
| | * \ | Merge pull request #62 from wjp/stringutil | Willem Jan Palenstijn | 2016-07-29 | 1 | -14/+20 |
| | |\ \ | | | | | | | | | | | Minor string parsing changes | ||||
| | | * | | Replace use of boost::split by own function | Willem Jan Palenstijn | 2016-07-28 | 1 | -14/+20 |
| | | |/ | |||||
| | * | | 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 |
| | |/ | | | | | | | | | | | | | The previous version would make the blocks too large due to inefficient computation of overlap. | ||||
| * | | Merge branch 'master' into FDK | Willem Jan Palenstijn | 2016-04-22 | 2 | -221/+3338 |
| |\ \ | |||||
| * | | | Use CompositeGeometryManager for FDK | Willem Jan Palenstijn | 2016-04-18 | 2 | -3/+56 |
| | | | | | | | | | | | | | | | | | | | | Also fix a number of scaling/weighting issues in FDK, and switch to standard cone_bp with FDKWeighting for the BP step. | ||||
| * | | | Merge branch 'master' into aniso | Willem Jan Palenstijn | 2016-04-18 | 15 | -451/+368 |
| |\ \ \ | |||||
| * | | | | Restrict FDK_CUDA to cube voxels for now | Willem Jan Palenstijn | 2016-04-18 | 1 | -0/+11 |
| | | | | | |||||
* | | | | | Add CUDA parvec support | Willem Jan Palenstijn | 2016-07-29 | 7 | -326/+242 |
| | | | | | |||||
* | | | | | Merge branch 'master' into parvec | Willem Jan Palenstijn | 2016-07-28 | 61 | -1089/+6036 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Fix build | Willem Jan Palenstijn | 2016-04-22 | 2 | -131/+77 |
| | |_|/ | |/| | | |||||
| * | | | Change CPU FFT implementation | Daniel M. Pelt | 2016-04-22 | 2 | -221/+3338 |
| | |/ | |/| |