diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-10-11 15:04:23 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-10-11 15:04:23 +0200 |
| commit | 5ad3d86b6e2c39de7465186ec8702053a82b6152 (patch) | |
| tree | 260caa74def1712bf1d0811789a2205e8c55e2fc /matlab/tools/opTomo.m | |
| parent | 90a0bd4962ae21413456b27e55382ba5223e1c10 (diff) | |
| parent | 9c7d0f544b7a4dec54e9a75ea45b985ad7fac756 (diff) | |
| download | astra-5ad3d86b6e2c39de7465186ec8702053a82b6152.tar.gz astra-5ad3d86b6e2c39de7465186ec8702053a82b6152.tar.bz2 astra-5ad3d86b6e2c39de7465186ec8702053a82b6152.tar.xz astra-5ad3d86b6e2c39de7465186ec8702053a82b6152.zip | |
Merge branch 'master' into parallel_vec
Diffstat (limited to 'matlab/tools/opTomo.m')
| -rw-r--r-- | matlab/tools/opTomo.m | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/matlab/tools/opTomo.m b/matlab/tools/opTomo.m index 81de534..3ae1163 100644 --- a/matlab/tools/opTomo.m +++ b/matlab/tools/opTomo.m @@ -51,6 +51,8 @@ classdef opTomo < opSpot properties ( SetAccess = private, GetAccess = public ) proj_size vol_size + proj_geom + vol_geom end % properties %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -92,11 +94,9 @@ classdef opTomo < opSpot if gpuEnabled fp_alg = 'FP_CUDA'; bp_alg = 'BP_CUDA'; - proj_id = []; else fp_alg = 'FP'; bp_alg = 'BP'; - proj_id = astra_create_projector(type, proj_geom, vol_geom); end % configuration for ASTRA fp algorithm @@ -129,6 +129,7 @@ classdef opTomo < opSpot op.bp_alg_id = bp_alg_id; op.sino_id = sino_id; op.vol_id = vol_id; + else % 3D % only gpu/cuda code for 3D @@ -158,6 +159,8 @@ classdef opTomo < opSpot op.vol_size = vol_size; op.cflag = false; op.sweepflag = false; + op.proj_geom = proj_geom; + op.vol_geom = vol_geom; end % opTomo - constructor |