diff options
Diffstat (limited to 'samples')
41 files changed, 280 insertions, 120 deletions
diff --git a/samples/matlab/s001_sinogram_par2d.m b/samples/matlab/s001_sinogram_par2d.m index 0295cdf..5c49758 100644 --- a/samples/matlab/s001_sinogram_par2d.m +++ b/samples/matlab/s001_sinogram_par2d.m @@ -1,10 +1,10 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -% 2014-2016, CWI, Amsterdam +% Copyright: 2010-2018, imec Vision Lab, University of Antwerp +% 2014-2018, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: astra@uantwerpen.be +% Contact: astra@astra-toolbox.com % Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- diff --git a/samples/matlab/s002_data2d.m b/samples/matlab/s002_data2d.m index b082cb3..f075291 100644 --- a/samples/matlab/s002_data2d.m +++ b/samples/matlab/s002_data2d.m @@ -1,10 +1,10 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -% 2014-2016, CWI, Amsterdam +% Copyright: 2010-2018, imec Vision Lab, University of Antwerp +% 2014-2018, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: astra@uantwerpen.be +% Contact: astra@astra-toolbox.com % Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- diff --git a/samples/matlab/s003_gpu_reconstruction.m b/samples/matlab/s003_gpu_reconstruction.m index d98f720..4a2cec7 100644 --- a/samples/matlab/s003_gpu_reconstruction.m +++ b/samples/matlab/s003_gpu_reconstruction.m @@ -1,10 +1,10 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -% 2014-2016, CWI, Amsterdam +% Copyright: 2010-2018, imec Vision Lab, University of Antwerp +% 2014-2018, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: astra@uantwerpen.be +% Contact: astra@astra-toolbox.com % Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- diff --git a/samples/matlab/s004_cpu_reconstruction.m b/samples/matlab/s004_cpu_reconstruction.m index 96f892a..c3b7a95 100644 --- a/samples/matlab/s004_cpu_reconstruction.m +++ b/samples/matlab/s004_cpu_reconstruction.m @@ -1,10 +1,10 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -% 2014-2016, CWI, Amsterdam +% Copyright: 2010-2018, imec Vision Lab, University of Antwerp +% 2014-2018, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: astra@uantwerpen.be +% Contact: astra@astra-toolbox.com % Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- diff --git a/samples/matlab/s005_3d_geometry.m b/samples/matlab/s005_3d_geometry.m index 227dccd..df3ffad 100644 --- a/samples/matlab/s005_3d_geometry.m +++ b/samples/matlab/s005_3d_geometry.m @@ -1,10 +1,10 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -% 2014-2016, CWI, Amsterdam +% Copyright: 2010-2018, imec Vision Lab, University of Antwerp +% 2014-2018, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: astra@uantwerpen.be +% Contact: astra@astra-toolbox.com % Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- diff --git a/samples/matlab/s006_3d_data.m b/samples/matlab/s006_3d_data.m index dd45550..9fac2f8 100644 --- a/samples/matlab/s006_3d_data.m +++ b/samples/matlab/s006_3d_data.m @@ -1,10 +1,10 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -% 2014-2016, CWI, Amsterdam +% Copyright: 2010-2018, imec Vision Lab, University of Antwerp +% 2014-2018, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: astra@uantwerpen.be +% Contact: astra@astra-toolbox.com % Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- diff --git a/samples/matlab/s007_3d_reconstruction.m b/samples/matlab/s007_3d_reconstruction.m index 17c5d8c..6e47490 100644 --- a/samples/matlab/s007_3d_reconstruction.m +++ b/samples/matlab/s007_3d_reconstruction.m @@ -1,10 +1,10 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -% 2014-2016, CWI, Amsterdam +% Copyright: 2010-2018, imec Vision Lab, University of Antwerp +% 2014-2018, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: astra@uantwerpen.be +% Contact: astra@astra-toolbox.com % Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- diff --git a/samples/matlab/s008_gpu_selection.m b/samples/matlab/s008_gpu_selection.m index 7a24028..4cf7392 100644 --- a/samples/matlab/s008_gpu_selection.m +++ b/samples/matlab/s008_gpu_selection.m @@ -1,10 +1,10 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -% 2014-2016, CWI, Amsterdam +% Copyright: 2010-2018, imec Vision Lab, University of Antwerp +% 2014-2018, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: astra@uantwerpen.be +% Contact: astra@astra-toolbox.com % Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- diff --git a/samples/matlab/s009_projection_matrix.m b/samples/matlab/s009_projection_matrix.m index 645986b..b272be9 100644 --- a/samples/matlab/s009_projection_matrix.m +++ b/samples/matlab/s009_projection_matrix.m @@ -1,10 +1,10 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -% 2014-2016, CWI, Amsterdam +% Copyright: 2010-2018, imec Vision Lab, University of Antwerp +% 2014-2018, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: astra@uantwerpen.be +% Contact: astra@astra-toolbox.com % Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- diff --git a/samples/matlab/s010_supersampling.m b/samples/matlab/s010_supersampling.m index 86a973d..7e52bc9 100644 --- a/samples/matlab/s010_supersampling.m +++ b/samples/matlab/s010_supersampling.m @@ -1,10 +1,10 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -% 2014-2016, CWI, Amsterdam +% Copyright: 2010-2018, imec Vision Lab, University of Antwerp +% 2014-2018, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: astra@uantwerpen.be +% Contact: astra@astra-toolbox.com % Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- diff --git a/samples/matlab/s011_object_info.m b/samples/matlab/s011_object_info.m index 85665fd..96aff2a 100644 --- a/samples/matlab/s011_object_info.m +++ b/samples/matlab/s011_object_info.m @@ -1,10 +1,10 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -% 2014-2016, CWI, Amsterdam +% Copyright: 2010-2018, imec Vision Lab, University of Antwerp +% 2014-2018, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: astra@uantwerpen.be +% Contact: astra@astra-toolbox.com % Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- diff --git a/samples/matlab/s012_masks.m b/samples/matlab/s012_masks.m index 26d48a2..9914f4b 100644 --- a/samples/matlab/s012_masks.m +++ b/samples/matlab/s012_masks.m @@ -1,10 +1,10 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -% 2014-2016, CWI, Amsterdam +% Copyright: 2010-2018, imec Vision Lab, University of Antwerp +% 2014-2018, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: astra@uantwerpen.be +% Contact: astra@astra-toolbox.com % Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- diff --git a/samples/matlab/s013_constraints.m b/samples/matlab/s013_constraints.m index 07bdb05..aaaf4d1 100644 --- a/samples/matlab/s013_constraints.m +++ b/samples/matlab/s013_constraints.m @@ -1,10 +1,10 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -% 2014-2016, CWI, Amsterdam +% Copyright: 2010-2018, imec Vision Lab, University of Antwerp +% 2014-2018, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: astra@uantwerpen.be +% Contact: astra@astra-toolbox.com % Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- diff --git a/samples/matlab/s014_FBP.m b/samples/matlab/s014_FBP.m index 4d1de13..1fc6f90 100644 --- a/samples/matlab/s014_FBP.m +++ b/samples/matlab/s014_FBP.m @@ -1,15 +1,15 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -% 2014-2016, CWI, Amsterdam +% Copyright: 2010-2018, imec Vision Lab, University of Antwerp +% 2014-2018, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: astra@uantwerpen.be +% Contact: astra@astra-toolbox.com % Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- vol_geom = astra_create_vol_geom(256, 256); -proj_geom = astra_create_proj_geom('parallel', 1.0, 384, linspace2(0,pi,180)); +proj_geom = astra_create_proj_geom('fanflat', 1.0, 384, linspace2(0,2*pi,1800), 500, 0); % As before, create a sinogram from a phantom P = phantom(256); diff --git a/samples/matlab/s015_fp_bp.m b/samples/matlab/s015_fp_bp.m index 56c5ed4..34235d4 100644 --- a/samples/matlab/s015_fp_bp.m +++ b/samples/matlab/s015_fp_bp.m @@ -1,10 +1,10 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -% 2014-2016, CWI, Amsterdam +% Copyright: 2010-2018, imec Vision Lab, University of Antwerp +% 2014-2018, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: astra@uantwerpen.be +% Contact: astra@astra-toolbox.com % Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- diff --git a/samples/matlab/s016_plots.m b/samples/matlab/s016_plots.m index 56f47d8..ac7c169 100644 --- a/samples/matlab/s016_plots.m +++ b/samples/matlab/s016_plots.m @@ -1,10 +1,10 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -% 2014-2016, CWI, Amsterdam +% Copyright: 2010-2018, imec Vision Lab, University of Antwerp +% 2014-2018, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: astra@uantwerpen.be +% Contact: astra@astra-toolbox.com % Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- diff --git a/samples/matlab/s017_opTomo.m b/samples/matlab/s017_opTomo.m index 71f8d55..175287a 100644 --- a/samples/matlab/s017_opTomo.m +++ b/samples/matlab/s017_opTomo.m @@ -1,10 +1,10 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -% 2014-2016, CWI, Amsterdam +% Copyright: 2010-2018, imec Vision Lab, University of Antwerp +% 2014-2018, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: astra@uantwerpen.be +% Contact: astra@astra-toolbox.com % Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- diff --git a/samples/matlab/s020_3d_multiGPU.m b/samples/matlab/s020_3d_multiGPU.m index 46b984e..e793848 100644 --- a/samples/matlab/s020_3d_multiGPU.m +++ b/samples/matlab/s020_3d_multiGPU.m @@ -1,10 +1,10 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -% 2014-2016, CWI, Amsterdam +% Copyright: 2010-2018, imec Vision Lab, University of Antwerp +% 2014-2018, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: astra@uantwerpen.be +% Contact: astra@astra-toolbox.com % Website: http://www.astra-toolbox.com/ % ----------------------------------------------------------------------- diff --git a/samples/matlab/s022_fbp_cor.m b/samples/matlab/s022_fbp_cor.m new file mode 100644 index 0000000..2820541 --- /dev/null +++ b/samples/matlab/s022_fbp_cor.m @@ -0,0 +1,66 @@ +% ----------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2018, imec Vision Lab, University of Antwerp +% 2014-2018, CWI, Amsterdam +% License: Open Source under GPLv3 +% Contact: astra@astra-toolbox.com +% Website: http://www.astra-toolbox.com/ +% ----------------------------------------------------------------------- + +cor_shift = 3.6; + +vol_geom = astra_create_vol_geom(256, 256); +proj_geom = astra_create_proj_geom('parallel', 1.0, 256, linspace2(0,pi,180)); + +% Projection geometry with shifted center of rotation +proj_geom_cor = astra_geom_postalignment(proj_geom, cor_shift); + +% As before, create a sinogram from a phantom, using the shifted center of rotation +P = phantom(256); +[sinogram_id, sinogram] = astra_create_sino_gpu(P, proj_geom_cor, vol_geom); +figure(1); imshow(P, []); +figure(2); imshow(sinogram, []); + +astra_mex_data2d('delete', sinogram_id); + +% We now re-create the sinogram data object as we would do when loading +% an external sinogram, using a standard geometry, and try to do a reconstruction, +% to show the misalignment artifacts caused by the shifted center of rotation +sinogram_id = astra_mex_data2d('create', '-sino', proj_geom, sinogram); + +% Create a data object for the reconstruction +rec_id = astra_mex_data2d('create', '-vol', vol_geom); + +% Set up the parameters for a reconstruction algorithm using the GPU +cfg = astra_struct('FBP_CUDA'); +cfg.ReconstructionDataId = rec_id; +cfg.ProjectionDataId = sinogram_id; +alg_id = astra_mex_algorithm('create', cfg); +astra_mex_algorithm('run', alg_id); + +% Get the result +rec = astra_mex_data2d('get', rec_id); +figure(3); imshow(rec, []); + +astra_mex_algorithm('delete', alg_id); +astra_mex_data2d('delete', rec_id); + +% Now change back to the proper, shifted geometry, and do another reconstruction +astra_mex_data2d('change_geometry', sinogram_id, proj_geom_cor); +rec_id = astra_mex_data2d('create', '-vol', vol_geom); + +cfg = astra_struct('FBP_CUDA'); +cfg.ReconstructionDataId = rec_id; +cfg.ProjectionDataId = sinogram_id; +alg_id = astra_mex_algorithm('create', cfg); +astra_mex_algorithm('run', alg_id); + +% Get the result +rec = astra_mex_data2d('get', rec_id); +figure(4); imshow(rec, []); + + +astra_mex_algorithm('delete', alg_id); +astra_mex_data2d('delete', rec_id); +astra_mex_data2d('delete', sinogram_id); diff --git a/samples/python/s001_sinogram_par2d.py b/samples/python/s001_sinogram_par2d.py index 11ca748..cad3312 100644 --- a/samples/python/s001_sinogram_par2d.py +++ b/samples/python/s001_sinogram_par2d.py @@ -1,8 +1,8 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -# 2013-2016, CWI, Amsterdam +# Copyright: 2010-2018, imec Vision Lab, University of Antwerp +# 2013-2018, CWI, Amsterdam # -# Contact: astra@uantwerpen.be +# Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ # # This file is part of the ASTRA Toolbox. diff --git a/samples/python/s002_data2d.py b/samples/python/s002_data2d.py index b7fc969..764d328 100644 --- a/samples/python/s002_data2d.py +++ b/samples/python/s002_data2d.py @@ -1,8 +1,8 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -# 2013-2016, CWI, Amsterdam +# Copyright: 2010-2018, imec Vision Lab, University of Antwerp +# 2013-2018, CWI, Amsterdam # -# Contact: astra@uantwerpen.be +# Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ # # This file is part of the ASTRA Toolbox. diff --git a/samples/python/s003_gpu_reconstruction.py b/samples/python/s003_gpu_reconstruction.py index 1a94b55..598d965 100644 --- a/samples/python/s003_gpu_reconstruction.py +++ b/samples/python/s003_gpu_reconstruction.py @@ -1,8 +1,8 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -# 2013-2016, CWI, Amsterdam +# Copyright: 2010-2018, imec Vision Lab, University of Antwerp +# 2013-2018, CWI, Amsterdam # -# Contact: astra@uantwerpen.be +# Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ # # This file is part of the ASTRA Toolbox. diff --git a/samples/python/s004_cpu_reconstruction.py b/samples/python/s004_cpu_reconstruction.py index 3b6ffbe..8b632fc 100644 --- a/samples/python/s004_cpu_reconstruction.py +++ b/samples/python/s004_cpu_reconstruction.py @@ -1,8 +1,8 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -# 2013-2016, CWI, Amsterdam +# Copyright: 2010-2018, imec Vision Lab, University of Antwerp +# 2013-2018, CWI, Amsterdam # -# Contact: astra@uantwerpen.be +# Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ # # This file is part of the ASTRA Toolbox. diff --git a/samples/python/s005_3d_geometry.py b/samples/python/s005_3d_geometry.py index cd48b1e..24f1a3e 100644 --- a/samples/python/s005_3d_geometry.py +++ b/samples/python/s005_3d_geometry.py @@ -1,8 +1,8 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -# 2013-2016, CWI, Amsterdam +# Copyright: 2010-2018, imec Vision Lab, University of Antwerp +# 2013-2018, CWI, Amsterdam # -# Contact: astra@uantwerpen.be +# Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ # # This file is part of the ASTRA Toolbox. diff --git a/samples/python/s006_3d_data.py b/samples/python/s006_3d_data.py index 50efd99..7f2f955 100644 --- a/samples/python/s006_3d_data.py +++ b/samples/python/s006_3d_data.py @@ -1,8 +1,8 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -# 2013-2016, CWI, Amsterdam +# Copyright: 2010-2018, imec Vision Lab, University of Antwerp +# 2013-2018, CWI, Amsterdam # -# Contact: astra@uantwerpen.be +# Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ # # This file is part of the ASTRA Toolbox. diff --git a/samples/python/s007_3d_reconstruction.py b/samples/python/s007_3d_reconstruction.py index 85d029a..c7283a1 100644 --- a/samples/python/s007_3d_reconstruction.py +++ b/samples/python/s007_3d_reconstruction.py @@ -1,8 +1,8 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -# 2013-2016, CWI, Amsterdam +# Copyright: 2010-2018, imec Vision Lab, University of Antwerp +# 2013-2018, CWI, Amsterdam # -# Contact: astra@uantwerpen.be +# Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ # # This file is part of the ASTRA Toolbox. diff --git a/samples/python/s008_gpu_selection.py b/samples/python/s008_gpu_selection.py index 9fa9d49..21ce762 100644 --- a/samples/python/s008_gpu_selection.py +++ b/samples/python/s008_gpu_selection.py @@ -1,8 +1,8 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -# 2013-2016, CWI, Amsterdam +# Copyright: 2010-2018, imec Vision Lab, University of Antwerp +# 2013-2018, CWI, Amsterdam # -# Contact: astra@uantwerpen.be +# Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ # # This file is part of the ASTRA Toolbox. diff --git a/samples/python/s009_projection_matrix.py b/samples/python/s009_projection_matrix.py index dccaa4b..cd4cf63 100644 --- a/samples/python/s009_projection_matrix.py +++ b/samples/python/s009_projection_matrix.py @@ -1,8 +1,8 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -# 2013-2016, CWI, Amsterdam +# Copyright: 2010-2018, imec Vision Lab, University of Antwerp +# 2013-2018, CWI, Amsterdam # -# Contact: astra@uantwerpen.be +# Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ # # This file is part of the ASTRA Toolbox. diff --git a/samples/python/s010_supersampling.py b/samples/python/s010_supersampling.py index 42d7296..fb6cf59 100644 --- a/samples/python/s010_supersampling.py +++ b/samples/python/s010_supersampling.py @@ -1,8 +1,8 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -# 2013-2016, CWI, Amsterdam +# Copyright: 2010-2018, imec Vision Lab, University of Antwerp +# 2013-2018, CWI, Amsterdam # -# Contact: astra@uantwerpen.be +# Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ # # This file is part of the ASTRA Toolbox. diff --git a/samples/python/s011_object_info.py b/samples/python/s011_object_info.py index 3442a9f..84da6f8 100644 --- a/samples/python/s011_object_info.py +++ b/samples/python/s011_object_info.py @@ -1,8 +1,8 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -# 2013-2016, CWI, Amsterdam +# Copyright: 2010-2018, imec Vision Lab, University of Antwerp +# 2013-2018, CWI, Amsterdam # -# Contact: astra@uantwerpen.be +# Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ # # This file is part of the ASTRA Toolbox. diff --git a/samples/python/s012_masks.py b/samples/python/s012_masks.py index 073515f..d7f5352 100644 --- a/samples/python/s012_masks.py +++ b/samples/python/s012_masks.py @@ -1,8 +1,8 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -# 2013-2016, CWI, Amsterdam +# Copyright: 2010-2018, imec Vision Lab, University of Antwerp +# 2013-2018, CWI, Amsterdam # -# Contact: astra@uantwerpen.be +# Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ # # This file is part of the ASTRA Toolbox. diff --git a/samples/python/s013_constraints.py b/samples/python/s013_constraints.py index ca8b2d8..b9bf6e4 100644 --- a/samples/python/s013_constraints.py +++ b/samples/python/s013_constraints.py @@ -1,8 +1,8 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -# 2013-2016, CWI, Amsterdam +# Copyright: 2010-2018, imec Vision Lab, University of Antwerp +# 2013-2018, CWI, Amsterdam # -# Contact: astra@uantwerpen.be +# Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ # # This file is part of the ASTRA Toolbox. diff --git a/samples/python/s014_FBP.py b/samples/python/s014_FBP.py index 051eff7..f7cefd4 100644 --- a/samples/python/s014_FBP.py +++ b/samples/python/s014_FBP.py @@ -1,8 +1,8 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -# 2013-2016, CWI, Amsterdam +# Copyright: 2010-2018, imec Vision Lab, University of Antwerp +# 2013-2018, CWI, Amsterdam # -# Contact: astra@uantwerpen.be +# Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ # # This file is part of the ASTRA Toolbox. diff --git a/samples/python/s015_fp_bp.py b/samples/python/s015_fp_bp.py index 5d5e945..10a4585 100644 --- a/samples/python/s015_fp_bp.py +++ b/samples/python/s015_fp_bp.py @@ -1,8 +1,8 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -# 2013-2016, CWI, Amsterdam +# Copyright: 2010-2018, imec Vision Lab, University of Antwerp +# 2013-2018, CWI, Amsterdam # -# Contact: astra@uantwerpen.be +# Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ # # This file is part of the ASTRA Toolbox. diff --git a/samples/python/s016_plots.py b/samples/python/s016_plots.py index cc2a53a..0cacc94 100644 --- a/samples/python/s016_plots.py +++ b/samples/python/s016_plots.py @@ -1,8 +1,8 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -# 2013-2016, CWI, Amsterdam +# Copyright: 2010-2018, imec Vision Lab, University of Antwerp +# 2013-2018, CWI, Amsterdam # -# Contact: astra@uantwerpen.be +# Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ # # This file is part of the ASTRA Toolbox. diff --git a/samples/python/s017_OpTomo.py b/samples/python/s017_OpTomo.py index b568570..f26d91d 100644 --- a/samples/python/s017_OpTomo.py +++ b/samples/python/s017_OpTomo.py @@ -1,8 +1,8 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -# 2013-2016, CWI, Amsterdam +# Copyright: 2010-2018, imec Vision Lab, University of Antwerp +# 2013-2018, CWI, Amsterdam # -# Contact: astra@uantwerpen.be +# Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ # # This file is part of the ASTRA Toolbox. diff --git a/samples/python/s018_plugin.py b/samples/python/s018_plugin.py index dbd9274..e2ff6f5 100644 --- a/samples/python/s018_plugin.py +++ b/samples/python/s018_plugin.py @@ -1,8 +1,8 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -# 2013-2016, CWI, Amsterdam +# Copyright: 2010-2018, imec Vision Lab, University of Antwerp +# 2013-2018, CWI, Amsterdam # -# Contact: astra@uantwerpen.be +# Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ # # This file is part of the ASTRA Toolbox. diff --git a/samples/python/s019_experimental_multires.py b/samples/python/s019_experimental_multires.py index 1aff223..9b26eca 100644 --- a/samples/python/s019_experimental_multires.py +++ b/samples/python/s019_experimental_multires.py @@ -1,8 +1,8 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -# 2013-2016, CWI, Amsterdam +# Copyright: 2010-2018, imec Vision Lab, University of Antwerp +# 2013-2018, CWI, Amsterdam # -# Contact: astra@uantwerpen.be +# Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ # # This file is part of the ASTRA Toolbox. diff --git a/samples/python/s020_3d_multiGPU.py b/samples/python/s020_3d_multiGPU.py index e872870..5e65d87 100644 --- a/samples/python/s020_3d_multiGPU.py +++ b/samples/python/s020_3d_multiGPU.py @@ -1,8 +1,8 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -# 2013-2016, CWI, Amsterdam +# Copyright: 2010-2018, imec Vision Lab, University of Antwerp +# 2013-2018, CWI, Amsterdam # -# Contact: astra@uantwerpen.be +# Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ # # This file is part of the ASTRA Toolbox. diff --git a/samples/python/s021_pygpu.py b/samples/python/s021_pygpu.py index db6584b..d89771c 100644 --- a/samples/python/s021_pygpu.py +++ b/samples/python/s021_pygpu.py @@ -1,8 +1,8 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp -# 2013-2016, CWI, Amsterdam +# Copyright: 2010-2018, imec Vision Lab, University of Antwerp +# 2013-2018, CWI, Amsterdam # -# Contact: astra@uantwerpen.be +# Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ # # This file is part of the ASTRA Toolbox. @@ -37,12 +37,12 @@ angles = np.linspace(0, 2 * np.pi, 180, False) proj_geom = astra.create_proj_geom('cone', 1.0, 1.0, 128, 192, angles, 1000, 0) # Create a simple hollow cube phantom, as a pygpu gpuarray -vol_gpuarr = pygpu.gpuarray.zeros(astra.functions.geom_size(vol_geom), dtype='float32') +vol_gpuarr = pygpu.gpuarray.zeros(astra.geom_size(vol_geom), dtype='float32') vol_gpuarr[17:113, 17:113, 17:113] = 1 vol_gpuarr[33:97, 33:97, 33:97] = 0 # Create a pygpu gpuarray for the output projection data -proj_gpuarr = pygpu.gpuarray.zeros(astra.functions.geom_size(proj_geom), dtype='float32') +proj_gpuarr = pygpu.gpuarray.zeros(astra.geom_size(proj_geom), dtype='float32') # Create the astra GPULink objects and create astra data3d objects from them z, y, x = proj_gpuarr.shape diff --git a/samples/python/s022_fbp_cor.py b/samples/python/s022_fbp_cor.py new file mode 100644 index 0000000..a3b0542 --- /dev/null +++ b/samples/python/s022_fbp_cor.py @@ -0,0 +1,94 @@ +# ----------------------------------------------------------------------- +# Copyright: 2010-2018, imec Vision Lab, University of Antwerp +# 2013-2018, CWI, Amsterdam +# +# Contact: astra@astra-toolbox.com +# Website: http://www.astra-toolbox.com/ +# +# This file is part of the ASTRA Toolbox. +# +# +# The ASTRA Toolbox is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# The ASTRA Toolbox is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. +# +# ----------------------------------------------------------------------- + +import astra +import numpy as np + +cor_shift = 3.6 + +vol_geom = astra.create_vol_geom(256, 256) +proj_geom = astra.create_proj_geom('parallel', 1.0, 256, np.linspace(0,np.pi,180,False)) + +# Projection geometry with shifted center of rotation +proj_geom_cor = astra.geom_postalignment(proj_geom, cor_shift) + +# As before, create a sinogram from a phantom, using the shifted center of rotation +import scipy.io +P = scipy.io.loadmat('phantom.mat')['phantom256'] + +proj_id_cor = astra.create_projector('cuda',proj_geom_cor,vol_geom) +sinogram_id, sinogram = astra.create_sino(P, proj_id_cor) + +# Change the projection geometry metadata attached to the sinogram to standard geometry, +# and try to do a reconstruction, to show the misalignment artifacts caused by +# the shifted center of rotation +astra.data2d.change_geometry(sinogram_id, proj_geom) + +import pylab +pylab.gray() +pylab.figure(1) +pylab.imshow(P) +pylab.figure(2) +pylab.imshow(sinogram) + +# Create a data object for the reconstruction +rec_id = astra.data2d.create('-vol', vol_geom) + +# Set up the parameters for a reconstruction algorithm using the GPU +cfg = astra.astra_dict('FBP_CUDA') +cfg['ReconstructionDataId'] = rec_id +cfg['ProjectionDataId'] = sinogram_id +alg_id = astra.algorithm.create(cfg) +astra.algorithm.run(alg_id) + +# Get the result +rec = astra.data2d.get(rec_id) +pylab.figure(3) +pylab.imshow(rec) + +astra.algorithm.delete(alg_id) +astra.data2d.delete(rec_id) + +# Now change back to the proper, shifted geometry, and do another reconstruction +astra.data2d.change_geometry(sinogram_id, proj_geom_cor) +rec_id = astra.data2d.create('-vol', vol_geom) +cfg = astra.astra_dict('FBP_CUDA') +cfg['ReconstructionDataId'] = rec_id +cfg['ProjectionDataId'] = sinogram_id +alg_id = astra.algorithm.create(cfg) +astra.algorithm.run(alg_id) + +# Get the result +rec = astra.data2d.get(rec_id) +pylab.figure(4) +pylab.imshow(rec) +pylab.show() + + + +astra.data2d.delete(sinogram_id) +astra.projector.delete(proj_id_cor) +astra.algorithm.delete(alg_id) +astra.data2d.delete(rec_id) |