summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into fdk_custom_filterWillem Jan Palenstijn2016-10-1330-714/+863
|\
| * Clean up unused variablesWillem Jan Palenstijn2016-10-131-29/+0
| |
| * Increase max angle count for Parker WeightingWillem Jan Palenstijn2016-10-131-1/+1
| |
| * Merge pull request #42 from wjp/FDKWillem Jan Palenstijn2016-10-0713-254/+208
| |\ | | | | | | Use CompositeGeometryManager for FDK
| | * Merge branch 'master' into FDKWillem Jan Palenstijn2016-10-070-0/+0
| | |\ | | |/ | |/|
| * | Merge pull request #41 from wjp/anisoWillem Jan Palenstijn2016-10-0719-238/+386
| |\ \ | | | | | | | | Add support for non-cube voxels
| | * \ 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
| |\ \ \ \ | | | | | | | | | | | | Minor string parsing changes
| | * | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | Improve efficiency of CGM volume block reduction
| | * | | | | Fix inefficient block split logicWillem Jan Palenstijn2016-06-201-5/+19
| | | | | | |
| | * | | | | Improve volume block reductionWillem Jan Palenstijn2016-06-201-132/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous version would make the blocks too large due to inefficient computation of overlap.
| * | | | | | 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 domain
| | * | | | Compute FBP filter in spatial domainWillem Jan Palenstijn2016-06-241-7/+39
| |/ / / /
| | | | * Merge branch 'master' into FDKWillem Jan Palenstijn2016-04-224-327/+3395
| | | | |\
| | | | * | Use CompositeGeometryManager for FDKWillem Jan Palenstijn2016-04-1811-249/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix a number of scaling/weighting issues in FDK, and switch to standard cone_bp with FDKWeighting for the BP step.
| | | | * | Add FDKWeighting option to standard cone_bpWillem Jan Palenstijn2016-04-182-4/+12
| | | |/ / | | |/| |
| | * | | Merge branch 'master' into anisoWillem Jan Palenstijn2016-04-1873-874/+1693
| | |\ \ \
| | * | | | Restrict FDK_CUDA to cube voxels for nowWillem Jan Palenstijn2016-04-181-0/+11
| | | | | |
| | * | | | Adapt 3D BP scaling to voxel sizeWillem Jan Palenstijn2016-04-182-4/+8
| | | | | |
| | * | | | Move detector-independent vars out of loopWillem Jan Palenstijn2016-04-181-14/+12
| | | | | |
| | * | | | Add voxel-size scaling to par3d_fpWillem Jan Palenstijn2016-04-181-16/+92
| | | | | |
| | * | | | Refactor voxel size scaling CUDA kernel, and special-case cubesWillem Jan Palenstijn2016-04-181-26/+62
| | | | | |
| | * | | | Process non-cubic-voxel astra geometriesWillem Jan Palenstijn2016-02-102-30/+37
| | | | | |
| | * | | | Add cone_fp kernel support for anisotropic voxelsWillem Jan Palenstijn2016-02-102-10/+31
| | | | | |
| | * | | | Refactor CUDA projector params into structWillem Jan Palenstijn2016-02-1017-190/+185
| | | | | |
* | | | | | Add option to specify custom filter for FDKDaniel M. Pelt2016-05-206-7/+48
|/ / / / /
* | | | | Merge pull request #55 from wjp/singleton_constructionWillem Jan Palenstijn2016-05-171-4/+18
|\ \ \ \ \ | | | | | | | | | | | | Avoid defining singleton construction in header file
| * | | | | Add sanity checkWillem Jan Palenstijn2016-05-171-2/+2
| | | | | |
| * | | | | Avoid defining singleton construction in header fileWillem Jan Palenstijn2016-05-171-4/+18
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That way, the call to new is always executed by code inside libastra. This avoids the situation where a singleton gets created by a copy of the constructor linked into an object file outside of libastra, such as a .mex file, which would then also cause the vtable to be outside of libastra. This situation would cause issues when .mex files are unloaded.
* | | | | Merge pull request #47 from wjp/OpTomo_outWillem Jan Palenstijn2016-04-262-43/+87
|\ \ \ \ \ | | | | | | | | | | | | Give OpTomo FP/BP functions with optional out argument
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | This allows more efficient use of allocated arrays.
* | | | | | Merge pull request #46 from dmpelt/python_cxxWillem Jan Palenstijn2016-04-252-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use CXX for Python compilation as well
| * | | | | | 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.dimensions
| * | | | | Reverse output of astra.data3d.dimensionsWillem Jan Palenstijn2016-04-251-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | This makes the output directly usable in numpy commands like zeros, reshape. We were not using data3d.dimensions ourselves, as far as I can tell.
* | | | | Merge pull request #49 from dmpelt/flatten_to_ravelWillem Jan Palenstijn2016-04-254-7/+7
|\ \ \ \ \ | |/ / / / |/| | | | Change flatten to ravel in Python code
| * | | | 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 install
| * | | Fix missing backslash in readme.md installJonas Adler2016-04-191-1/+1
| |/ /
* | | Merge pull request #48 from dmpelt/cpu_fft_fixWillem Jan Palenstijn2016-04-223-309/+3382
|\ \ \ | |/ / |/| | Change CPU FFT implementation
| * | Change CPU FFT implementationDaniel M. Pelt2016-04-223-309/+3382
|/ /
* | Fix stringToInt parsing doublesWillem Jan Palenstijn2016-04-181-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 02:23:31 +0000