From dd24cce853ff3b28035b8723ab271cafb4272917 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 22 Sep 2017 17:26:09 +0200 Subject: Remove duplicate creation of projector in opTomo Thanks to @NathanielSix for the report. --- matlab/tools/opTomo.m | 2 -- 1 file changed, 2 deletions(-) (limited to 'matlab/tools/opTomo.m') diff --git a/matlab/tools/opTomo.m b/matlab/tools/opTomo.m index 81de534..aed2f29 100644 --- a/matlab/tools/opTomo.m +++ b/matlab/tools/opTomo.m @@ -92,11 +92,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 -- cgit v1.2.3 From ae9a45df6da93742d0edbbbc3d57e5497b119839 Mon Sep 17 00:00:00 2001 From: vincentvn Date: Thu, 5 Oct 2017 13:48:01 +0200 Subject: added vol_geom and proj_geom to the properties (#120) Add vol_geom and proj_geom to the properties The opTomo operator has the volume and projection geometries as properties ( SetAccess = private, GetAccess = public ). This way you can all easily access all information about the geometry if you passed the opTomo object to a function. --- matlab/tools/opTomo.m | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'matlab/tools/opTomo.m') diff --git a/matlab/tools/opTomo.m b/matlab/tools/opTomo.m index aed2f29..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 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -127,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 @@ -156,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 -- cgit v1.2.3