Merge branch 'master' into parallel_vec

18 files changed, 54 insertions, 54 deletions

diff --git a/samples/matlab/s001_sinogram_par2d.m b/samples/matlab/s001_sinogram_par2d.m
index 4494e7b..0295cdf 100644
--- a/samples/matlab/s001_sinogram_par2d.m
+++ b/samples/matlab/s001_sinogram_par2d.m
@@ -1,11 +1,11 @@
 % -----------------------------------------------------------------------
 % This file is part of the ASTRA Toolbox
 % 
-% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp
-%            2014-2015, CWI, Amsterdam
+% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp
+%            2014-2016, CWI, Amsterdam
 % License: Open Source under GPLv3
 % Contact: astra@uantwerpen.be
-% Website: http://sf.net/projects/astra-toolbox
+% Website: http://www.astra-toolbox.com/
 % -----------------------------------------------------------------------
 
 % Create a basic 256x256 square volume geometry
diff --git a/samples/matlab/s002_data2d.m b/samples/matlab/s002_data2d.m
index a91071f..b082cb3 100644
--- a/samples/matlab/s002_data2d.m
+++ b/samples/matlab/s002_data2d.m
@@ -1,11 +1,11 @@
 % -----------------------------------------------------------------------
 % This file is part of the ASTRA Toolbox
 % 
-% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp
-%            2014-2015, CWI, Amsterdam
+% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp
+%            2014-2016, CWI, Amsterdam
 % License: Open Source under GPLv3
 % Contact: astra@uantwerpen.be
-% Website: http://sf.net/projects/astra-toolbox
+% Website: http://www.astra-toolbox.com/
 % -----------------------------------------------------------------------
 
 vol_geom = astra_create_vol_geom(256, 256);
diff --git a/samples/matlab/s003_gpu_reconstruction.m b/samples/matlab/s003_gpu_reconstruction.m
index efb5c68..d98f720 100644
--- a/samples/matlab/s003_gpu_reconstruction.m
+++ b/samples/matlab/s003_gpu_reconstruction.m
@@ -1,11 +1,11 @@
 % -----------------------------------------------------------------------
 % This file is part of the ASTRA Toolbox
 % 
-% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp
-%            2014-2015, CWI, Amsterdam
+% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp
+%            2014-2016, CWI, Amsterdam
 % License: Open Source under GPLv3
 % Contact: astra@uantwerpen.be
-% Website: http://sf.net/projects/astra-toolbox
+% Website: http://www.astra-toolbox.com/
 % -----------------------------------------------------------------------
 
 vol_geom = astra_create_vol_geom(256, 256);
diff --git a/samples/matlab/s004_cpu_reconstruction.m b/samples/matlab/s004_cpu_reconstruction.m
index f25cd2b..96f892a 100644
--- a/samples/matlab/s004_cpu_reconstruction.m
+++ b/samples/matlab/s004_cpu_reconstruction.m
@@ -1,11 +1,11 @@
 % -----------------------------------------------------------------------
 % This file is part of the ASTRA Toolbox
 % 
-% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp
-%            2014-2015, CWI, Amsterdam
+% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp
+%            2014-2016, CWI, Amsterdam
 % License: Open Source under GPLv3
 % Contact: astra@uantwerpen.be
-% Website: http://sf.net/projects/astra-toolbox
+% Website: http://www.astra-toolbox.com/
 % -----------------------------------------------------------------------
 
 vol_geom = astra_create_vol_geom(256, 256);
diff --git a/samples/matlab/s005_3d_geometry.m b/samples/matlab/s005_3d_geometry.m
index 4b7360b..227dccd 100644
--- a/samples/matlab/s005_3d_geometry.m
+++ b/samples/matlab/s005_3d_geometry.m
@@ -1,11 +1,11 @@
 % -----------------------------------------------------------------------
 % This file is part of the ASTRA Toolbox
 % 
-% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp
-%            2014-2015, CWI, Amsterdam
+% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp
+%            2014-2016, CWI, Amsterdam
 % License: Open Source under GPLv3
 % Contact: astra@uantwerpen.be
-% Website: http://sf.net/projects/astra-toolbox
+% Website: http://www.astra-toolbox.com/
 % -----------------------------------------------------------------------
 
 vol_geom = astra_create_vol_geom(64, 64, 64);
diff --git a/samples/matlab/s006_3d_data.m b/samples/matlab/s006_3d_data.m
index 32d88cc..dd45550 100644
--- a/samples/matlab/s006_3d_data.m
+++ b/samples/matlab/s006_3d_data.m
@@ -1,11 +1,11 @@
 % -----------------------------------------------------------------------
 % This file is part of the ASTRA Toolbox
 % 
-% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp
-%            2014-2015, CWI, Amsterdam
+% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp
+%            2014-2016, CWI, Amsterdam
 % License: Open Source under GPLv3
 % Contact: astra@uantwerpen.be
