Merge branch 'master' into parallel_vec

46 files changed, 129 insertions, 169 deletions

diff --git a/matlab/tools/ROIselectfull.m b/matlab/tools/ROIselectfull.m
index a50c979..cc1eaa0 100644
--- a/matlab/tools/ROIselectfull.m
+++ b/matlab/tools/ROIselectfull.m
@@ -15,4 +15,4 @@ end
 
 function A = Afstand(x1,y1,x2,y2)
 	A = sqrt((x1-x2).^2+(y1-y2).^2);
-end
\ No newline at end of file
+end
diff --git a/matlab/tools/astra_add_noise_to_sino.m b/matlab/tools/astra_add_noise_to_sino.m
index 6ad9b50..c938507 100644
--- a/matlab/tools/astra_add_noise_to_sino.m
+++ b/matlab/tools/astra_add_noise_to_sino.m
@@ -15,13 +15,12 @@ function sinogram_out = astra_add_noise_to_sino(sinogram_in,I0)
 %--------------------------------------------------------------------------
 % 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/
 %--------------------------------------------------------------------------
-% $Id$
 
 if numel(sinogram_in) == 1
 	sinogramRaw = astra_mex_data2d('get', sinogram_in);
diff --git a/matlab/tools/astra_clear.m b/matlab/tools/astra_clear.m
index 0dd180b..14f8e77 100644
--- a/matlab/tools/astra_clear.m
+++ b/matlab/tools/astra_clear.m
@@ -5,13 +5,12 @@
 %--------------------------------------------------------------------------
 % 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/
 %--------------------------------------------------------------------------
-% $Id$
 
 astra_mex_data2d('clear');
 astra_mex_data3d('clear');
diff --git a/matlab/tools/astra_create_backprojection.m b/matlab/tools/astra_create_backprojection.m
index dff51c6..263a684 100644
--- a/matlab/tools/astra_create_backprojection.m
+++ b/matlab/tools/astra_create_backprojection.m
@@ -13,13 +13,12 @@ function [vol_id, vol] = astra_create_backprojection(data, proj_id)
 %--------------------------------------------------------------------------
 % 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/
 %--------------------------------------------------------------------------
-% $Id$
 
 
 % get projection geometry
