summaryrefslogtreecommitdiffstats
path: root/matlab
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <wjp@usecode.org>2015-12-01 12:18:16 +0100
committerWillem Jan Palenstijn <wjp@usecode.org>2015-12-01 12:18:16 +0100
commitdcfd15335549fa8e3e56260791cc4510331f7be6 (patch)
tree48c10731e8ed45224bbfda66a57e5b19225c9c10 /matlab
parent44fb28ed0045253f79064a5e09c00ba20abe95d2 (diff)
parentfb44faa449990400861f1869b52f5afc8fefe01b (diff)
downloadastra-dcfd15335549fa8e3e56260791cc4510331f7be6.tar.gz
astra-dcfd15335549fa8e3e56260791cc4510331f7be6.tar.bz2
astra-dcfd15335549fa8e3e56260791cc4510331f7be6.tar.xz
astra-dcfd15335549fa8e3e56260791cc4510331f7be6.zip
Merge pull request #94 from wjp/cuda_options2
Improve option passing via CudaProjector(2D/3D)
Diffstat (limited to 'matlab')
-rw-r--r--matlab/tools/astra_create_projector.m9
1 files changed, 7 insertions, 2 deletions
diff --git a/matlab/tools/astra_create_projector.m b/matlab/tools/astra_create_projector.m
index da9c083..9bbef9e 100644
--- a/matlab/tools/astra_create_projector.m
+++ b/matlab/tools/astra_create_projector.m
@@ -1,7 +1,7 @@
-function proj_id = astra_create_projector(type, proj_geom, vol_geom)
+function proj_id = astra_create_projector(type, proj_geom, vol_geom, options)
%--------------------------------------------------------------------------
-% proj_id = astra_create_projector(type, proj_geom, vol_geom)
+% proj_id = astra_create_projector(type, proj_geom, vol_geom, options)
%
% Create a new projector object based on projection and volume geometry.
% Used when the default values of each projector are sufficient.
@@ -9,6 +9,7 @@ function proj_id = astra_create_projector(type, proj_geom, vol_geom)
% type: type of the projector. 'blob', 'line', 'linear' 'strip', ... See API for more information.
% proj_geom: MATLAB struct containing the projection geometry.
% vol_geom: MATLAB struct containing the volume geometry.
+% options: Optional MATLAB struct containing projector options (like: 'GPUindex', 'DetectorSuperSampling', and 'VoxelSuperSampling')
% proj_id: identifier of the projector as it is now stored in the astra-library.
%--------------------------------------------------------------------------
%--------------------------------------------------------------------------
@@ -38,6 +39,10 @@ if strcmp(type,'blob')
cfg_proj.Kernel.KernelValues = blob_values;
end
+if exist('options', 'var')
+ cfg_proj.options = options;
+end
+
if strcmp(type,'linear3d') || strcmp(type,'linearcone') || strcmp(type,'cuda3d')
proj_id = astra_mex_projector3d('create', cfg_proj);
else