-% Website: http://sf.net/projects/astra-toolbox
+% Website: http://www.astra-toolbox.com/
 % -----------------------------------------------------------------------
 
 % Create a 3D volume geometry.
diff --git a/samples/matlab/s007_3d_reconstruction.m b/samples/matlab/s007_3d_reconstruction.m
index fc9aca6..17c5d8c 100644
--- a/samples/matlab/s007_3d_reconstruction.m
+++ b/samples/matlab/s007_3d_reconstruction.m
@@ -1,11 +1,11 @@
 % -----------------------------------------------------------------------
 % This file is part of the ASTRA Toolbox
 % 
-% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp
-%            2014-2015, CWI, Amsterdam
+% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp
+%            2014-2016, CWI, Amsterdam
 % License: Open Source under GPLv3
 % Contact: astra@uantwerpen.be
-% Website: http://sf.net/projects/astra-toolbox
+% Website: http://www.astra-toolbox.com/
 % -----------------------------------------------------------------------
 
 vol_geom = astra_create_vol_geom(128, 128, 128);
diff --git a/samples/matlab/s008_gpu_selection.m b/samples/matlab/s008_gpu_selection.m
index a9e152d..7a24028 100644
--- a/samples/matlab/s008_gpu_selection.m
+++ b/samples/matlab/s008_gpu_selection.m
@@ -1,11 +1,11 @@
 % -----------------------------------------------------------------------
 % This file is part of the ASTRA Toolbox
 % 
-% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp
-%            2014-2015, CWI, Amsterdam
+% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp
+%            2014-2016, CWI, Amsterdam
 % License: Open Source under GPLv3
 % Contact: astra@uantwerpen.be
-% Website: http://sf.net/projects/astra-toolbox
+% Website: http://www.astra-toolbox.com/
 % -----------------------------------------------------------------------
 
 vol_geom = astra_create_vol_geom(256, 256);
diff --git a/samples/matlab/s009_projection_matrix.m b/samples/matlab/s009_projection_matrix.m
index efda0d2..645986b 100644
--- a/samples/matlab/s009_projection_matrix.m
+++ b/samples/matlab/s009_projection_matrix.m
@@ -1,11 +1,11 @@
 % -----------------------------------------------------------------------
 % This file is part of the ASTRA Toolbox
 % 
-% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp
-%            2014-2015, CWI, Amsterdam
+% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp
+%            2014-2016, CWI, Amsterdam
 % License: Open Source under GPLv3
 % Contact: astra@uantwerpen.be
-% Website: http://sf.net/projects/astra-toolbox
+% Website: http://www.astra-toolbox.com/
 % -----------------------------------------------------------------------
 
 vol_geom = astra_create_vol_geom(256, 256);
diff --git a/samples/matlab/s010_supersampling.m b/samples/matlab/s010_supersampling.m
index 148f6ad..86a973d 100644
--- a/samples/matlab/s010_supersampling.m
+++ b/samples/matlab/s010_supersampling.m
@@ -1,11 +1,11 @@
 % -----------------------------------------------------------------------
 % This file is part of the ASTRA Toolbox
 % 
-% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp
-%            2014-2015, CWI, Amsterdam
+% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp
+%            2014-2016, CWI, Amsterdam
 % License: Open Source under GPLv3
 % Contact: astra@uantwerpen.be
-% Website: http://sf.net/projects/astra-toolbox
+% Website: http://www.astra-toolbox.com/
 % -----------------------------------------------------------------------
 
 vol_geom = astra_create_vol_geom(256, 256);
diff --git a/samples/matlab/s011_object_info.m b/samples/matlab/s011_object_info.m
index 61ecb83..85665fd 100644
--- a/samples/matlab/s011_object_info.m
+++ b/samples/matlab/s011_object_info.m
@@ -1,11 +1,11 @@
 % -----------------------------------------------------------------------
 % This file is part of the ASTRA Toolbox
 % 
-% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp
-%            2014-2015, CWI, Amsterdam
+% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp
+%            2014-2016, CWI, Amsterdam
 % License: Open Source under GPLv3
 % Contact: astra@uantwerpen.be
-% Website: http://sf.net/projects/astra-toolbox
+% Website: http://www.astra-toolbox.com/
 % -----------------------------------------------------------------------
 
 % Create two volume geometries
diff --git a/samples/matlab/s012_masks.m b/samples/matlab/s012_masks.m
index d3611a6..26d48a2 100644
--- a/samples/matlab/s012_masks.m
+++ b/samples/matlab/s012_masks.m
@@ -1,11 +1,11 @@
 % -----------------------------------------------------------------------
 % This file is part of the ASTRA Toolbox
 % 
-% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp
-%            2014-2015, CWI, Amsterdam
+% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp
+%            2014-2016, CWI, Amsterdam
 % License: Open Source under GPLv3
 % Contact: astra@uantwerpen.be