diff --git a/matlab/tools/astra_create_backprojection3d_cuda.m b/matlab/tools/astra_create_backprojection3d_cuda.m
index 88b4b4a..b060b39 100644
--- a/matlab/tools/astra_create_backprojection3d_cuda.m
+++ b/matlab/tools/astra_create_backprojection3d_cuda.m
@@ -15,13 +15,12 @@ function [vol_id, vol] = astra_create_backprojection3d_cuda(data, proj_geom, vol
 %--------------------------------------------------------------------------
 % 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/
 %--------------------------------------------------------------------------
-% $Id$
 
 
 % store projection data
diff --git a/matlab/tools/astra_create_backprojection_cuda.m b/matlab/tools/astra_create_backprojection_cuda.m
index 7f8a6a6..04ea61b 100644
--- a/matlab/tools/astra_create_backprojection_cuda.m
+++ b/matlab/tools/astra_create_backprojection_cuda.m
@@ -14,13 +14,12 @@ function backProj = astra_create_backprojection_cuda(sinogramData, proj_geom, vo
     %--------------------------------------------------------------------------
     % 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/
     %--------------------------------------------------------------------------
-    % $Id$
 
     recon_id = astra_mex_data2d('create', '-vol', vol_geom, 0);
     sinogram_id = astra_mex_data2d('create', '-sino', proj_geom, sinogramData);
diff --git a/matlab/tools/astra_create_proj_geom.m b/matlab/tools/astra_create_proj_geom.m
index ff7d74d..01c9177 100644
--- a/matlab/tools/astra_create_proj_geom.m
+++ b/matlab/tools/astra_create_proj_geom.m
@@ -87,13 +87,12 @@ function proj_geom = astra_create_proj_geom(type, varargin)
 %--------------------------------------------------------------------------
 % 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/
 %--------------------------------------------------------------------------
-% $Id$
 
 
 if strcmp(type,'parallel')
diff --git a/matlab/tools/astra_create_projector.m b/matlab/tools/astra_create_projector.m
index 9bbef9e..e0adac7 100644
--- a/matlab/tools/astra_create_projector.m
+++ b/matlab/tools/astra_create_projector.m
@@ -15,13 +15,12 @@ function proj_id = astra_create_projector(type, proj_geom, vol_geom, options)
 %--------------------------------------------------------------------------
 % 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/
 % -------------------------------------------------------------------------
-% $Id$
 
 
 cfg_proj = astra_struct(type);
diff --git a/matlab/tools/astra_create_reconstruction.m b/matlab/tools/astra_create_reconstruction.m
index 76dba94..3362768 100644
--- a/matlab/tools/astra_create_reconstruction.m
+++ b/matlab/tools/astra_create_reconstruction.m
@@ -21,13 +21,12 @@ function [recon_id, recon] = astra_create_reconstruction(rec_type, proj_id, sino
 %--------------------------------------------------------------------------
 % 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/
 %--------------------------------------------------------------------------
-% $Id$
 
 
 if nargin <= 4
diff --git a/matlab/tools/astra_create_reconstruction_cuda.m b/matlab/tools/astra_create_reconstruction_cuda.m
index 7d0421c..ddcc5ee 100644
--- a/matlab/tools/astra_create_reconstruction_cuda.m
+++ b/matlab/tools/astra_create_reconstruction_cuda.m
@@ -22,13 +22,12 @@ function [recon_id, recon] = astra_create_reconstruction_cuda(rec_type, proj_geo
 %--------------------------------------------------------------------------
 % 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/
 %--------------------------------------------------------------------------
-% $Id$
 
 
 if numel(sinogram) == 1
diff --git a/matlab/tools/astra_create_sino.m b/matlab/tools/astra_create_sino.m
index d27e452..977664b 100644
--- a/matlab/tools/astra_create_sino.m
+++ b/matlab/tools/astra_create_sino.m
@@ -13,13 +13,12 @@ function [sino_id, sino] = astra_create_sino(data, proj_id)
 %--------------------------------------------------------------------------
 % 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/
 %--------------------------------------------------------------------------
-% $Id$
 
 
 % get projection geometry
diff --git a/matlab/tools/astra_create_sino3d_cuda.m b/matlab/tools/astra_create_sino3d_cuda.m
index 3a90084..34c82b4 100644
--- a/matlab/tools/astra_create_sino3d_cuda.m
+++ b/matlab/tools/astra_create_sino3d_cuda.m
@@ -15,13 +15,12 @@ function [sino_id, sino] = astra_create_sino3d_cuda(data, proj_geom, vol_geom)
 %--------------------------------------------------------------------------
 % 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/
 %--------------------------------------------------------------------------
-% $Id$
 
 
 % store volume
diff --git a/matlab/tools/astra_create_sino_cuda.m b/matlab/tools/astra_create_sino_cuda.m
index 64ebe54..2dfb82f 100644
--- a/matlab/tools/astra_create_sino_cuda.m
+++ b/matlab/tools/astra_create_sino_cuda.m
@@ -16,13 +16,12 @@ function [sino_id, sino] = astra_create_sino_cuda(data, proj_geom, vol_geom, gpu
 %--------------------------------------------------------------------------
 % 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/
 %--------------------------------------------------------------------------
-% $Id$
 
 
 % store volume
diff --git a/matlab/tools/astra_create_sino_gpu.m b/matlab/tools/astra_create_sino_gpu.m
index 80be857..ca651ee 100644
--- a/matlab/tools/astra_create_sino_gpu.m
+++ b/matlab/tools/astra_create_sino_gpu.m
@@ -16,13 +16,12 @@ function [sino_id, sino] = astra_create_sino_gpu(data, proj_geom, vol_geom, gpu_
 %--------------------------------------------------------------------------
 % 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/
 %--------------------------------------------------------------------------
-% $Id$
 
 
 % store volume
diff --git a/matlab/tools/astra_create_sino_sampling.m b/matlab/tools/astra_create_sino_sampling.m
index fad9e85..27c6d46 100644
--- a/matlab/tools/astra_create_sino_sampling.m
+++ b/matlab/tools/astra_create_sino_sampling.m
@@ -16,13 +16,12 @@ function [sino_id, sino] = astra_create_sino_sampling(data, proj_geom, vol_geom,
 %--------------------------------------------------------------------------
 % 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/
 %--------------------------------------------------------------------------
-% $Id$
 
 
 % store volume
diff --git a/matlab/tools/astra_create_vol_geom.m b/matlab/tools/astra_create_vol_geom.m
index a3ba7de..bf24609 100644
--- a/matlab/tools/astra_create_vol_geom.m
+++ b/matlab/tools/astra_create_vol_geom.m
@@ -26,13 +26,12 @@ function vol_geom = astra_create_vol_geom(varargin)
 %--------------------------------------------------------------------------
 % 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/
 %--------------------------------------------------------------------------
-% $Id$
 
 % astra_create_vol_geom([row_and_col_count ])
 if numel(varargin) == 1 && numel(varargin{1}) == 1
diff --git a/matlab/tools/astra_data_op.m b/matlab/tools/astra_data_op.m
index b6ef0e2..5025ac5 100644
--- a/matlab/tools/astra_data_op.m
+++ b/matlab/tools/astra_data_op.m
@@ -8,4 +8,4 @@ cfg.option.GPUindex = gpu_core;
 
 alg_id = astra_mex_algorithm('create',cfg);
 astra_mex_algorithm('run',alg_id);
-astra_mex_algorithm('delete',alg_id);
\ No newline at end of file
+astra_mex_algorithm('delete',alg_id);
diff --git a/matlab/tools/astra_data_op_mask.m b/matlab/tools/astra_data_op_mask.m
index d46c925..4e4e326 100644
--- a/matlab/tools/astra_data_op_mask.m
+++ b/matlab/tools/astra_data_op_mask.m
@@ -9,4 +9,4 @@ cfg.option.MaskId = mask;
 
 alg_id = astra_mex_algorithm('create',cfg);
 astra_mex_algorithm('run',alg_id);
-astra_mex_algorithm('delete',alg_id);
\ No newline at end of file
+astra_mex_algorithm('delete',alg_id);
diff --git a/matlab/tools/astra_downsample_sinogram.m b/matlab/tools/astra_downsample_sinogram.m
index 1232a93..ac50abd 100644
--- a/matlab/tools/astra_downsample_sinogram.m
+++ b/matlab/tools/astra_downsample_sinogram.m
@@ -15,13 +15,12 @@ function [sinogram_new, proj_geom_new] = astra_downsample_sinogram(sinogram, pro
 %------------------------------------------------------------------------
 % 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/
 %------------------------------------------------------------------------
-% $Id$
 
 if mod(size(sinogram,2),factor) ~= 0
 	disp('size of the sinogram must be a divisor of the factor');
diff --git a/matlab/tools/astra_imshow.m b/matlab/tools/astra_imshow.m
index 6069674..dbaac10 100644
--- a/matlab/tools/astra_imshow.m
+++ b/matlab/tools/astra_imshow.m
@@ -7,4 +7,4 @@ imshow(data,range);
 
 if nargout >= 1
 	V = data;
-end
\ No newline at end of file
+end
diff --git a/matlab/tools/astra_mex.m b/matlab/tools/astra_mex.m
index 9d6b2c7..aa6c3ea 100644
--- a/matlab/tools/astra_mex.m
+++ b/matlab/tools/astra_mex.m
@@ -6,13 +6,12 @@ function [varargout] = astra_mex(varargin)
 %------------------------------------------------------------------------
 % 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/
 %------------------------------------------------------------------------
-% $Id$
 if nargout == 0
     astra_mex_c(varargin{:});
     if exist('ans','var')
diff --git a/matlab/tools/astra_mex_algorithm.m b/matlab/tools/astra_mex_algorithm.m
index 0a42c8e..69e9c31 100644
--- a/matlab/tools/astra_mex_algorithm.m
+++ b/matlab/tools/astra_mex_algorithm.m
@@ -6,13 +6,12 @@ function [varargout] = astra_mex_algorithm(varargin)
 %------------------------------------------------------------------------
 % 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/
 %------------------------------------------------------------------------
-% $Id$
 if nargout == 0
     astra_mex_algorithm_c(varargin{:});
     if exist('ans','var')
diff --git a/matlab/tools/astra_mex_data2d.m b/matlab/tools/astra_mex_data2d.m
index fbc4c6b..6bdcb98 100644
--- a/matlab/tools/astra_mex_data2d.m
+++ b/matlab/tools/astra_mex_data2d.m
@@ -6,13 +6,12 @@ function [varargout] = astra_mex_data2d(varargin)
 %------------------------------------------------------------------------
 % 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/
 %------------------------------------------------------------------------
-% $Id$
 if nargout == 0
     astra_mex_data2d_c(varargin{:});
     if exist('ans','var')
diff --git a/matlab/tools/astra_mex_data3d.m b/matlab/tools/astra_mex_data3d.m
index 1926774..44a02e9 100644
--- a/matlab/tools/astra_mex_data3d.m
+++ b/matlab/tools/astra_mex_data3d.m
@@ -6,13 +6,12 @@ function [varargout] = astra_mex_data3d(varargin)
 %------------------------------------------------------------------------
 % 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/
 %------------------------------------------------------------------------
-% $Id$
 if nargout == 0
     astra_mex_data3d_c(varargin{:});
     if exist('ans','var')
diff --git a/matlab/tools/astra_mex_direct.m b/matlab/tools/astra_mex_direct.m
index 58c4fd2..ded3e9a 100644
--- a/matlab/tools/astra_mex_direct.m
+++ b/matlab/tools/astra_mex_direct.m
@@ -6,13 +6,12 @@ function [varargout] = astra_mex_direct(varargin)
 %------------------------------------------------------------------------
 % 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/
 %------------------------------------------------------------------------
-% $Id$
 if nargout == 0
     astra_mex_direct_c(varargin{:});
     if exist('ans','var')
diff --git a/matlab/tools/astra_mex_log.m b/matlab/tools/astra_mex_log.m
index 28cfa18..7c88145 100644
--- a/matlab/tools/astra_mex_log.m
+++ b/matlab/tools/astra_mex_log.m
@@ -6,13 +6,12 @@ function [varargout] = astra_mex_log(varargin)
 %------------------------------------------------------------------------
 % 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/
 %------------------------------------------------------------------------
-% $Id$
 if size(varargin,2)==2 && (strcmp(varargin{1},'debug') || strcmp(varargin{1},'info') || strcmp(varargin{1},'warn') || strcmp(varargin{1},'error'))
     d = dbstack(1);
     if size(d,1)==0
@@ -30,4 +29,4 @@ else
         varargout = cell(1,nargout);
         [varargout{:}] = astra_mex_log_c(varargin{:});
     end
-end
\ No newline at end of file
+end
diff --git a/matlab/tools/astra_mex_matrix.m b/matlab/tools/astra_mex_matrix.m
index 2bc8210..eabbd4f 100644
--- a/matlab/tools/astra_mex_matrix.m
+++ b/matlab/tools/astra_mex_matrix.m
@@ -6,13 +6,12 @@ function [varargout] = astra_mex_matrix(varargin)
 %------------------------------------------------------------------------
 % 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/
 %------------------------------------------------------------------------
-% $Id$
 if nargout == 0
     astra_mex_matrix_c(varargin{:});
     if exist('ans','var')
diff --git a/matlab/tools/astra_mex_plugin.m b/matlab/tools/astra_mex_plugin.m
index 4159365..b5249dd 100644
--- a/matlab/tools/astra_mex_plugin.m
+++ b/matlab/tools/astra_mex_plugin.m
@@ -6,13 +6,12 @@ function [varargout] = astra_mex_plugin(varargin)
 %------------------------------------------------------------------------
 % 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/
 %------------------------------------------------------------------------
-% $Id$
 if nargout == 0
     astra_mex_plugin_c(varargin{:});
     if exist('ans','var')
@@ -21,4 +20,4 @@ if nargout == 0
 else
     varargout = cell(1,nargout);
     [varargout{:}] = astra_mex_plugin_c(varargin{:});
-end
\ No newline at end of file
+end
diff --git a/matlab/tools/astra_mex_projector.m b/matlab/tools/astra_mex_projector.m
index 5eaffd3..0d6829e 100644
--- a/matlab/tools/astra_mex_projector.m
+++ b/matlab/tools/astra_mex_projector.m
@@ -6,13 +6,12 @@ function [varargout] = astra_mex_projector(varargin)
 %------------------------------------------------------------------------
 % 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/
 %------------------------------------------------------------------------
-% $Id$
 if nargout == 0
     astra_mex_projector_c(varargin{:});
     if exist('ans','var')
diff --git a/matlab/tools/astra_mex_projector3d.m b/matlab/tools/astra_mex_projector3d.m
index eaec7f2..f0deffb 100644
--- a/matlab/tools/astra_mex_projector3d.m
+++ b/matlab/tools/astra_mex_projector3d.m
@@ -6,13 +6,12 @@ function [varargout] = astra_mex_projector3d(varargin)
 %------------------------------------------------------------------------
 % 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/
 %------------------------------------------------------------------------
-% $Id$
 if nargout == 0
     astra_mex_projector3d_c(varargin{:});
     if exist('ans','var')
diff --git a/matlab/tools/astra_projector_handle.m b/matlab/tools/astra_projector_handle.m
index 6b56300..ae1254a 100644
--- a/matlab/tools/astra_projector_handle.m
+++ b/matlab/tools/astra_projector_handle.m
@@ -5,11 +5,11 @@ classdef astra_projector_handle < handle
     %------------------------------------------------------------------------
     % 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/
     %------------------------------------------------------------------------
 
     properties
diff --git a/matlab/tools/astra_set_directory.m b/matlab/tools/astra_set_directory.m
index ae21aab..3a85f54 100644
--- a/matlab/tools/astra_set_directory.m
+++ b/matlab/tools/astra_set_directory.m
@@ -11,13 +11,12 @@ function in = astra_set_directory(in)
 %------------------------------------------------------------------------
 % 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/
 %------------------------------------------------------------------------
-% $Id$
 
 a = find(in == '/' | in == '\');
 for i = 1:numel(a)
diff --git a/matlab/tools/astra_set_gpu_index.m b/matlab/tools/astra_set_gpu_index.m
index 1f5bfdc..e9c9c45 100644
--- a/matlab/tools/astra_set_gpu_index.m
+++ b/matlab/tools/astra_set_gpu_index.m
@@ -6,13 +6,12 @@ function astra_set_gpu_index(index)
 %--------------------------------------------------------------------------
 % 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/
 %--------------------------------------------------------------------------
-% $Id$
 
 astra_mex('set_gpu_index', index);
 
diff --git a/matlab/tools/astra_struct.m b/matlab/tools/astra_struct.m
index b5bf48a..33f0a39 100644
--- a/matlab/tools/astra_struct.m
+++ b/matlab/tools/astra_struct.m
@@ -11,13 +11,12 @@ function res = astra_struct(type)
 %------------------------------------------------------------------------
 % 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/
 %------------------------------------------------------------------------
-% $Id$
 res = struct();
 res.options = struct();
 
diff --git a/matlab/tools/createOrderART.m b/matlab/tools/createOrderART.m
index b058ba5..5f1d73b 100644
--- a/matlab/tools/createOrderART.m
+++ b/matlab/tools/createOrderART.m
@@ -16,13 +16,12 @@ function rayOrder = createOrderART(proj_geom, mode)
 %------------------------------------------------------------------------
 % 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/
 %------------------------------------------------------------------------
-% $Id$
 
 angle_count = length(proj_geom.projection_angles);
 det_count = proj_geom.detector_count;
diff --git a/matlab/tools/downsample_sinogram.m b/matlab/tools/downsample_sinogram.m
index 1fb4ec8..a4122e8 100644
--- a/matlab/tools/downsample_sinogram.m
+++ b/matlab/tools/downsample_sinogram.m
@@ -9,4 +9,4 @@ function sinogram_out = downsample_sinogram(sinogram, ds)
 	for i = 2:ds
 		sinogram_out = sinogram_out + sinogram(:,i:ds:end,:);
 	end
-	sinogram_out = sinogram_out / (ds*ds);
\ No newline at end of file
+	sinogram_out = sinogram_out / (ds*ds);
diff --git a/matlab/tools/imreadgs.m b/matlab/tools/imreadgs.m
index 2920008..34ae9c9 100644
--- a/matlab/tools/imreadgs.m
+++ b/matlab/tools/imreadgs.m
@@ -12,13 +12,12 @@ function Im = imreadgs(filename)
 %------------------------------------------------------------------------
 % 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/
 %------------------------------------------------------------------------
-% $Id$
 
 Im = double(imread(filename));
 if size(Im,3) > 1
diff --git a/matlab/tools/imresize3D.m b/matlab/tools/imresize3D.m
index af6a810..21dc8cd 100644
--- a/matlab/tools/imresize3D.m
+++ b/matlab/tools/imresize3D.m
@@ -12,13 +12,12 @@ function out = imresize3D(in, s_out, method)
 %------------------------------------------------------------------------
 % 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/
 %------------------------------------------------------------------------
-% $Id$
 
 out = zeros(s_out);
 for i = 1:size(in,3)
diff --git a/matlab/tools/imscale.m b/matlab/tools/imscale.m
index 4a40e50..99b9f97 100644
--- a/matlab/tools/imscale.m
+++ b/matlab/tools/imscale.m
@@ -11,13 +11,12 @@ function out = imscale(in)
 %------------------------------------------------------------------------
 % 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/
 %------------------------------------------------------------------------
-% $Id$
 
 mi = min(in(:));
 ma = max(in(:));
diff --git a/matlab/tools/imwritesc.m b/matlab/tools/imwritesc.m
index 4b28a09..3963e75 100644
--- a/matlab/tools/imwritesc.m
+++ b/matlab/tools/imwritesc.m
@@ -11,12 +11,11 @@ function imwritesc(in, filename)
 %------------------------------------------------------------------------
 % 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/
 %------------------------------------------------------------------------
-% $Id$
 
 imwrite(imscale(in),filename);
diff --git a/matlab/tools/kaiserBessel.m b/matlab/tools/kaiserBessel.m
index 14b9097..9eb892a 100644
--- a/matlab/tools/kaiserBessel.m
+++ b/matlab/tools/kaiserBessel.m
@@ -14,13 +14,12 @@ function res = kaiserBessel(m,alpha,a,r)
 %------------------------------------------------------------------------
 % 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/
 %------------------------------------------------------------------------
-% $Id$
 
 sq = sqrt(1 - (r./a).^2);
 
diff --git a/matlab/tools/linspace2.m b/matlab/tools/linspace2.m
index 027e4f4..755c918 100644
--- a/matlab/tools/linspace2.m
+++ b/matlab/tools/linspace2.m
@@ -13,13 +13,12 @@ function out = linspace2(a,b,c)
 %------------------------------------------------------------------------
 % 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/
 %------------------------------------------------------------------------
-% $Id$
 
 out = linspace(a,b,c+1);
 out = out(1:end-1);
diff --git a/matlab/tools/opTomo.m b/matlab/tools/opTomo.m
index 04b3634..81de534 100644
--- a/matlab/tools/opTomo.m
+++ b/matlab/tools/opTomo.m
@@ -23,13 +23,12 @@
 %--------------------------------------------------------------------------
 % This file is part of the ASTRA Toolbox
 % 
-% Copyright: 2014-2015, CWI, Amsterdam
+% Copyright: 2014-2016, CWI, Amsterdam
 % License:   Open Source under GPLv3
 % Author:    Folkert Bleichrodt
 % Contact:   F.Bleichrodt@cwi.nl
-% Website:   http://sf.net/projects/astra-toolbox
+% Website:   http://www.astra-toolbox.com/
 %--------------------------------------------------------------------------
-% $Id$
 
 classdef opTomo < opSpot
     
diff --git a/matlab/tools/overlayImage.m b/matlab/tools/overlayImage.m
index 6b6361e..0ba2c63 100644
--- a/matlab/tools/overlayImage.m
+++ b/matlab/tools/overlayImage.m
@@ -11,13 +11,12 @@ function im = overlayImage(reconstruction, ground_truth)
 %------------------------------------------------------------------------
 % 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/
 %------------------------------------------------------------------------
-% $Id$
 
 im(:,:,1) = reconstruction ./ max(reconstruction(:));
 im(:,:,2) = ground_truth ./ max(ground_truth(:));
diff --git a/matlab/tools/rebin_fan2par.m b/matlab/tools/rebin_fan2par.m
index f30c8d5..b05ab82 100644
--- a/matlab/tools/rebin_fan2par.m
+++ b/matlab/tools/rebin_fan2par.m
@@ -19,13 +19,12 @@ function F = rebin_fan2par(RadonData, BetaDeg, D, thetaDeg)
 %------------------------------------------------------------------------
 % 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/
 %------------------------------------------------------------------------
-% $Id$
 
 NpixPProj = size(RadonData,1);  % aantal pixels per projectie
 %if mod(size(Radondata,1),2)==0
diff --git a/matlab/tools/sliceExtractor.m b/matlab/tools/sliceExtractor.m
index c73f313..c4e0459 100644
--- a/matlab/tools/sliceExtractor.m
+++ b/matlab/tools/sliceExtractor.m
@@ -13,13 +13,12 @@ function slice = sliceExtractor(data, dir, slicenr)
 %------------------------------------------------------------------------
 % 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/
 %------------------------------------------------------------------------
-% $Id$
 
 slicenr = round(slicenr);