-% Website: http://sf.net/projects/astra-toolbox
+% Website: http://www.astra-toolbox.com/
 % -----------------------------------------------------------------------
 
 
diff --git a/samples/matlab/s013_constraints.m b/samples/matlab/s013_constraints.m
index d72195c..07bdb05 100644
--- a/samples/matlab/s013_constraints.m
+++ b/samples/matlab/s013_constraints.m
@@ -1,11 +1,11 @@
 % -----------------------------------------------------------------------
 % This file is part of the ASTRA Toolbox
 % 
-% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp
-%            2014-2015, CWI, Amsterdam
+% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp
+%            2014-2016, CWI, Amsterdam
 % License: Open Source under GPLv3
 % Contact: astra@uantwerpen.be
-% Website: http://sf.net/projects/astra-toolbox
+% Website: http://www.astra-toolbox.com/
 % -----------------------------------------------------------------------
 
 % In this example we will create a reconstruction constrained to
diff --git a/samples/matlab/s014_FBP.m b/samples/matlab/s014_FBP.m
index faf91fb..fb91a41 100644
--- a/samples/matlab/s014_FBP.m
+++ b/samples/matlab/s014_FBP.m
@@ -1,11 +1,11 @@
 % -----------------------------------------------------------------------
 % This file is part of the ASTRA Toolbox
 % 
-% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp
-%            2014-2015, CWI, Amsterdam
+% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp
+%            2014-2016, CWI, Amsterdam
 % License: Open Source under GPLv3
 % Contact: astra@uantwerpen.be
-% Website: http://sf.net/projects/astra-toolbox
+% Website: http://www.astra-toolbox.com/
 % -----------------------------------------------------------------------
 
 vol_geom = astra_create_vol_geom(256, 256);
diff --git a/samples/matlab/s015_fp_bp.m b/samples/matlab/s015_fp_bp.m
index 8cc417e..56c5ed4 100644
--- a/samples/matlab/s015_fp_bp.m
+++ b/samples/matlab/s015_fp_bp.m
@@ -1,11 +1,11 @@
 % -----------------------------------------------------------------------
 % This file is part of the ASTRA Toolbox
 % 
-% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp
-%            2014-2015, CWI, Amsterdam
+% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp
+%            2014-2016, CWI, Amsterdam
 % License: Open Source under GPLv3
 % Contact: astra@uantwerpen.be
-% Website: http://sf.net/projects/astra-toolbox
+% Website: http://www.astra-toolbox.com/
 % -----------------------------------------------------------------------
 
 
diff --git a/samples/matlab/s016_plots.m b/samples/matlab/s016_plots.m
index 1455c6d..56f47d8 100644
--- a/samples/matlab/s016_plots.m
+++ b/samples/matlab/s016_plots.m
@@ -1,11 +1,11 @@
 % -----------------------------------------------------------------------
 % This file is part of the ASTRA Toolbox
 % 
-% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp
-%            2014-2015, CWI, Amsterdam
+% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp
+%            2014-2016, CWI, Amsterdam
 % License: Open Source under GPLv3
 % Contact: astra@uantwerpen.be
-% Website: http://sf.net/projects/astra-toolbox
+% Website: http://www.astra-toolbox.com/
 % -----------------------------------------------------------------------
 
 vol_geom = astra_create_vol_geom(256, 256);
diff --git a/samples/matlab/s017_opTomo.m b/samples/matlab/s017_opTomo.m
index 891a93d..71f8d55 100644
--- a/samples/matlab/s017_opTomo.m
+++ b/samples/matlab/s017_opTomo.m
@@ -1,11 +1,11 @@
 % -----------------------------------------------------------------------
 % This file is part of the ASTRA Toolbox
 % 
-% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp
-%            2014-2015, CWI, Amsterdam
+% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp
+%            2014-2016, CWI, Amsterdam
 % License: Open Source under GPLv3
 % Contact: astra@uantwerpen.be
-% Website: http://sf.net/projects/astra-toolbox
+% Website: http://www.astra-toolbox.com/
 % -----------------------------------------------------------------------
 
 % This sample illustrates the use of opTomo.
diff --git a/samples/matlab/s020_3d_multiGPU.m b/samples/matlab/s020_3d_multiGPU.m
index bade325..46b984e 100644
--- a/samples/matlab/s020_3d_multiGPU.m
+++ b/samples/matlab/s020_3d_multiGPU.m
@@ -1,11 +1,11 @@
 % -----------------------------------------------------------------------
 % This file is part of the ASTRA Toolbox
 % 
-% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp
-%            2014-2015, CWI, Amsterdam
+% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp
+%            2014-2016, CWI, Amsterdam
 % License: Open Source under GPLv3
 % Contact: astra@uantwerpen.be
-% Website: http://sf.net/projects/astra-toolbox
+% Website: http://www.astra-toolbox.com/
 % -----------------------------------------------------------------------