diff options
353 files changed, 1083 insertions, 2066 deletions
@@ -1,12 +1,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             http://visielab.uantwerpen.be/ and http://www.cwi.nl/  License: Open Source under GPLv3  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  -----------------------------------------------------------------------  1.7.1beta (2015-12-23) @@ -12,7 +12,7 @@ The basic forward and backward projection operations are GPU-accelerated, and di  ## Documentation / samples -See the MATLAB and Python code samples in samples/ and on http://sf.net/projects/astra-toolbox . +See the MATLAB and Python code samples in samples/ and on http://www.astra-toolbox.com/ .  ## Installation instructions @@ -117,8 +117,8 @@ The ASTRA Toolbox is open source under the GPLv3 license.  ## Contact  email: astra@uantwerpen.be -website: http://sf.net/projects/astra-toolbox +website: http://www.astra-toolbox.com/ -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             http://visielab.uantwerpen.be/ and http://www.cwi.nl/ @@ -1,12 +1,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             http://visielab.uantwerpen.be/ and http://www.cwi.nl/  License: Open Source under GPLv3  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  ----------------------------------------------------------------------- @@ -29,7 +29,7 @@ Documentation / samples:  -------------------------  See the MATLAB and Python code samples in samples/ and on -http://sf.net/projects/astra-toolbox . +http://www.astra-toolbox.com/ . diff --git a/build/linux/configure.ac b/build/linux/configure.ac index 3a2a92b..2f992ad 100644 --- a/build/linux/configure.ac +++ b/build/linux/configure.ac @@ -1,9 +1,9 @@  dnl ----------------------------------------------------------------------- -dnl Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp -dnl            2014-2015, CWI, Amsterdam +dnl Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +dnl            2014-2016, CWI, Amsterdam  dnl  dnl Contact: astra@uantwerpen.be -dnl Website: http://sf.net/projects/astra-toolbox +dnl Website: http://www.astra-toolbox.com/  dnl  dnl This file is part of the ASTRA Toolbox.  dnl @@ -22,7 +22,6 @@ dnl You should have received a copy of the GNU General Public License  dnl along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.  dnl  dnl ----------------------------------------------------------------------- -dnl $Id$  AC_INIT(astra, 1.7.1)  AC_CONFIG_SRCDIR([Makefile.in]) diff --git a/cuda/2d/algo.cu b/cuda/2d/algo.cu index dc74e51..0e5209f 100644 --- a/cuda/2d/algo.cu +++ b/cuda/2d/algo.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include <cassert> diff --git a/cuda/2d/algo.h b/cuda/2d/algo.h index 99959c8..dc3bb05 100644 --- a/cuda/2d/algo.h +++ b/cuda/2d/algo.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_ALGO_H diff --git a/cuda/2d/arith.cu b/cuda/2d/arith.cu index 110ed51..9805093 100644 --- a/cuda/2d/arith.cu +++ b/cuda/2d/arith.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "util.h" diff --git a/cuda/2d/arith.h b/cuda/2d/arith.h index 2c648a1..5b1c270 100644 --- a/cuda/2d/arith.h +++ b/cuda/2d/arith.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_ARITH_H diff --git a/cuda/2d/astra.cu b/cuda/2d/astra.cu index b56ddf9..2ff9230 100644 --- a/cuda/2d/astra.cu +++ b/cuda/2d/astra.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include <cstdio> diff --git a/cuda/2d/astra.h b/cuda/2d/astra.h index 617883b..78d00e3 100644 --- a/cuda/2d/astra.h +++ b/cuda/2d/astra.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_ASTRA_H diff --git a/cuda/2d/cgls.cu b/cuda/2d/cgls.cu index f402914..6962d81 100644 --- a/cuda/2d/cgls.cu +++ b/cuda/2d/cgls.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include <cstdio> diff --git a/cuda/2d/cgls.h b/cuda/2d/cgls.h index c55dd42..804f943 100644 --- a/cuda/2d/cgls.h +++ b/cuda/2d/cgls.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_CGLS_H diff --git a/cuda/2d/darthelper.cu b/cuda/2d/darthelper.cu index 1d10d49..744184e 100644 --- a/cuda/2d/darthelper.cu +++ b/cuda/2d/darthelper.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "util.h" diff --git a/cuda/2d/darthelper.h b/cuda/2d/darthelper.h index acd14e3..a2f1f45 100644 --- a/cuda/2d/darthelper.h +++ b/cuda/2d/darthelper.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_ARITH2_H diff --git a/cuda/2d/dims.h b/cuda/2d/dims.h index e870da5..afb997a 100644 --- a/cuda/2d/dims.h +++ b/cuda/2d/dims.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_DIMS_H diff --git a/cuda/2d/em.cu b/cuda/2d/em.cu index 8593b08..11ed45b 100644 --- a/cuda/2d/em.cu +++ b/cuda/2d/em.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include <cstdio> diff --git a/cuda/2d/em.h b/cuda/2d/em.h index 9b62fa5..f99e798 100644 --- a/cuda/2d/em.h +++ b/cuda/2d/em.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_EM_H diff --git a/cuda/2d/fan_bp.cu b/cuda/2d/fan_bp.cu index b4321ba..2025528 100644 --- a/cuda/2d/fan_bp.cu +++ b/cuda/2d/fan_bp.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include <cstdio> diff --git a/cuda/2d/fan_bp.h b/cuda/2d/fan_bp.h index 3ebe1e8..4e466fc 100644 --- a/cuda/2d/fan_bp.h +++ b/cuda/2d/fan_bp.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_FAN_BP_H diff --git a/cuda/2d/fan_fp.cu b/cuda/2d/fan_fp.cu index 7c9d8cc..494e89b 100644 --- a/cuda/2d/fan_fp.cu +++ b/cuda/2d/fan_fp.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include <cstdio> diff --git a/cuda/2d/fan_fp.h b/cuda/2d/fan_fp.h index 3962ee3..4bc07eb 100644 --- a/cuda/2d/fan_fp.h +++ b/cuda/2d/fan_fp.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_FAN_FP_H diff --git a/cuda/2d/fbp_filters.h b/cuda/2d/fbp_filters.h index b206a5d..f1223c5 100644 --- a/cuda/2d/fbp_filters.h +++ b/cuda/2d/fbp_filters.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef FBP_FILTERS_H diff --git a/cuda/2d/fft.cu b/cuda/2d/fft.cu index 3dd1c22..654bbae 100644 --- a/cuda/2d/fft.cu +++ b/cuda/2d/fft.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "fft.h" diff --git a/cuda/2d/fft.h b/cuda/2d/fft.h index e985fc6..91f05f2 100644 --- a/cuda/2d/fft.h +++ b/cuda/2d/fft.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef FFT_H diff --git a/cuda/2d/par_bp.cu b/cuda/2d/par_bp.cu index d9f7325..dfdd193 100644 --- a/cuda/2d/par_bp.cu +++ b/cuda/2d/par_bp.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include <cstdio> diff --git a/cuda/2d/par_bp.h b/cuda/2d/par_bp.h index 64bcd34..0720030 100644 --- a/cuda/2d/par_bp.h +++ b/cuda/2d/par_bp.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_PAR_BP_H diff --git a/cuda/2d/par_fp.cu b/cuda/2d/par_fp.cu index bb8b909..f58a643 100644 --- a/cuda/2d/par_fp.cu +++ b/cuda/2d/par_fp.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include <cstdio> diff --git a/cuda/2d/par_fp.h b/cuda/2d/par_fp.h index 010d064..4830c1e 100644 --- a/cuda/2d/par_fp.h +++ b/cuda/2d/par_fp.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_PAR_FP_H diff --git a/cuda/2d/sart.cu b/cuda/2d/sart.cu index c8608a3..f444b63 100644 --- a/cuda/2d/sart.cu +++ b/cuda/2d/sart.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include <cstdio> diff --git a/cuda/2d/sart.h b/cuda/2d/sart.h index eff9ecf..ab99e66 100644 --- a/cuda/2d/sart.h +++ b/cuda/2d/sart.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_SART_H diff --git a/cuda/2d/sirt.cu b/cuda/2d/sirt.cu index 4baaccb..0079717 100644 --- a/cuda/2d/sirt.cu +++ b/cuda/2d/sirt.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include <cstdio> diff --git a/cuda/2d/sirt.h b/cuda/2d/sirt.h index bc913f4..488ab0a 100644 --- a/cuda/2d/sirt.h +++ b/cuda/2d/sirt.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_SIRT_H diff --git a/cuda/2d/util.cu b/cuda/2d/util.cu index a4f8f3e..09d1a2b 100644 --- a/cuda/2d/util.cu +++ b/cuda/2d/util.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include <cstdio> diff --git a/cuda/2d/util.h b/cuda/2d/util.h index ff438c3..875aae3 100644 --- a/cuda/2d/util.h +++ b/cuda/2d/util.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_UTIL_H diff --git a/cuda/3d/algo3d.cu b/cuda/3d/algo3d.cu index e2c1e43..437c493 100644 --- a/cuda/3d/algo3d.cu +++ b/cuda/3d/algo3d.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include <cassert> diff --git a/cuda/3d/algo3d.h b/cuda/3d/algo3d.h index ce331ad..6ba8b6f 100644 --- a/cuda/3d/algo3d.h +++ b/cuda/3d/algo3d.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_ALGO_H diff --git a/cuda/3d/arith3d.cu b/cuda/3d/arith3d.cu index 471b5cd..fd41812 100644 --- a/cuda/3d/arith3d.cu +++ b/cuda/3d/arith3d.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "util3d.h" diff --git a/cuda/3d/arith3d.h b/cuda/3d/arith3d.h index 85d3d3b..c42603e 100644 --- a/cuda/3d/arith3d.h +++ b/cuda/3d/arith3d.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_ARITH3D_H diff --git a/cuda/3d/astra3d.cu b/cuda/3d/astra3d.cu index 3bd56ea..8e0946e 100644 --- a/cuda/3d/astra3d.cu +++ b/cuda/3d/astra3d.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include <cstdio> diff --git a/cuda/3d/astra3d.h b/cuda/3d/astra3d.h index 93bf576..5267899 100644 --- a/cuda/3d/astra3d.h +++ b/cuda/3d/astra3d.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_ASTRA3D_H diff --git a/cuda/3d/cgls3d.cu b/cuda/3d/cgls3d.cu index 0b0331e..7200144 100644 --- a/cuda/3d/cgls3d.cu +++ b/cuda/3d/cgls3d.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include <cstdio> diff --git a/cuda/3d/cgls3d.h b/cuda/3d/cgls3d.h index bfb4af8..e09fcfb 100644 --- a/cuda/3d/cgls3d.h +++ b/cuda/3d/cgls3d.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_CGLS3D_H diff --git a/cuda/3d/cone_bp.cu b/cuda/3d/cone_bp.cu index 6bd9d16..c3405b8 100644 --- a/cuda/3d/cone_bp.cu +++ b/cuda/3d/cone_bp.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include <cstdio> diff --git a/cuda/3d/cone_bp.h b/cuda/3d/cone_bp.h index a6e2c23..3952ab9 100644 --- a/cuda/3d/cone_bp.h +++ b/cuda/3d/cone_bp.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_CONE_BP_H diff --git a/cuda/3d/cone_fp.cu b/cuda/3d/cone_fp.cu index fefcdc1..e6f01e9 100644 --- a/cuda/3d/cone_fp.cu +++ b/cuda/3d/cone_fp.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include <cstdio> diff --git a/cuda/3d/cone_fp.h b/cuda/3d/cone_fp.h index 62c9caa..d46990b 100644 --- a/cuda/3d/cone_fp.h +++ b/cuda/3d/cone_fp.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_CONE_FP_H diff --git a/cuda/3d/darthelper3d.cu b/cuda/3d/darthelper3d.cu index d9bd636..1457017 100644 --- a/cuda/3d/darthelper3d.cu +++ b/cuda/3d/darthelper3d.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "util3d.h" diff --git a/cuda/3d/darthelper3d.h b/cuda/3d/darthelper3d.h index fdf43b9..71ea5b0 100644 --- a/cuda/3d/darthelper3d.h +++ b/cuda/3d/darthelper3d.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_DARTHELPER3_H diff --git a/cuda/3d/dims3d.h b/cuda/3d/dims3d.h index eb7045f..24c334a 100644 --- a/cuda/3d/dims3d.h +++ b/cuda/3d/dims3d.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_CONE_DIMS_H diff --git a/cuda/3d/fdk.cu b/cuda/3d/fdk.cu index bbac0be..bf41b62 100644 --- a/cuda/3d/fdk.cu +++ b/cuda/3d/fdk.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include <cstdio> diff --git a/cuda/3d/fdk.h b/cuda/3d/fdk.h index fc0df20..0165af9 100644 --- a/cuda/3d/fdk.h +++ b/cuda/3d/fdk.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_FDK_H diff --git a/cuda/3d/mem3d.cu b/cuda/3d/mem3d.cu index cb15ab9..eae9676 100644 --- a/cuda/3d/mem3d.cu +++ b/cuda/3d/mem3d.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include <cstdio> diff --git a/cuda/3d/mem3d.h b/cuda/3d/mem3d.h index bb8b091..0e29774 100644 --- a/cuda/3d/mem3d.h +++ b/cuda/3d/mem3d.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. diff --git a/cuda/3d/par3d_bp.cu b/cuda/3d/par3d_bp.cu index 491ee2f..e43479a 100644 --- a/cuda/3d/par3d_bp.cu +++ b/cuda/3d/par3d_bp.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include <cstdio> diff --git a/cuda/3d/par3d_bp.h b/cuda/3d/par3d_bp.h index 3efad19..4454395 100644 --- a/cuda/3d/par3d_bp.h +++ b/cuda/3d/par3d_bp.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_PAR3D_BP_H diff --git a/cuda/3d/par3d_fp.cu b/cuda/3d/par3d_fp.cu index 6f9ce40..a99308f 100644 --- a/cuda/3d/par3d_fp.cu +++ b/cuda/3d/par3d_fp.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include <cstdio> diff --git a/cuda/3d/par3d_fp.h b/cuda/3d/par3d_fp.h index 5f65cd9..c69ab51 100644 --- a/cuda/3d/par3d_fp.h +++ b/cuda/3d/par3d_fp.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_PAR3D_FP_H diff --git a/cuda/3d/sirt3d.cu b/cuda/3d/sirt3d.cu index ba6a159..4d1ed81 100644 --- a/cuda/3d/sirt3d.cu +++ b/cuda/3d/sirt3d.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include <cstdio> diff --git a/cuda/3d/sirt3d.h b/cuda/3d/sirt3d.h index 5e93deb..69031b8 100644 --- a/cuda/3d/sirt3d.h +++ b/cuda/3d/sirt3d.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_SIRT3D_H diff --git a/cuda/3d/util3d.cu b/cuda/3d/util3d.cu index 537ed69..e7b8fbb 100644 --- a/cuda/3d/util3d.cu +++ b/cuda/3d/util3d.cu @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include <cstdio> diff --git a/cuda/3d/util3d.h b/cuda/3d/util3d.h index fa0a03f..7dca762 100644 --- a/cuda/3d/util3d.h +++ b/cuda/3d/util3d.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _CUDA_UTIL3D_H diff --git a/include/astra/Algorithm.h b/include/astra/Algorithm.h index 18c465f..2273a83 100644 --- a/include/astra/Algorithm.h +++ b/include/astra/Algorithm.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_ALGORITHM diff --git a/include/astra/AlgorithmTypelist.h b/include/astra/AlgorithmTypelist.h index 8886a07..7779eaa 100644 --- a/include/astra/AlgorithmTypelist.h +++ b/include/astra/AlgorithmTypelist.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_ALGORITHMTYPELIST diff --git a/include/astra/ArtAlgorithm.h b/include/astra/ArtAlgorithm.h index 1ad9f3f..697456a 100644 --- a/include/astra/ArtAlgorithm.h +++ b/include/astra/ArtAlgorithm.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_ARTALGORITHM diff --git a/include/astra/AstraObjectFactory.h b/include/astra/AstraObjectFactory.h index 6af9cd8..eb22862 100644 --- a/include/astra/AstraObjectFactory.h +++ b/include/astra/AstraObjectFactory.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_ASTRAOBJECTFACTORY diff --git a/include/astra/AstraObjectManager.h b/include/astra/AstraObjectManager.h index 9faecbe..97fde40 100644 --- a/include/astra/AstraObjectManager.h +++ b/include/astra/AstraObjectManager.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_ASTRAOBJECTMANAGER diff --git a/include/astra/AsyncAlgorithm.h b/include/astra/AsyncAlgorithm.h index a3157fc..d82ec69 100644 --- a/include/astra/AsyncAlgorithm.h +++ b/include/astra/AsyncAlgorithm.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_ASYNCALGORITHM diff --git a/include/astra/BackProjectionAlgorithm.h b/include/astra/BackProjectionAlgorithm.h index 6c55fd5..0d53567 100644 --- a/include/astra/BackProjectionAlgorithm.h +++ b/include/astra/BackProjectionAlgorithm.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_BACKPROJECTIONALGORITHM diff --git a/include/astra/CglsAlgorithm.h b/include/astra/CglsAlgorithm.h index 411f1f9..c7eac73 100644 --- a/include/astra/CglsAlgorithm.h +++ b/include/astra/CglsAlgorithm.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_CGLSALGORITHM diff --git a/include/astra/CompositeGeometryManager.h b/include/astra/CompositeGeometryManager.h index d30ffd1..c0acf4f 100644 --- a/include/astra/CompositeGeometryManager.h +++ b/include/astra/CompositeGeometryManager.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. diff --git a/include/astra/ConeProjectionGeometry3D.h b/include/astra/ConeProjectionGeometry3D.h index dede6e1..ee9d0f8 100644 --- a/include/astra/ConeProjectionGeometry3D.h +++ b/include/astra/ConeProjectionGeometry3D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_CONEPROJECTIONGEOMETRY3D diff --git a/include/astra/ConeVecProjectionGeometry3D.h b/include/astra/ConeVecProjectionGeometry3D.h index f76f9dd..f10ebac 100644 --- a/include/astra/ConeVecProjectionGeometry3D.h +++ b/include/astra/ConeVecProjectionGeometry3D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_CONEVECPROJECTIONGEOMETRY3D diff --git a/include/astra/Config.h b/include/astra/Config.h index c10a16e..fb12995 100644 --- a/include/astra/Config.h +++ b/include/astra/Config.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_CONFIG diff --git a/include/astra/CudaBackProjectionAlgorithm.h b/include/astra/CudaBackProjectionAlgorithm.h index 2450376..629cb56 100644 --- a/include/astra/CudaBackProjectionAlgorithm.h +++ b/include/astra/CudaBackProjectionAlgorithm.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_CUDABACKPROJECTIONALGORITHM diff --git a/include/astra/CudaBackProjectionAlgorithm3D.h b/include/astra/CudaBackProjectionAlgorithm3D.h index 74aeec8..6738988 100644 --- a/include/astra/CudaBackProjectionAlgorithm3D.h +++ b/include/astra/CudaBackProjectionAlgorithm3D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_CUDABACKPROJECTIONALGORITHM3D diff --git a/include/astra/CudaCglsAlgorithm.h b/include/astra/CudaCglsAlgorithm.h index 6aa0343..26babdf 100644 --- a/include/astra/CudaCglsAlgorithm.h +++ b/include/astra/CudaCglsAlgorithm.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_CUDACGLSALGORITHM diff --git a/include/astra/CudaCglsAlgorithm3D.h b/include/astra/CudaCglsAlgorithm3D.h index 3e4084b..650aa27 100644 --- a/include/astra/CudaCglsAlgorithm3D.h +++ b/include/astra/CudaCglsAlgorithm3D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_CUDACGLSALGORITHM3D diff --git a/include/astra/CudaDartMaskAlgorithm.h b/include/astra/CudaDartMaskAlgorithm.h index b3a5c99..2759add 100644 --- a/include/astra/CudaDartMaskAlgorithm.h +++ b/include/astra/CudaDartMaskAlgorithm.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_CUDADARTMASKALGORITHM diff --git a/include/astra/CudaDartMaskAlgorithm3D.h b/include/astra/CudaDartMaskAlgorithm3D.h index 6a71bf3..6dcd365 100644 --- a/include/astra/CudaDartMaskAlgorithm3D.h +++ b/include/astra/CudaDartMaskAlgorithm3D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_CUDADARTMASKALGORITHM3D diff --git a/include/astra/CudaDartSmoothingAlgorithm.h b/include/astra/CudaDartSmoothingAlgorithm.h index 1beac56..dec8b6e 100644 --- a/include/astra/CudaDartSmoothingAlgorithm.h +++ b/include/astra/CudaDartSmoothingAlgorithm.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_CUDADARTSMOOTHINGALGORITHM diff --git a/include/astra/CudaDartSmoothingAlgorithm3D.h b/include/astra/CudaDartSmoothingAlgorithm3D.h index ad69c5a..13bc7fc 100644 --- a/include/astra/CudaDartSmoothingAlgorithm3D.h +++ b/include/astra/CudaDartSmoothingAlgorithm3D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_CUDADARTSMOOTHINGALGORITHM3D diff --git a/include/astra/CudaDataOperationAlgorithm.h b/include/astra/CudaDataOperationAlgorithm.h index 31f0ff5..37391fb 100644 --- a/include/astra/CudaDataOperationAlgorithm.h +++ b/include/astra/CudaDataOperationAlgorithm.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_CUDADATAOPERATIONALGORITHM diff --git a/include/astra/CudaEMAlgorithm.h b/include/astra/CudaEMAlgorithm.h index a9d2711..16948bf 100644 --- a/include/astra/CudaEMAlgorithm.h +++ b/include/astra/CudaEMAlgorithm.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_CUDAEMALGORITHM diff --git a/include/astra/CudaFDKAlgorithm3D.h b/include/astra/CudaFDKAlgorithm3D.h index 477bf34..386129e 100644 --- a/include/astra/CudaFDKAlgorithm3D.h +++ b/include/astra/CudaFDKAlgorithm3D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_CUDAFDKALGORITHM3D diff --git a/include/astra/CudaFilteredBackProjectionAlgorithm.h b/include/astra/CudaFilteredBackProjectionAlgorithm.h index cf1f19f..0c66b19 100644 --- a/include/astra/CudaFilteredBackProjectionAlgorithm.h +++ b/include/astra/CudaFilteredBackProjectionAlgorithm.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef CUDAFILTEREDBACKPROJECTIONALGORITHM2_H diff --git a/include/astra/CudaForwardProjectionAlgorithm.h b/include/astra/CudaForwardProjectionAlgorithm.h index 449a610..01661b1 100644 --- a/include/astra/CudaForwardProjectionAlgorithm.h +++ b/include/astra/CudaForwardProjectionAlgorithm.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_CUDAFORWARDPROJECTIONALGORITHM2 diff --git a/include/astra/CudaForwardProjectionAlgorithm3D.h b/include/astra/CudaForwardProjectionAlgorithm3D.h index 4198d56..95af73a 100644 --- a/include/astra/CudaForwardProjectionAlgorithm3D.h +++ b/include/astra/CudaForwardProjectionAlgorithm3D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_CUDAFORWARDPROJECTIONALGORITHM3D diff --git a/include/astra/CudaProjector2D.h b/include/astra/CudaProjector2D.h index 2b4bacb..d43de33 100644 --- a/include/astra/CudaProjector2D.h +++ b/include/astra/CudaProjector2D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_CUDAPROJECTOR2D diff --git a/include/astra/CudaProjector3D.h b/include/astra/CudaProjector3D.h index da88d6d..4c27b78 100644 --- a/include/astra/CudaProjector3D.h +++ b/include/astra/CudaProjector3D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef INC_ASTRA_CUDAPROJECTOR3D diff --git a/include/astra/CudaReconstructionAlgorithm2D.h b/include/astra/CudaReconstructionAlgorithm2D.h index bb5f2a7..6852bb8 100644 --- a/include/astra/CudaReconstructionAlgorithm2D.h +++ b/include/astra/CudaReconstructionAlgorithm2D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_CUDARECONSTRUCTIONALGORITHM2D diff --git a/include/astra/CudaRoiSelectAlgorithm.h b/include/astra/CudaRoiSelectAlgorithm.h index 8d25fb8..1b3f17f 100644 --- a/include/astra/CudaRoiSelectAlgorithm.h +++ b/include/astra/CudaRoiSelectAlgorithm.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_CUDAROISELECTALGORITHM diff --git a/include/astra/CudaSartAlgorithm.h b/include/astra/CudaSartAlgorithm.h index e5e18f0..207fbb1 100644 --- a/include/astra/CudaSartAlgorithm.h +++ b/include/astra/CudaSartAlgorithm.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_CUDASARTALGORITHM diff --git a/include/astra/CudaSirtAlgorithm.h b/include/astra/CudaSirtAlgorithm.h index 3cd8acc..bad6262 100644 --- a/include/astra/CudaSirtAlgorithm.h +++ b/include/astra/CudaSirtAlgorithm.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_CUDASIRTALGORITHM2 diff --git a/include/astra/CudaSirtAlgorithm3D.h b/include/astra/CudaSirtAlgorithm3D.h index 60191cd..a0b8794 100644 --- a/include/astra/CudaSirtAlgorithm3D.h +++ b/include/astra/CudaSirtAlgorithm3D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_CUDASIRTALGORITHM3D diff --git a/include/astra/DataProjector.h b/include/astra/DataProjector.h index e486075..d321b54 100644 --- a/include/astra/DataProjector.h +++ b/include/astra/DataProjector.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_DATAPROJECTOR diff --git a/include/astra/DataProjectorPolicies.h b/include/astra/DataProjectorPolicies.h index acfb36f..c67bb1e 100644 --- a/include/astra/DataProjectorPolicies.h +++ b/include/astra/DataProjectorPolicies.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_DATAPROJECTORPOLICIES diff --git a/include/astra/DataProjectorPolicies.inl b/include/astra/DataProjectorPolicies.inl index f300761..6a4a2a6 100644 --- a/include/astra/DataProjectorPolicies.inl +++ b/include/astra/DataProjectorPolicies.inl @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_DATAPROJECTORPOLICIES_INLINE diff --git a/include/astra/FanFlatBeamLineKernelProjector2D.h b/include/astra/FanFlatBeamLineKernelProjector2D.h index f1a80ed..3b86a18 100644 --- a/include/astra/FanFlatBeamLineKernelProjector2D.h +++ b/include/astra/FanFlatBeamLineKernelProjector2D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_FANFLATBEAMLINEKERNELPROJECTOR diff --git a/include/astra/FanFlatBeamLineKernelProjector2D.inl b/include/astra/FanFlatBeamLineKernelProjector2D.inl index 2f87659..b95f030 100644 --- a/include/astra/FanFlatBeamLineKernelProjector2D.inl +++ b/include/astra/FanFlatBeamLineKernelProjector2D.inl @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */ diff --git a/include/astra/FanFlatBeamStripKernelProjector2D.h b/include/astra/FanFlatBeamStripKernelProjector2D.h index 08e29e7..4a3db6e 100644 --- a/include/astra/FanFlatBeamStripKernelProjector2D.h +++ b/include/astra/FanFlatBeamStripKernelProjector2D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_FANFLATBEAMSTRIPKERNELPROJECTOR diff --git a/include/astra/FanFlatBeamStripKernelProjector2D.inl b/include/astra/FanFlatBeamStripKernelProjector2D.inl index 38cf003..eaf50e6 100644 --- a/include/astra/FanFlatBeamStripKernelProjector2D.inl +++ b/include/astra/FanFlatBeamStripKernelProjector2D.inl @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */ diff --git a/include/astra/FanFlatProjectionGeometry2D.h b/include/astra/FanFlatProjectionGeometry2D.h index 180fe68..e9a0535 100644 --- a/include/astra/FanFlatProjectionGeometry2D.h +++ b/include/astra/FanFlatProjectionGeometry2D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_FANFLATPROJECTIONGEOMETRY2D diff --git a/include/astra/FanFlatVecProjectionGeometry2D.h b/include/astra/FanFlatVecProjectionGeometry2D.h index d93de79..7130f24 100644 --- a/include/astra/FanFlatVecProjectionGeometry2D.h +++ b/include/astra/FanFlatVecProjectionGeometry2D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_FANFLATVECPROJECTIONGEOMETRY2D diff --git a/include/astra/FilteredBackProjectionAlgorithm.h b/include/astra/FilteredBackProjectionAlgorithm.h index 0ae0f25..020c341 100644 --- a/include/astra/FilteredBackProjectionAlgorithm.h +++ b/include/astra/FilteredBackProjectionAlgorithm.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_FILTEREDBACKPROJECTION diff --git a/include/astra/Float32Data.h b/include/astra/Float32Data.h index 6d36ff8..7925c8c 100644 --- a/include/astra/Float32Data.h +++ b/include/astra/Float32Data.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_FLOAT32DATA diff --git a/include/astra/Float32Data2D.h b/include/astra/Float32Data2D.h index 57cb82b..b33bcd0 100644 --- a/include/astra/Float32Data2D.h +++ b/include/astra/Float32Data2D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_FLOAT32DATA2D diff --git a/include/astra/Float32Data3D.h b/include/astra/Float32Data3D.h index a5add3a..1cd9c20 100644 --- a/include/astra/Float32Data3D.h +++ b/include/astra/Float32Data3D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_FLOAT32DATA3D diff --git a/include/astra/Float32Data3DMemory.h b/include/astra/Float32Data3DMemory.h index ab2c82e..d885101 100644 --- a/include/astra/Float32Data3DMemory.h +++ b/include/astra/Float32Data3DMemory.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_FLOAT32DATA3DMEMORY diff --git a/include/astra/Float32ProjectionData2D.h b/include/astra/Float32ProjectionData2D.h index bb99f4b..4cfca03 100644 --- a/include/astra/Float32ProjectionData2D.h +++ b/include/astra/Float32ProjectionData2D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_FLOAT32PROJECTIONDATA2D diff --git a/include/astra/Float32ProjectionData3D.h b/include/astra/Float32ProjectionData3D.h index 329c9a4..ae0664b 100644 --- a/include/astra/Float32ProjectionData3D.h +++ b/include/astra/Float32ProjectionData3D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_FLOAT32PROJECTIONDATA3D diff --git a/include/astra/Float32ProjectionData3DMemory.h b/include/astra/Float32ProjectionData3DMemory.h index f7882b7..14bae36 100644 --- a/include/astra/Float32ProjectionData3DMemory.h +++ b/include/astra/Float32ProjectionData3DMemory.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_FLOAT32PROJECTIONDATA3DMEMORY diff --git a/include/astra/Float32VolumeData2D.h b/include/astra/Float32VolumeData2D.h index abecebf..bae9a52 100644 --- a/include/astra/Float32VolumeData2D.h +++ b/include/astra/Float32VolumeData2D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_FLOAT32VOLUMEDATA2D diff --git a/include/astra/Float32VolumeData3D.h b/include/astra/Float32VolumeData3D.h index 07df78f..7a32efe 100644 --- a/include/astra/Float32VolumeData3D.h +++ b/include/astra/Float32VolumeData3D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_FLOAT32VOLUMEDATA3D diff --git a/include/astra/Float32VolumeData3DMemory.h b/include/astra/Float32VolumeData3DMemory.h index 619d83b..870c6e2 100644 --- a/include/astra/Float32VolumeData3DMemory.h +++ b/include/astra/Float32VolumeData3DMemory.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_FLOAT32VOLUMEDATA3DMEMORY diff --git a/include/astra/ForwardProjectionAlgorithm.h b/include/astra/ForwardProjectionAlgorithm.h index 4188010..cd7a879 100644 --- a/include/astra/ForwardProjectionAlgorithm.h +++ b/include/astra/ForwardProjectionAlgorithm.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_FORWARDPROJECTIONALGORITHM diff --git a/include/astra/Fourier.h b/include/astra/Fourier.h index 68f9f38..4111c99 100644 --- a/include/astra/Fourier.h +++ b/include/astra/Fourier.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_FOURIER diff --git a/include/astra/GeometryUtil2D.h b/include/astra/GeometryUtil2D.h index d4ee92e..6434d3c 100644 --- a/include/astra/GeometryUtil2D.h +++ b/include/astra/GeometryUtil2D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_GEOMETRYUTIL2D diff --git a/include/astra/GeometryUtil3D.h b/include/astra/GeometryUtil3D.h index e051240..0a75fab 100644 --- a/include/astra/GeometryUtil3D.h +++ b/include/astra/GeometryUtil3D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_GEOMETRYUTIL3D diff --git a/include/astra/Globals.h b/include/astra/Globals.h index 5dbac83..3cb466c 100644 --- a/include/astra/Globals.h +++ b/include/astra/Globals.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_GLOBALS diff --git a/include/astra/Logging.h b/include/astra/Logging.h index 8e19ea4..78343a1 100644 --- a/include/astra/Logging.h +++ b/include/astra/Logging.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_LOGGING diff --git a/include/astra/ParallelBeamBlobKernelProjector2D.h b/include/astra/ParallelBeamBlobKernelProjector2D.h index ecf71ef..529cc10 100644 --- a/include/astra/ParallelBeamBlobKernelProjector2D.h +++ b/include/astra/ParallelBeamBlobKernelProjector2D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_PARALLELBEAMBLOBPROJECTOR diff --git a/include/astra/ParallelBeamBlobKernelProjector2D.inl b/include/astra/ParallelBeamBlobKernelProjector2D.inl index 467e066..c5040b7 100644 --- a/include/astra/ParallelBeamBlobKernelProjector2D.inl +++ b/include/astra/ParallelBeamBlobKernelProjector2D.inl @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */ diff --git a/include/astra/ParallelBeamLineKernelProjector2D.h b/include/astra/ParallelBeamLineKernelProjector2D.h index 24f43d5..0f25d83 100644 --- a/include/astra/ParallelBeamLineKernelProjector2D.h +++ b/include/astra/ParallelBeamLineKernelProjector2D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_PARALLELBEAMLINEKERNELPROJECTOR diff --git a/include/astra/ParallelBeamLineKernelProjector2D.inl b/include/astra/ParallelBeamLineKernelProjector2D.inl index c11f243..dcd11bd 100644 --- a/include/astra/ParallelBeamLineKernelProjector2D.inl +++ b/include/astra/ParallelBeamLineKernelProjector2D.inl @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  template <typename Policy> diff --git a/include/astra/ParallelBeamLinearKernelProjector2D.h b/include/astra/ParallelBeamLinearKernelProjector2D.h index 855093a..7b40628 100644 --- a/include/astra/ParallelBeamLinearKernelProjector2D.h +++ b/include/astra/ParallelBeamLinearKernelProjector2D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_PARALLELLINEARKERNELPROJECTOR diff --git a/include/astra/ParallelBeamLinearKernelProjector2D.inl b/include/astra/ParallelBeamLinearKernelProjector2D.inl index 67e0d58..30040fa 100644 --- a/include/astra/ParallelBeamLinearKernelProjector2D.inl +++ b/include/astra/ParallelBeamLinearKernelProjector2D.inl @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */ diff --git a/include/astra/ParallelBeamStripKernelProjector2D.h b/include/astra/ParallelBeamStripKernelProjector2D.h index 624bd3c..373c7fa 100644 --- a/include/astra/ParallelBeamStripKernelProjector2D.h +++ b/include/astra/ParallelBeamStripKernelProjector2D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_PARALLELBEAMSTROKEKERNELPROJECTOR diff --git a/include/astra/ParallelBeamStripKernelProjector2D.inl b/include/astra/ParallelBeamStripKernelProjector2D.inl index 7d73888..e8e3739 100644 --- a/include/astra/ParallelBeamStripKernelProjector2D.inl +++ b/include/astra/ParallelBeamStripKernelProjector2D.inl @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  template <typename Policy> diff --git a/include/astra/ParallelProjectionGeometry2D.h b/include/astra/ParallelProjectionGeometry2D.h index 2f7d36f..963bb06 100644 --- a/include/astra/ParallelProjectionGeometry2D.h +++ b/include/astra/ParallelProjectionGeometry2D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_PARALLELPROJECTIONGEOMETRY2D diff --git a/include/astra/ParallelProjectionGeometry3D.h b/include/astra/ParallelProjectionGeometry3D.h index d95c050..aa86836 100644 --- a/include/astra/ParallelProjectionGeometry3D.h +++ b/include/astra/ParallelProjectionGeometry3D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_PARALLELPROJECTIONGEOMETRY3D diff --git a/include/astra/ParallelVecProjectionGeometry3D.h b/include/astra/ParallelVecProjectionGeometry3D.h index ec91086..3d5ce23 100644 --- a/include/astra/ParallelVecProjectionGeometry3D.h +++ b/include/astra/ParallelVecProjectionGeometry3D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_PARALLELVECPROJECTIONGEOMETRY3D diff --git a/include/astra/PlatformDepSystemCode.h b/include/astra/PlatformDepSystemCode.h index 580c393..4a37568 100644 --- a/include/astra/PlatformDepSystemCode.h +++ b/include/astra/PlatformDepSystemCode.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef PLATFORMDEPSYSTEMCODE_H diff --git a/include/astra/PluginAlgorithm.h b/include/astra/PluginAlgorithm.h index cbd80fc..c114921 100644 --- a/include/astra/PluginAlgorithm.h +++ b/include/astra/PluginAlgorithm.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_PLUGINALGORITHM diff --git a/include/astra/ProjectionGeometry2D.h b/include/astra/ProjectionGeometry2D.h index b8324e2..393db77 100644 --- a/include/astra/ProjectionGeometry2D.h +++ b/include/astra/ProjectionGeometry2D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_PROJECTIONGEOMETRY2D diff --git a/include/astra/ProjectionGeometry3D.h b/include/astra/ProjectionGeometry3D.h index 0b60287..545abd1 100644 --- a/include/astra/ProjectionGeometry3D.h +++ b/include/astra/ProjectionGeometry3D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_PROJECTIONGEOMETRY3D diff --git a/include/astra/Projector2D.h b/include/astra/Projector2D.h index c7a899d..8a5182a 100644 --- a/include/astra/Projector2D.h +++ b/include/astra/Projector2D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef INC_ASTRA_PROJECTOR2D diff --git a/include/astra/Projector2DImpl.inl b/include/astra/Projector2DImpl.inl index 75b12d0..ffebb55 100644 --- a/include/astra/Projector2DImpl.inl +++ b/include/astra/Projector2DImpl.inl @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */ diff --git a/include/astra/Projector3D.h b/include/astra/Projector3D.h index 88ca2be..ef9ca63 100644 --- a/include/astra/Projector3D.h +++ b/include/astra/Projector3D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef INC_ASTRA_PROJECTOR3D diff --git a/include/astra/ProjectorTypelist.h b/include/astra/ProjectorTypelist.h index 4ab7e98..2c6eaa2 100644 --- a/include/astra/ProjectorTypelist.h +++ b/include/astra/ProjectorTypelist.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_PROJECTORTYPELIST diff --git a/include/astra/ReconstructionAlgorithm2D.h b/include/astra/ReconstructionAlgorithm2D.h index ac87c4f..6ee7234 100644 --- a/include/astra/ReconstructionAlgorithm2D.h +++ b/include/astra/ReconstructionAlgorithm2D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_RECONSTRUCTIONALGORITHM2D diff --git a/include/astra/ReconstructionAlgorithm3D.h b/include/astra/ReconstructionAlgorithm3D.h index 42b2ab4..010443f 100644 --- a/include/astra/ReconstructionAlgorithm3D.h +++ b/include/astra/ReconstructionAlgorithm3D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_RECONSTRUCTIONALGORITHM3D diff --git a/include/astra/SartAlgorithm.h b/include/astra/SartAlgorithm.h index cdae029..5f39c3a 100644 --- a/include/astra/SartAlgorithm.h +++ b/include/astra/SartAlgorithm.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_SARTALGORITHM diff --git a/include/astra/Singleton.h b/include/astra/Singleton.h index 7271691..b823c0f 100644 --- a/include/astra/Singleton.h +++ b/include/astra/Singleton.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_SINGLETON diff --git a/include/astra/SirtAlgorithm.h b/include/astra/SirtAlgorithm.h index 8044d09..70bc3cf 100644 --- a/include/astra/SirtAlgorithm.h +++ b/include/astra/SirtAlgorithm.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_SIRTALGORITHM diff --git a/include/astra/SparseMatrix.h b/include/astra/SparseMatrix.h index 585981c..1eb329f 100644 --- a/include/astra/SparseMatrix.h +++ b/include/astra/SparseMatrix.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_SPARSEMATRIX diff --git a/include/astra/SparseMatrixProjectionGeometry2D.h b/include/astra/SparseMatrixProjectionGeometry2D.h index d56f95e..26a43ca 100644 --- a/include/astra/SparseMatrixProjectionGeometry2D.h +++ b/include/astra/SparseMatrixProjectionGeometry2D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_SPARSEMATRIXPROJECTIONGEOMETRY2D diff --git a/include/astra/SparseMatrixProjector2D.h b/include/astra/SparseMatrixProjector2D.h index 839fd2a..d871212 100644 --- a/include/astra/SparseMatrixProjector2D.h +++ b/include/astra/SparseMatrixProjector2D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_SPARSEMATRIXPROJECTOR2D diff --git a/include/astra/SparseMatrixProjector2D.inl b/include/astra/SparseMatrixProjector2D.inl index 8246e42..af5aa15 100644 --- a/include/astra/SparseMatrixProjector2D.inl +++ b/include/astra/SparseMatrixProjector2D.inl @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */ diff --git a/include/astra/TypeList.h b/include/astra/TypeList.h index 442bb25..7460969 100644 --- a/include/astra/TypeList.h +++ b/include/astra/TypeList.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_TYPELIST diff --git a/include/astra/Utilities.h b/include/astra/Utilities.h index 22adfe2..097fb11 100644 --- a/include/astra/Utilities.h +++ b/include/astra/Utilities.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_UTILIES diff --git a/include/astra/Vector3D.h b/include/astra/Vector3D.h index 2dfc31d..8e7bebf 100644 --- a/include/astra/Vector3D.h +++ b/include/astra/Vector3D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_VECTOR3D diff --git a/include/astra/VolumeGeometry2D.h b/include/astra/VolumeGeometry2D.h index 28703d5..2b0a5ac 100644 --- a/include/astra/VolumeGeometry2D.h +++ b/include/astra/VolumeGeometry2D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_VOLUMEGEOMETRY2D diff --git a/include/astra/VolumeGeometry3D.h b/include/astra/VolumeGeometry3D.h index ff94844..ff7fa88 100644 --- a/include/astra/VolumeGeometry3D.h +++ b/include/astra/VolumeGeometry3D.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_VOLUMEGEOMETRY3D diff --git a/include/astra/XMLDocument.h b/include/astra/XMLDocument.h index eddd908..e25d398 100644 --- a/include/astra/XMLDocument.h +++ b/include/astra/XMLDocument.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_XMLDOCUMENT diff --git a/include/astra/XMLNode.h b/include/astra/XMLNode.h index 7d1edf5..5e1908a 100644 --- a/include/astra/XMLNode.h +++ b/include/astra/XMLNode.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_XMLNODE diff --git a/include/astra/swrap.h b/include/astra/swrap.h index 612d1b6..cd479f3 100644 --- a/include/astra/swrap.h +++ b/include/astra/swrap.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_SWRAP_H diff --git a/matlab/algorithms/DART/DARTalgorithm.m b/matlab/algorithms/DART/DARTalgorithm.m index fc707dd..34beeee 100644 --- a/matlab/algorithms/DART/DARTalgorithm.m +++ b/matlab/algorithms/DART/DARTalgorithm.m @@ -1,11 +1,11 @@  %--------------------------------------------------------------------------  % This file is part of the ASTRA Toolbox  % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -%                 2014, 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/  %--------------------------------------------------------------------------  classdef DARTalgorithm < matlab.mixin.Copyable diff --git a/matlab/algorithms/DART/IterativeTomography.m b/matlab/algorithms/DART/IterativeTomography.m index 3875e6b..e94dd36 100644 --- a/matlab/algorithms/DART/IterativeTomography.m +++ b/matlab/algorithms/DART/IterativeTomography.m @@ -1,3 +1,13 @@ +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +%            2014-2016, CWI, Amsterdam +% License: Open Source under GPLv3 +% Contact: astra@uantwerpen.be +% Website: http://www.astra-toolbox.com/ +%-------------------------------------------------------------------------- +  classdef IterativeTomography < matlab.mixin.Copyable  	% Algorithm class for 2D Iterative Tomography. diff --git a/matlab/algorithms/DART/IterativeTomography3D.m b/matlab/algorithms/DART/IterativeTomography3D.m index 29b963f..4a0b33a 100644 --- a/matlab/algorithms/DART/IterativeTomography3D.m +++ b/matlab/algorithms/DART/IterativeTomography3D.m @@ -1,3 +1,13 @@ +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +%            2014-2016, CWI, Amsterdam +% License: Open Source under GPLv3 +% Contact: astra@uantwerpen.be +% Website: http://www.astra-toolbox.com/ +%-------------------------------------------------------------------------- +  classdef IterativeTomography3D < matlab.mixin.Copyable  	% Algorithm class for 3D Iterative Tomography. diff --git a/matlab/algorithms/DART/Kernels.m b/matlab/algorithms/DART/Kernels.m index 558f611..02200f7 100644 --- a/matlab/algorithms/DART/Kernels.m +++ b/matlab/algorithms/DART/Kernels.m @@ -1,11 +1,11 @@  %--------------------------------------------------------------------------  % This file is part of the ASTRA Toolbox  % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -%                 2014, 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/  %--------------------------------------------------------------------------  classdef Kernels diff --git a/matlab/algorithms/DART/MaskingDefault.m b/matlab/algorithms/DART/MaskingDefault.m index f91a6f5..cca143e 100644 --- a/matlab/algorithms/DART/MaskingDefault.m +++ b/matlab/algorithms/DART/MaskingDefault.m @@ -1,11 +1,11 @@  %--------------------------------------------------------------------------  % This file is part of the ASTRA Toolbox  % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -%                 2014, 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/  %--------------------------------------------------------------------------  classdef MaskingDefault < matlab.mixin.Copyable diff --git a/matlab/algorithms/DART/MaskingGPU.m b/matlab/algorithms/DART/MaskingGPU.m index 7d31aa8..32859a2 100644 --- a/matlab/algorithms/DART/MaskingGPU.m +++ b/matlab/algorithms/DART/MaskingGPU.m @@ -1,11 +1,11 @@  %--------------------------------------------------------------------------  % This file is part of the ASTRA Toolbox  % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -%                 2014, 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/  %--------------------------------------------------------------------------  classdef MaskingGPU < matlab.mixin.Copyable diff --git a/matlab/algorithms/DART/OutputDefault.m b/matlab/algorithms/DART/OutputDefault.m index 33e908b..cb9979c 100644 --- a/matlab/algorithms/DART/OutputDefault.m +++ b/matlab/algorithms/DART/OutputDefault.m @@ -1,11 +1,11 @@  %--------------------------------------------------------------------------  % This file is part of the ASTRA Toolbox  % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -%                 2014, 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/  %--------------------------------------------------------------------------  classdef OutputDefault < matlab.mixin.Copyable diff --git a/matlab/algorithms/DART/SegmentationDefault.m b/matlab/algorithms/DART/SegmentationDefault.m index 98265c0..4c808d3 100644 --- a/matlab/algorithms/DART/SegmentationDefault.m +++ b/matlab/algorithms/DART/SegmentationDefault.m @@ -1,11 +1,11 @@  %--------------------------------------------------------------------------  % This file is part of the ASTRA Toolbox  % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -%                 2014, 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/  %--------------------------------------------------------------------------  classdef SegmentationDefault < matlab.mixin.Copyable diff --git a/matlab/algorithms/DART/SmoothingDefault.m b/matlab/algorithms/DART/SmoothingDefault.m index 1974fa1..9d1ea9e 100644 --- a/matlab/algorithms/DART/SmoothingDefault.m +++ b/matlab/algorithms/DART/SmoothingDefault.m @@ -1,11 +1,11 @@  %--------------------------------------------------------------------------  % This file is part of the ASTRA Toolbox  % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -%                 2014, 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/  %--------------------------------------------------------------------------  classdef SmoothingDefault < matlab.mixin.Copyable diff --git a/matlab/algorithms/DART/SmoothingGPU.m b/matlab/algorithms/DART/SmoothingGPU.m index 1249e19..7041f19 100644 --- a/matlab/algorithms/DART/SmoothingGPU.m +++ b/matlab/algorithms/DART/SmoothingGPU.m @@ -1,11 +1,11 @@  %--------------------------------------------------------------------------  % This file is part of the ASTRA Toolbox  % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -%                 2014, 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/  %--------------------------------------------------------------------------  classdef SmoothingGPU < matlab.mixin.Copyable diff --git a/matlab/algorithms/DART/StatisticsDefault.m b/matlab/algorithms/DART/StatisticsDefault.m index 9d33256..02e877b 100644 --- a/matlab/algorithms/DART/StatisticsDefault.m +++ b/matlab/algorithms/DART/StatisticsDefault.m @@ -1,11 +1,11 @@  %--------------------------------------------------------------------------  % This file is part of the ASTRA Toolbox  % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -%                 2014, 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/  %--------------------------------------------------------------------------  classdef StatisticsDefault < matlab.mixin.Copyable diff --git a/matlab/algorithms/DART/examples/example1.m b/matlab/algorithms/DART/examples/example1.m index cb02e0f..6c86473 100644 --- a/matlab/algorithms/DART/examples/example1.m +++ b/matlab/algorithms/DART/examples/example1.m @@ -1,11 +1,11 @@  %--------------------------------------------------------------------------  % This file is part of the ASTRA Toolbox  % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -%                 2014, 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/  %--------------------------------------------------------------------------  addpath('../'); diff --git a/matlab/algorithms/DART/examples/example2.m b/matlab/algorithms/DART/examples/example2.m index 89660a5..85774e5 100644 --- a/matlab/algorithms/DART/examples/example2.m +++ b/matlab/algorithms/DART/examples/example2.m @@ -1,11 +1,11 @@  %--------------------------------------------------------------------------  % This file is part of the ASTRA Toolbox  % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -%                 2014, 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/  %--------------------------------------------------------------------------  addpath('../'); diff --git a/matlab/algorithms/DART/examples/example3.m b/matlab/algorithms/DART/examples/example3.m index cc80b0f..647ad2d 100644 --- a/matlab/algorithms/DART/examples/example3.m +++ b/matlab/algorithms/DART/examples/example3.m @@ -1,11 +1,11 @@  %--------------------------------------------------------------------------  % This file is part of the ASTRA Toolbox  % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -%                 2014, 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/  %--------------------------------------------------------------------------  addpath('../'); diff --git a/matlab/algorithms/DART/tools/DARToptimizer.m b/matlab/algorithms/DART/tools/DARToptimizer.m index 7aeabbe..424ff22 100644 --- a/matlab/algorithms/DART/tools/DARToptimizer.m +++ b/matlab/algorithms/DART/tools/DARToptimizer.m @@ -1,11 +1,11 @@  %--------------------------------------------------------------------------  % This file is part of the ASTRA Toolbox  % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -%                 2014, 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/  %--------------------------------------------------------------------------  classdef DARToptimizer < handle diff --git a/matlab/algorithms/DART/tools/DARToptimizerBoneStudy.m b/matlab/algorithms/DART/tools/DARToptimizerBoneStudy.m index 5bcf6e9..c641f87 100644 --- a/matlab/algorithms/DART/tools/DARToptimizerBoneStudy.m +++ b/matlab/algorithms/DART/tools/DARToptimizerBoneStudy.m @@ -1,11 +1,11 @@  %--------------------------------------------------------------------------  % This file is part of the ASTRA Toolbox  % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -%                 2014, 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/  %--------------------------------------------------------------------------  classdef DARToptimizerBoneStudy < handle diff --git a/matlab/algorithms/DART/tools/ProjDiffOptimFunc.m b/matlab/algorithms/DART/tools/ProjDiffOptimFunc.m index 64f3091..72b328f 100644 --- a/matlab/algorithms/DART/tools/ProjDiffOptimFunc.m +++ b/matlab/algorithms/DART/tools/ProjDiffOptimFunc.m @@ -1,11 +1,11 @@  %--------------------------------------------------------------------------  % This file is part of the ASTRA Toolbox  % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -%                 2014, 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/  %--------------------------------------------------------------------------  classdef ProjDiffOptimFunc < handle diff --git a/matlab/algorithms/DART/tools/dart_create_base_phantom.m b/matlab/algorithms/DART/tools/dart_create_base_phantom.m index 4c7061e..acd4048 100644 --- a/matlab/algorithms/DART/tools/dart_create_base_phantom.m +++ b/matlab/algorithms/DART/tools/dart_create_base_phantom.m @@ -1,11 +1,11 @@  %--------------------------------------------------------------------------  % This file is part of the ASTRA Toolbox  % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -%                 2014, 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/  %--------------------------------------------------------------------------  function base = dart_create_base_phantom(Im, angle_count, angle_range, gpu_core) diff --git a/matlab/algorithms/DART/tools/dart_scheduler.m b/matlab/algorithms/DART/tools/dart_scheduler.m index 007fcaa..4749fb1 100644 --- a/matlab/algorithms/DART/tools/dart_scheduler.m +++ b/matlab/algorithms/DART/tools/dart_scheduler.m @@ -1,11 +1,11 @@  %--------------------------------------------------------------------------  % This file is part of the ASTRA Toolbox  % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -%                 2014, 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/  %--------------------------------------------------------------------------  function dart_scheduler(D_tmpl, iterations, settings) diff --git a/matlab/algorithms/DART/tools/rNMPOptimFunc.m b/matlab/algorithms/DART/tools/rNMPOptimFunc.m index 7649d7f..5eb92bf 100644 --- a/matlab/algorithms/DART/tools/rNMPOptimFunc.m +++ b/matlab/algorithms/DART/tools/rNMPOptimFunc.m @@ -1,11 +1,11 @@  %--------------------------------------------------------------------------  % This file is part of the ASTRA Toolbox  % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -%                 2014, 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/  %--------------------------------------------------------------------------  classdef rNMPOptimFunc < handle diff --git a/matlab/mex/astra_mex_algorithm_c.cpp b/matlab/mex/astra_mex_algorithm_c.cpp index ec7aa72..a9cd14b 100644 --- a/matlab/mex/astra_mex_algorithm_c.cpp +++ b/matlab/mex/astra_mex_algorithm_c.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  /** \file astra_mex_algorithm_c.cpp diff --git a/matlab/mex/astra_mex_c.cpp b/matlab/mex/astra_mex_c.cpp index f499528..d9ff8f3 100644 --- a/matlab/mex/astra_mex_c.cpp +++ b/matlab/mex/astra_mex_c.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  /** \file astra_mex_c.cpp diff --git a/matlab/mex/astra_mex_data2d_c.cpp b/matlab/mex/astra_mex_data2d_c.cpp index 935e476..ee558e0 100644 --- a/matlab/mex/astra_mex_data2d_c.cpp +++ b/matlab/mex/astra_mex_data2d_c.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  /** \file astra_mex_data2d_c.cpp diff --git a/matlab/mex/astra_mex_data3d_c.cpp b/matlab/mex/astra_mex_data3d_c.cpp index fe4ce37..7909a79 100644 --- a/matlab/mex/astra_mex_data3d_c.cpp +++ b/matlab/mex/astra_mex_data3d_c.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  /** \file astra_mex_data3d_c.cpp diff --git a/matlab/mex/astra_mex_direct_c.cpp b/matlab/mex/astra_mex_direct_c.cpp index 38b3f59..d92a10c 100644 --- a/matlab/mex/astra_mex_direct_c.cpp +++ b/matlab/mex/astra_mex_direct_c.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  /** \file astra_mex_direct_c.cpp diff --git a/matlab/mex/astra_mex_log_c.cpp b/matlab/mex/astra_mex_log_c.cpp index 905612c..18dc1d4 100644 --- a/matlab/mex/astra_mex_log_c.cpp +++ b/matlab/mex/astra_mex_log_c.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  /** \file astra_mex_log_c.cpp diff --git a/matlab/mex/astra_mex_matrix_c.cpp b/matlab/mex/astra_mex_matrix_c.cpp index e07ddb6..99a7d0e 100644 --- a/matlab/mex/astra_mex_matrix_c.cpp +++ b/matlab/mex/astra_mex_matrix_c.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  /** \file astra_mex_matrix_c.cpp diff --git a/matlab/mex/astra_mex_plugin_c.cpp b/matlab/mex/astra_mex_plugin_c.cpp index 4ed534e..570e495 100644 --- a/matlab/mex/astra_mex_plugin_c.cpp +++ b/matlab/mex/astra_mex_plugin_c.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  /** \file astra_mex_plugin_c.cpp diff --git a/matlab/mex/astra_mex_projector3d_c.cpp b/matlab/mex/astra_mex_projector3d_c.cpp index e25802c..3135939 100644 --- a/matlab/mex/astra_mex_projector3d_c.cpp +++ b/matlab/mex/astra_mex_projector3d_c.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  /** \file astra_mex_projector3d_c.cpp diff --git a/matlab/mex/astra_mex_projector_c.cpp b/matlab/mex/astra_mex_projector_c.cpp index bf701af..36a5704 100644 --- a/matlab/mex/astra_mex_projector_c.cpp +++ b/matlab/mex/astra_mex_projector_c.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  /** \file astra_mex_projector_c.cpp diff --git a/matlab/mex/mexCopyDataHelpFunctions.cpp b/matlab/mex/mexCopyDataHelpFunctions.cpp index 4db6abd..a172a03 100644 --- a/matlab/mex/mexCopyDataHelpFunctions.cpp +++ b/matlab/mex/mexCopyDataHelpFunctions.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "mexCopyDataHelpFunctions.h" diff --git a/matlab/mex/mexCopyDataHelpFunctions.h b/matlab/mex/mexCopyDataHelpFunctions.h index 0853879..3ba4cb2 100644 --- a/matlab/mex/mexCopyDataHelpFunctions.h +++ b/matlab/mex/mexCopyDataHelpFunctions.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef MEXCOPYDATAHELPFUNCTIONS_H_ diff --git a/matlab/mex/mexDataManagerHelpFunctions.cpp b/matlab/mex/mexDataManagerHelpFunctions.cpp index a514565..ebf6f8f 100644 --- a/matlab/mex/mexDataManagerHelpFunctions.cpp +++ b/matlab/mex/mexDataManagerHelpFunctions.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "mexDataManagerHelpFunctions.h" diff --git a/matlab/mex/mexDataManagerHelpFunctions.h b/matlab/mex/mexDataManagerHelpFunctions.h index 0614e05..fff83a0 100644 --- a/matlab/mex/mexDataManagerHelpFunctions.h +++ b/matlab/mex/mexDataManagerHelpFunctions.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef MEXDATAMANAGERHELPFUNCTIONS_H_ diff --git a/matlab/mex/mexHelpFunctions.cpp b/matlab/mex/mexHelpFunctions.cpp index d957aea..8d8f484 100644 --- a/matlab/mex/mexHelpFunctions.cpp +++ b/matlab/mex/mexHelpFunctions.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  /** \file mexHelpFunctions.cpp diff --git a/matlab/mex/mexHelpFunctions.h b/matlab/mex/mexHelpFunctions.h index 07edc64..9b564c5 100644 --- a/matlab/mex/mexHelpFunctions.h +++ b/matlab/mex/mexHelpFunctions.h @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _INC_ASTRA_MEX_HELPFUNCTIONS diff --git a/matlab/mex/mexInitFunctions.h b/matlab/mex/mexInitFunctions.h index f16e9c9..0415fb1 100644 --- a/matlab/mex/mexInitFunctions.h +++ b/matlab/mex/mexInitFunctions.h @@ -3,4 +3,4 @@  void initASTRAMex(); -#endif
\ No newline at end of file +#endif diff --git a/matlab/mex/octave_support.cpp b/matlab/mex/octave_support.cpp index ed04bf0..79556ee 100644 --- a/matlab/mex/octave_support.cpp +++ b/matlab/mex/octave_support.cpp @@ -4,7 +4,7 @@ Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp             2014-2016, CWI, Amsterdam  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. 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 862e410..0a30f23 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); 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 b73149c..4d1de13 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/  % ----------------------------------------------------------------------- diff --git a/src/Algorithm.cpp b/src/Algorithm.cpp index 7b61b8c..5b53d1a 100644 --- a/src/Algorithm.cpp +++ b/src/Algorithm.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/Algorithm.h" diff --git a/src/ArtAlgorithm.cpp b/src/ArtAlgorithm.cpp index 526c263..adec638 100644 --- a/src/ArtAlgorithm.cpp +++ b/src/ArtAlgorithm.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/ArtAlgorithm.h" diff --git a/src/AstraObjectFactory.cpp b/src/AstraObjectFactory.cpp index 1dda3b2..0e09d05 100644 --- a/src/AstraObjectFactory.cpp +++ b/src/AstraObjectFactory.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/AstraObjectFactory.h" diff --git a/src/AstraObjectManager.cpp b/src/AstraObjectManager.cpp index 3b818d3..274601d 100644 --- a/src/AstraObjectManager.cpp +++ b/src/AstraObjectManager.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/AstraObjectManager.h" diff --git a/src/AsyncAlgorithm.cpp b/src/AsyncAlgorithm.cpp index b265f59..54083a3 100644 --- a/src/AsyncAlgorithm.cpp +++ b/src/AsyncAlgorithm.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/AsyncAlgorithm.h" diff --git a/src/BackProjectionAlgorithm.cpp b/src/BackProjectionAlgorithm.cpp index c9beee1..c510858 100644 --- a/src/BackProjectionAlgorithm.cpp +++ b/src/BackProjectionAlgorithm.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/BackProjectionAlgorithm.h" diff --git a/src/CglsAlgorithm.cpp b/src/CglsAlgorithm.cpp index 1ca2549..621e004 100644 --- a/src/CglsAlgorithm.cpp +++ b/src/CglsAlgorithm.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/CglsAlgorithm.h" diff --git a/src/CompositeGeometryManager.cpp b/src/CompositeGeometryManager.cpp index 5879aec..f72f38a 100644 --- a/src/CompositeGeometryManager.cpp +++ b/src/CompositeGeometryManager.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. diff --git a/src/ConeProjectionGeometry3D.cpp b/src/ConeProjectionGeometry3D.cpp index 96b04fb..217a916 100644 --- a/src/ConeProjectionGeometry3D.cpp +++ b/src/ConeProjectionGeometry3D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/ConeProjectionGeometry3D.h" diff --git a/src/ConeVecProjectionGeometry3D.cpp b/src/ConeVecProjectionGeometry3D.cpp index f4f900d..d73b8d1 100644 --- a/src/ConeVecProjectionGeometry3D.cpp +++ b/src/ConeVecProjectionGeometry3D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/ConeVecProjectionGeometry3D.h" diff --git a/src/Config.cpp b/src/Config.cpp index 395080b..ec074e9 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/Config.h" diff --git a/src/CudaBackProjectionAlgorithm.cpp b/src/CudaBackProjectionAlgorithm.cpp index a73f895..354d17d 100644 --- a/src/CudaBackProjectionAlgorithm.cpp +++ b/src/CudaBackProjectionAlgorithm.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifdef ASTRA_CUDA diff --git a/src/CudaBackProjectionAlgorithm3D.cpp b/src/CudaBackProjectionAlgorithm3D.cpp index 76d7b35..223a9a4 100644 --- a/src/CudaBackProjectionAlgorithm3D.cpp +++ b/src/CudaBackProjectionAlgorithm3D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/CudaBackProjectionAlgorithm3D.h" diff --git a/src/CudaCglsAlgorithm.cpp b/src/CudaCglsAlgorithm.cpp index 9dd4f78..8b5bec6 100644 --- a/src/CudaCglsAlgorithm.cpp +++ b/src/CudaCglsAlgorithm.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifdef ASTRA_CUDA diff --git a/src/CudaCglsAlgorithm3D.cpp b/src/CudaCglsAlgorithm3D.cpp index 930a71e..c00c47d 100644 --- a/src/CudaCglsAlgorithm3D.cpp +++ b/src/CudaCglsAlgorithm3D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/CudaCglsAlgorithm3D.h" diff --git a/src/CudaDartMaskAlgorithm.cpp b/src/CudaDartMaskAlgorithm.cpp index c2a4cca..375d565 100644 --- a/src/CudaDartMaskAlgorithm.cpp +++ b/src/CudaDartMaskAlgorithm.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifdef ASTRA_CUDA diff --git a/src/CudaDartMaskAlgorithm3D.cpp b/src/CudaDartMaskAlgorithm3D.cpp index dd12c58..0d7b27e 100644 --- a/src/CudaDartMaskAlgorithm3D.cpp +++ b/src/CudaDartMaskAlgorithm3D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifdef ASTRA_CUDA diff --git a/src/CudaDartSmoothingAlgorithm.cpp b/src/CudaDartSmoothingAlgorithm.cpp index 425f0a3..0759ea0 100644 --- a/src/CudaDartSmoothingAlgorithm.cpp +++ b/src/CudaDartSmoothingAlgorithm.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifdef ASTRA_CUDA diff --git a/src/CudaDartSmoothingAlgorithm3D.cpp b/src/CudaDartSmoothingAlgorithm3D.cpp index df7e0df..b381bc9 100644 --- a/src/CudaDartSmoothingAlgorithm3D.cpp +++ b/src/CudaDartSmoothingAlgorithm3D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifdef ASTRA_CUDA diff --git a/src/CudaDataOperationAlgorithm.cpp b/src/CudaDataOperationAlgorithm.cpp index 82b676b..f9466e2 100644 --- a/src/CudaDataOperationAlgorithm.cpp +++ b/src/CudaDataOperationAlgorithm.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifdef ASTRA_CUDA diff --git a/src/CudaEMAlgorithm.cpp b/src/CudaEMAlgorithm.cpp index d0afd80..040b29a 100644 --- a/src/CudaEMAlgorithm.cpp +++ b/src/CudaEMAlgorithm.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifdef ASTRA_CUDA diff --git a/src/CudaFDKAlgorithm3D.cpp b/src/CudaFDKAlgorithm3D.cpp index 15abed4..fef4f41 100644 --- a/src/CudaFDKAlgorithm3D.cpp +++ b/src/CudaFDKAlgorithm3D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/CudaFDKAlgorithm3D.h" diff --git a/src/CudaFilteredBackProjectionAlgorithm.cpp b/src/CudaFilteredBackProjectionAlgorithm.cpp index aa97eec..7e2df79 100644 --- a/src/CudaFilteredBackProjectionAlgorithm.cpp +++ b/src/CudaFilteredBackProjectionAlgorithm.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include <astra/CudaFilteredBackProjectionAlgorithm.h> diff --git a/src/CudaForwardProjectionAlgorithm.cpp b/src/CudaForwardProjectionAlgorithm.cpp index 80f2e02..bac1251 100644 --- a/src/CudaForwardProjectionAlgorithm.cpp +++ b/src/CudaForwardProjectionAlgorithm.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/CudaForwardProjectionAlgorithm.h" diff --git a/src/CudaForwardProjectionAlgorithm3D.cpp b/src/CudaForwardProjectionAlgorithm3D.cpp index f709e34..6783093 100644 --- a/src/CudaForwardProjectionAlgorithm3D.cpp +++ b/src/CudaForwardProjectionAlgorithm3D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/CudaForwardProjectionAlgorithm3D.h" diff --git a/src/CudaProjector2D.cpp b/src/CudaProjector2D.cpp index acf6000..b0a38b0 100644 --- a/src/CudaProjector2D.cpp +++ b/src/CudaProjector2D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/CudaProjector2D.h" diff --git a/src/CudaProjector3D.cpp b/src/CudaProjector3D.cpp index bbfbd34..29af0c6 100644 --- a/src/CudaProjector3D.cpp +++ b/src/CudaProjector3D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/CudaProjector3D.h" diff --git a/src/CudaReconstructionAlgorithm2D.cpp b/src/CudaReconstructionAlgorithm2D.cpp index 2798434..96f52f0 100644 --- a/src/CudaReconstructionAlgorithm2D.cpp +++ b/src/CudaReconstructionAlgorithm2D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifdef ASTRA_CUDA diff --git a/src/CudaRoiSelectAlgorithm.cpp b/src/CudaRoiSelectAlgorithm.cpp index dfb8056..baf8a6f 100644 --- a/src/CudaRoiSelectAlgorithm.cpp +++ b/src/CudaRoiSelectAlgorithm.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifdef ASTRA_CUDA diff --git a/src/CudaSartAlgorithm.cpp b/src/CudaSartAlgorithm.cpp index bf97224..645b40c 100644 --- a/src/CudaSartAlgorithm.cpp +++ b/src/CudaSartAlgorithm.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifdef ASTRA_CUDA diff --git a/src/CudaSirtAlgorithm.cpp b/src/CudaSirtAlgorithm.cpp index c8dc677..b6b427e 100644 --- a/src/CudaSirtAlgorithm.cpp +++ b/src/CudaSirtAlgorithm.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifdef ASTRA_CUDA diff --git a/src/CudaSirtAlgorithm3D.cpp b/src/CudaSirtAlgorithm3D.cpp index c819f8e..f2d8232 100644 --- a/src/CudaSirtAlgorithm3D.cpp +++ b/src/CudaSirtAlgorithm3D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/CudaSirtAlgorithm3D.h" diff --git a/src/DataProjector.cpp b/src/DataProjector.cpp index 83d88a2..4290958 100644 --- a/src/DataProjector.cpp +++ b/src/DataProjector.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/DataProjector.h" diff --git a/src/DataProjectorPolicies.cpp b/src/DataProjectorPolicies.cpp index 324ceeb..e719a5e 100644 --- a/src/DataProjectorPolicies.cpp +++ b/src/DataProjectorPolicies.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/DataProjectorPolicies.h" diff --git a/src/FanFlatBeamLineKernelProjector2D.cpp b/src/FanFlatBeamLineKernelProjector2D.cpp index 343144d..4bfff58 100644 --- a/src/FanFlatBeamLineKernelProjector2D.cpp +++ b/src/FanFlatBeamLineKernelProjector2D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/FanFlatBeamLineKernelProjector2D.h" diff --git a/src/FanFlatBeamStripKernelProjector2D.cpp b/src/FanFlatBeamStripKernelProjector2D.cpp index 6e2c518..198c0ea 100644 --- a/src/FanFlatBeamStripKernelProjector2D.cpp +++ b/src/FanFlatBeamStripKernelProjector2D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/FanFlatBeamStripKernelProjector2D.h" diff --git a/src/FanFlatProjectionGeometry2D.cpp b/src/FanFlatProjectionGeometry2D.cpp index 8bee0d6..28bc75e 100644 --- a/src/FanFlatProjectionGeometry2D.cpp +++ b/src/FanFlatProjectionGeometry2D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/FanFlatProjectionGeometry2D.h" diff --git a/src/FanFlatVecProjectionGeometry2D.cpp b/src/FanFlatVecProjectionGeometry2D.cpp index 0b76fc5..b213384 100644 --- a/src/FanFlatVecProjectionGeometry2D.cpp +++ b/src/FanFlatVecProjectionGeometry2D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/FanFlatVecProjectionGeometry2D.h" diff --git a/src/FilteredBackProjectionAlgorithm.cpp b/src/FilteredBackProjectionAlgorithm.cpp index 70462f7..2361379 100644 --- a/src/FilteredBackProjectionAlgorithm.cpp +++ b/src/FilteredBackProjectionAlgorithm.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/FilteredBackProjectionAlgorithm.h" diff --git a/src/Float32Data.cpp b/src/Float32Data.cpp index f668a9f..1bb45d8 100644 --- a/src/Float32Data.cpp +++ b/src/Float32Data.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/Float32Data.h" diff --git a/src/Float32Data2D.cpp b/src/Float32Data2D.cpp index c96e5eb..56ea7cc 100644 --- a/src/Float32Data2D.cpp +++ b/src/Float32Data2D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/Float32Data2D.h" diff --git a/src/Float32Data3D.cpp b/src/Float32Data3D.cpp index 9142215..cad1f18 100644 --- a/src/Float32Data3D.cpp +++ b/src/Float32Data3D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/Float32Data3D.h" diff --git a/src/Float32Data3DMemory.cpp b/src/Float32Data3DMemory.cpp index 4e851b7..95b1859 100644 --- a/src/Float32Data3DMemory.cpp +++ b/src/Float32Data3DMemory.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/Float32Data3DMemory.h" diff --git a/src/Float32ProjectionData2D.cpp b/src/Float32ProjectionData2D.cpp index f7f83e3..67571f4 100644 --- a/src/Float32ProjectionData2D.cpp +++ b/src/Float32ProjectionData2D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/Float32ProjectionData2D.h" diff --git a/src/Float32ProjectionData3D.cpp b/src/Float32ProjectionData3D.cpp index 680ad55..c751c58 100644 --- a/src/Float32ProjectionData3D.cpp +++ b/src/Float32ProjectionData3D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/Float32ProjectionData3D.h" diff --git a/src/Float32ProjectionData3DMemory.cpp b/src/Float32ProjectionData3DMemory.cpp index ee3fc83..f42e216 100644 --- a/src/Float32ProjectionData3DMemory.cpp +++ b/src/Float32ProjectionData3DMemory.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/Float32ProjectionData3DMemory.h" diff --git a/src/Float32VolumeData2D.cpp b/src/Float32VolumeData2D.cpp index c903c66..e0e14c3 100644 --- a/src/Float32VolumeData2D.cpp +++ b/src/Float32VolumeData2D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/Float32VolumeData2D.h" diff --git a/src/Float32VolumeData3D.cpp b/src/Float32VolumeData3D.cpp index bd78001..bf7eced 100644 --- a/src/Float32VolumeData3D.cpp +++ b/src/Float32VolumeData3D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/Float32VolumeData3D.h" diff --git a/src/Float32VolumeData3DMemory.cpp b/src/Float32VolumeData3DMemory.cpp index 14adb1a..ba39eaa 100644 --- a/src/Float32VolumeData3DMemory.cpp +++ b/src/Float32VolumeData3DMemory.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/Float32VolumeData3DMemory.h" diff --git a/src/ForwardProjectionAlgorithm.cpp b/src/ForwardProjectionAlgorithm.cpp index dcf5790..dccd838 100644 --- a/src/ForwardProjectionAlgorithm.cpp +++ b/src/ForwardProjectionAlgorithm.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/ForwardProjectionAlgorithm.h" diff --git a/src/Fourier.cpp b/src/Fourier.cpp index c33f7bd..36aa26b 100644 --- a/src/Fourier.cpp +++ b/src/Fourier.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/Fourier.h" diff --git a/src/GeometryUtil3D.cpp b/src/GeometryUtil3D.cpp index c6bfd8b..b12c211 100644 --- a/src/GeometryUtil3D.cpp +++ b/src/GeometryUtil3D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/GeometryUtil3D.h" diff --git a/src/Globals.cpp b/src/Globals.cpp index 904a459..0edb397 100644 --- a/src/Globals.cpp +++ b/src/Globals.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/Globals.h" diff --git a/src/Logging.cpp b/src/Logging.cpp index cd7e3f0..da7ea37 100644 --- a/src/Logging.cpp +++ b/src/Logging.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #define CLOG_MAIN diff --git a/src/ParallelBeamBlobKernelProjector2D.cpp b/src/ParallelBeamBlobKernelProjector2D.cpp index 9b7c05f..5cc9174 100644 --- a/src/ParallelBeamBlobKernelProjector2D.cpp +++ b/src/ParallelBeamBlobKernelProjector2D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/ParallelBeamBlobKernelProjector2D.h" diff --git a/src/ParallelBeamLineKernelProjector2D.cpp b/src/ParallelBeamLineKernelProjector2D.cpp index ccfb9f8..a5f46a7 100644 --- a/src/ParallelBeamLineKernelProjector2D.cpp +++ b/src/ParallelBeamLineKernelProjector2D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/ParallelBeamLineKernelProjector2D.h" diff --git a/src/ParallelBeamLinearKernelProjector2D.cpp b/src/ParallelBeamLinearKernelProjector2D.cpp index 2171e73..e9034bf 100644 --- a/src/ParallelBeamLinearKernelProjector2D.cpp +++ b/src/ParallelBeamLinearKernelProjector2D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/ParallelBeamLinearKernelProjector2D.h" diff --git a/src/ParallelBeamStripKernelProjector2D.cpp b/src/ParallelBeamStripKernelProjector2D.cpp index a2869e2..ab4e49e 100644 --- a/src/ParallelBeamStripKernelProjector2D.cpp +++ b/src/ParallelBeamStripKernelProjector2D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/ParallelBeamStripKernelProjector2D.h" diff --git a/src/ParallelProjectionGeometry2D.cpp b/src/ParallelProjectionGeometry2D.cpp index cc2a129..f73df50 100644 --- a/src/ParallelProjectionGeometry2D.cpp +++ b/src/ParallelProjectionGeometry2D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/ParallelProjectionGeometry2D.h" diff --git a/src/ParallelProjectionGeometry3D.cpp b/src/ParallelProjectionGeometry3D.cpp index 2f80883..4d3af25 100644 --- a/src/ParallelProjectionGeometry3D.cpp +++ b/src/ParallelProjectionGeometry3D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/ParallelProjectionGeometry3D.h" diff --git a/src/ParallelVecProjectionGeometry3D.cpp b/src/ParallelVecProjectionGeometry3D.cpp index 3172818..310f87b 100644 --- a/src/ParallelVecProjectionGeometry3D.cpp +++ b/src/ParallelVecProjectionGeometry3D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/ParallelVecProjectionGeometry3D.h" diff --git a/src/PlatformDepSystemCode.cpp b/src/PlatformDepSystemCode.cpp index 0a5d236..d519068 100644 --- a/src/PlatformDepSystemCode.cpp +++ b/src/PlatformDepSystemCode.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/PlatformDepSystemCode.h" diff --git a/src/PluginAlgorithm.cpp b/src/PluginAlgorithm.cpp index 1bcfbdb..28bf12e 100644 --- a/src/PluginAlgorithm.cpp +++ b/src/PluginAlgorithm.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/PluginAlgorithm.h" diff --git a/src/ProjectionGeometry2D.cpp b/src/ProjectionGeometry2D.cpp index 8ce06dc..e9f08ec 100644 --- a/src/ProjectionGeometry2D.cpp +++ b/src/ProjectionGeometry2D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/ProjectionGeometry2D.h" diff --git a/src/ProjectionGeometry3D.cpp b/src/ProjectionGeometry3D.cpp index 281db7c..d595570 100644 --- a/src/ProjectionGeometry3D.cpp +++ b/src/ProjectionGeometry3D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/ProjectionGeometry3D.h" diff --git a/src/Projector2D.cpp b/src/Projector2D.cpp index cf233a0..78412e6 100644 --- a/src/Projector2D.cpp +++ b/src/Projector2D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/Projector2D.h" diff --git a/src/Projector3D.cpp b/src/Projector3D.cpp index 5e22105..ecaaafc 100644 --- a/src/Projector3D.cpp +++ b/src/Projector3D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/Projector3D.h" diff --git a/src/ReconstructionAlgorithm2D.cpp b/src/ReconstructionAlgorithm2D.cpp index 1c6d855..4fb2b2b 100644 --- a/src/ReconstructionAlgorithm2D.cpp +++ b/src/ReconstructionAlgorithm2D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/ReconstructionAlgorithm2D.h" diff --git a/src/ReconstructionAlgorithm3D.cpp b/src/ReconstructionAlgorithm3D.cpp index 55f1031..4893e01 100644 --- a/src/ReconstructionAlgorithm3D.cpp +++ b/src/ReconstructionAlgorithm3D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/ReconstructionAlgorithm3D.h" diff --git a/src/ReconstructionAlgorithmMultiSlice2D.cpp b/src/ReconstructionAlgorithmMultiSlice2D.cpp index 39c337f..eb13f46 100644 --- a/src/ReconstructionAlgorithmMultiSlice2D.cpp +++ b/src/ReconstructionAlgorithmMultiSlice2D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/ReconstructionAlgorithmMultiSlice2D.h" diff --git a/src/SartAlgorithm.cpp b/src/SartAlgorithm.cpp index 8df3342..5c8f59b 100644 --- a/src/SartAlgorithm.cpp +++ b/src/SartAlgorithm.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/SartAlgorithm.h" diff --git a/src/SirtAlgorithm.cpp b/src/SirtAlgorithm.cpp index ff25648..1fb4aad 100644 --- a/src/SirtAlgorithm.cpp +++ b/src/SirtAlgorithm.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/SirtAlgorithm.h" diff --git a/src/SparseMatrix.cpp b/src/SparseMatrix.cpp index ace978d..9f39aea 100644 --- a/src/SparseMatrix.cpp +++ b/src/SparseMatrix.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include <sstream> diff --git a/src/SparseMatrixProjectionGeometry2D.cpp b/src/SparseMatrixProjectionGeometry2D.cpp index 358c992..4694df1 100644 --- a/src/SparseMatrixProjectionGeometry2D.cpp +++ b/src/SparseMatrixProjectionGeometry2D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/SparseMatrixProjectionGeometry2D.h" diff --git a/src/SparseMatrixProjector2D.cpp b/src/SparseMatrixProjector2D.cpp index be7e069..7059919 100644 --- a/src/SparseMatrixProjector2D.cpp +++ b/src/SparseMatrixProjector2D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/SparseMatrixProjector2D.h" diff --git a/src/Utilities.cpp b/src/Utilities.cpp index 9733c30..eb06d8b 100644 --- a/src/Utilities.cpp +++ b/src/Utilities.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/Utilities.h" diff --git a/src/Vector3D.cpp b/src/Vector3D.cpp index 6176d25..f2c28f2 100644 --- a/src/Vector3D.cpp +++ b/src/Vector3D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "../include/astra/Vector3D.h" diff --git a/src/VolumeGeometry2D.cpp b/src/VolumeGeometry2D.cpp index 9d74e47..b08fcb5 100644 --- a/src/VolumeGeometry2D.cpp +++ b/src/VolumeGeometry2D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/VolumeGeometry2D.h" diff --git a/src/VolumeGeometry3D.cpp b/src/VolumeGeometry3D.cpp index 5d72c24..f1f7cb3 100644 --- a/src/VolumeGeometry3D.cpp +++ b/src/VolumeGeometry3D.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/VolumeGeometry3D.h" diff --git a/src/XMLDocument.cpp b/src/XMLDocument.cpp index 716ed9e..97e9c9d 100644 --- a/src/XMLDocument.cpp +++ b/src/XMLDocument.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/XMLDocument.h" diff --git a/src/XMLNode.cpp b/src/XMLNode.cpp index cf268c2..35f8093 100644 --- a/src/XMLNode.cpp +++ b/src/XMLNode.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #include "astra/XMLNode.h" diff --git a/src/swrap.cpp b/src/swrap.cpp index 51dcdb1..c970ab5 100644 --- a/src/swrap.cpp +++ b/src/swrap.cpp @@ -1,10 +1,10 @@  /*  ----------------------------------------------------------------------- -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  Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/  This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */  #ifndef _MSC_VER diff --git a/tests/main.cpp b/tests/main.cpp index 6fc963e..cd2f717 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -1,13 +1,13 @@  /*  ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +           2014-2016, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("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 @@ -23,11 +23,9 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */ -  #define BOOST_TEST_DYN_LINK  // Generate main() diff --git a/tests/test_AstraObjectManager.cpp b/tests/test_AstraObjectManager.cpp index 893efb9..da641ba 100644 --- a/tests/test_AstraObjectManager.cpp +++ b/tests/test_AstraObjectManager.cpp @@ -1,13 +1,13 @@  /*  ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +           2014-2016, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("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 @@ -23,10 +23,8 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */ -  #define BOOST_TEST_DYN_LINK  #include <boost/test/unit_test.hpp>  #include <boost/test/auto_unit_test.hpp> diff --git a/tests/test_FanFlatProjectionGeometry2D.cpp b/tests/test_FanFlatProjectionGeometry2D.cpp index a07fbf8..b7c5601 100644 --- a/tests/test_FanFlatProjectionGeometry2D.cpp +++ b/tests/test_FanFlatProjectionGeometry2D.cpp @@ -1,13 +1,13 @@  /*  ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +           2014-2016, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("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 @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */ diff --git a/tests/test_Float32Data2D.cpp b/tests/test_Float32Data2D.cpp index 54d642b..31e3d03 100644 --- a/tests/test_Float32Data2D.cpp +++ b/tests/test_Float32Data2D.cpp @@ -1,13 +1,13 @@  /*  ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +           2014-2016, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("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 @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */ diff --git a/tests/test_Float32ProjectionData2D.cpp b/tests/test_Float32ProjectionData2D.cpp index 1fddeec..75b276f 100644 --- a/tests/test_Float32ProjectionData2D.cpp +++ b/tests/test_Float32ProjectionData2D.cpp @@ -1,13 +1,13 @@  /*  ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +           2014-2016, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("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 @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */ diff --git a/tests/test_Float32VolumeData2D.cpp b/tests/test_Float32VolumeData2D.cpp index 29dde3a..c667f51 100644 --- a/tests/test_Float32VolumeData2D.cpp +++ b/tests/test_Float32VolumeData2D.cpp @@ -1,13 +1,13 @@  /*  ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +           2014-2016, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("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 @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */ diff --git a/tests/test_Fourier.cpp b/tests/test_Fourier.cpp index ef12747..611bd56 100644 --- a/tests/test_Fourier.cpp +++ b/tests/test_Fourier.cpp @@ -1,13 +1,13 @@  /*  ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +           2014-2016, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("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 @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */ diff --git a/tests/test_ParallelBeamLineKernelProjector2D.cpp b/tests/test_ParallelBeamLineKernelProjector2D.cpp index c56ff37..58d511e 100644 --- a/tests/test_ParallelBeamLineKernelProjector2D.cpp +++ b/tests/test_ParallelBeamLineKernelProjector2D.cpp @@ -1,13 +1,13 @@  /*  ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +           2014-2016, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("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 @@ -23,11 +23,9 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */ -  #define BOOST_TEST_DYN_LINK  #include <boost/test/unit_test.hpp>  #include <boost/test/auto_unit_test.hpp> diff --git a/tests/test_ParallelBeamLinearKernelProjector2D.cpp b/tests/test_ParallelBeamLinearKernelProjector2D.cpp index 9100db4..f1fa311 100644 --- a/tests/test_ParallelBeamLinearKernelProjector2D.cpp +++ b/tests/test_ParallelBeamLinearKernelProjector2D.cpp @@ -1,13 +1,13 @@  /*  ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +           2014-2016, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("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 @@ -23,11 +23,9 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */ -  #define BOOST_TEST_DYN_LINK  #include <boost/test/unit_test.hpp>  #include <boost/test/auto_unit_test.hpp> diff --git a/tests/test_ParallelProjectionGeometry2D.cpp b/tests/test_ParallelProjectionGeometry2D.cpp index 809c6fa..fe353f0 100644 --- a/tests/test_ParallelProjectionGeometry2D.cpp +++ b/tests/test_ParallelProjectionGeometry2D.cpp @@ -1,13 +1,13 @@  /*  ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +           2014-2016, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("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 @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */ diff --git a/tests/test_VolumeGeometry2D.cpp b/tests/test_VolumeGeometry2D.cpp index 4ae88d3..96e8e5e 100644 --- a/tests/test_VolumeGeometry2D.cpp +++ b/tests/test_VolumeGeometry2D.cpp @@ -1,13 +1,13 @@  /*  ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +           2014-2016, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("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 @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */ diff --git a/tests/test_XMLDocument.cpp b/tests/test_XMLDocument.cpp index 95429cb..f213006 100644 --- a/tests/test_XMLDocument.cpp +++ b/tests/test_XMLDocument.cpp @@ -1,13 +1,13 @@  /*  ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +           2014-2016, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("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 @@ -23,7 +23,6 @@ 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/>.  ----------------------------------------------------------------------- -$Id$  */ diff --git a/tests/tests_vc08.vcproj b/tests/tests_vc08.vcproj deleted file mode 100644 index 90c5d55..0000000 --- a/tests/tests_vc08.vcproj +++ /dev/null @@ -1,699 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject -	ProjectType="Visual C++" -	Version="9.00" -	Name="tests" -	ProjectGUID="{32C1BDD3-38C2-4C80-A03C-2129782F59B5}" -	RootNamespace="tests" -	Keyword="Win32Proj" -	TargetFrameworkVersion="131072" -	> -	<Platforms> -		<Platform -			Name="Win32" -		/> -		<Platform -			Name="x64" -		/> -	</Platforms> -	<ToolFiles> -	</ToolFiles> -	<Configurations> -		<Configuration -			Name="Debug|Win32" -			OutputDirectory="$(SolutionDir)\tests\$(PlatformName)\$(ConfigurationName)" -			IntermediateDirectory="$(OutDir)\obj\" -			ConfigurationType="1" -			CharacterSet="1" -			> -			<Tool -				Name="VCPreBuildEventTool" -			/> -			<Tool -				Name="VCCustomBuildTool" -			/> -			<Tool -				Name="VCXMLDataGeneratorTool" -			/> -			<Tool -				Name="VCWebServiceProxyGeneratorTool" -			/> -			<Tool -				Name="VCMIDLTool" -			/> -			<Tool -				Name="VCCLCompilerTool" -				Optimization="0" -				AdditionalIncludeDirectories="..\lib\include\;..\include\" -				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" -				MinimalRebuild="true" -				BasicRuntimeChecks="0" -				RuntimeLibrary="3" -				UsePrecompiledHeader="0" -				WarningLevel="3" -				Detect64BitPortabilityProblems="true" -				DebugInformationFormat="4" -			/> -			<Tool -				Name="VCManagedResourceCompilerTool" -			/> -			<Tool -				Name="VCResourceCompilerTool" -			/> -			<Tool -				Name="VCPreLinkEventTool" -			/> -			<Tool -				Name="VCLinkerTool" -				AdditionalDependencies="Astra32D.lib" -				LinkIncremental="2" -				AdditionalLibraryDirectories="..\lib\win32\;..\bin\win32" -				GenerateDebugInformation="true" -				SubSystem="1" -				RandomizedBaseAddress="1" -				DataExecutionPrevention="0" -				TargetMachine="1" -			/> -			<Tool -				Name="VCALinkTool" -			/> -			<Tool -				Name="VCManifestTool" -			/> -			<Tool -				Name="VCXDCMakeTool" -			/> -			<Tool -				Name="VCBscMakeTool" -			/> -			<Tool -				Name="VCFxCopTool" -			/> -			<Tool -				Name="VCAppVerifierTool" -			/> -			<Tool -				Name="VCPostBuildEventTool" -			/> -		</Configuration> -		<Configuration -			Name="Debug|x64" -			OutputDirectory="$(SolutionDir)\tests\$(PlatformName)\$(ConfigurationName)" -			IntermediateDirectory="$(OutDir)\obj\" -			ConfigurationType="1" -			CharacterSet="1" -			> -			<Tool -				Name="VCPreBuildEventTool" -			/> -			<Tool -				Name="VCCustomBuildTool" -			/> -			<Tool -				Name="VCXMLDataGeneratorTool" -			/> -			<Tool -				Name="VCWebServiceProxyGeneratorTool" -			/> -			<Tool -				Name="VCMIDLTool" -				TargetEnvironment="3" -			/> -			<Tool -				Name="VCCLCompilerTool" -				Optimization="0" -				AdditionalIncludeDirectories="..\lib\include\;..\include\" -				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" -				MinimalRebuild="true" -				BasicRuntimeChecks="0" -				RuntimeLibrary="3" -				UsePrecompiledHeader="0" -				WarningLevel="3" -				Detect64BitPortabilityProblems="true" -				DebugInformationFormat="3" -			/> -			<Tool -				Name="VCManagedResourceCompilerTool" -			/> -			<Tool -				Name="VCResourceCompilerTool" -			/> -			<Tool -				Name="VCPreLinkEventTool" -			/> -			<Tool -				Name="VCLinkerTool" -				AdditionalDependencies="Astra64D.lib" -				LinkIncremental="2" -				AdditionalLibraryDirectories="..\lib\x64\;..\bin\x64" -				GenerateDebugInformation="true" -				SubSystem="1" -				RandomizedBaseAddress="1" -				DataExecutionPrevention="0" -				TargetMachine="17" -			/> -			<Tool -				Name="VCALinkTool" -			/> -			<Tool -				Name="VCManifestTool" -			/> -			<Tool -				Name="VCXDCMakeTool" -			/> -			<Tool -				Name="VCBscMakeTool" -			/> -			<Tool -				Name="VCFxCopTool" -			/> -			<Tool -				Name="VCAppVerifierTool" -			/> -			<Tool -				Name="VCPostBuildEventTool" -			/> -		</Configuration> -		<Configuration -			Name="Release|Win32" -			OutputDirectory="$(SolutionDir)\tests\$(PlatformName)\$(ConfigurationName)" -			IntermediateDirectory="$(OutDir)\obj\" -			ConfigurationType="1" -			CharacterSet="1" -			WholeProgramOptimization="1" -			> -			<Tool -				Name="VCPreBuildEventTool" -			/> -			<Tool -				Name="VCCustomBuildTool" -			/> -			<Tool -				Name="VCXMLDataGeneratorTool" -			/> -			<Tool -				Name="VCWebServiceProxyGeneratorTool" -			/> -			<Tool -				Name="VCMIDLTool" -			/> -			<Tool -				Name="VCCLCompilerTool" -				AdditionalIncludeDirectories="..\lib\include\;..\include\" -				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" -				RuntimeLibrary="2" -				UsePrecompiledHeader="0" -				WarningLevel="3" -				Detect64BitPortabilityProblems="true" -				DebugInformationFormat="3" -			/> -			<Tool -				Name="VCManagedResourceCompilerTool" -			/> -			<Tool -				Name="VCResourceCompilerTool" -			/> -			<Tool -				Name="VCPreLinkEventTool" -			/> -			<Tool -				Name="VCLinkerTool" -				AdditionalDependencies="Astra32.lib" -				LinkIncremental="1" -				AdditionalLibraryDirectories="..\lib\win32\;..\bin\win32" -				GenerateDebugInformation="true" -				SubSystem="1" -				OptimizeReferences="2" -				EnableCOMDATFolding="2" -				RandomizedBaseAddress="1" -				DataExecutionPrevention="0" -				TargetMachine="1" -			/> -			<Tool -				Name="VCALinkTool" -			/> -			<Tool -				Name="VCManifestTool" -			/> -			<Tool -				Name="VCXDCMakeTool" -			/> -			<Tool -				Name="VCBscMakeTool" -			/> -			<Tool -				Name="VCFxCopTool" -			/> -			<Tool -				Name="VCAppVerifierTool" -			/> -			<Tool -				Name="VCPostBuildEventTool" -			/> -		</Configuration> -		<Configuration -			Name="Release|x64" -			OutputDirectory="$(SolutionDir)\tests\$(PlatformName)\$(ConfigurationName)" -			IntermediateDirectory="$(OutDir)\obj\" -			ConfigurationType="1" -			CharacterSet="1" -			WholeProgramOptimization="1" -			> -			<Tool -				Name="VCPreBuildEventTool" -			/> -			<Tool -				Name="VCCustomBuildTool" -			/> -			<Tool -				Name="VCXMLDataGeneratorTool" -			/> -			<Tool -				Name="VCWebServiceProxyGeneratorTool" -			/> -			<Tool -				Name="VCMIDLTool" -				TargetEnvironment="3" -			/> -			<Tool -				Name="VCCLCompilerTool" -				AdditionalIncludeDirectories="..\lib\include\;..\include\" -				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" -				RuntimeLibrary="2" -				UsePrecompiledHeader="0" -				WarningLevel="3" -				Detect64BitPortabilityProblems="true" -				DebugInformationFormat="3" -			/> -			<Tool -				Name="VCManagedResourceCompilerTool" -			/> -			<Tool -				Name="VCResourceCompilerTool" -			/> -			<Tool -				Name="VCPreLinkEventTool" -			/> -			<Tool -				Name="VCLinkerTool" -				AdditionalDependencies="Astra64.lib" -				LinkIncremental="1" -				AdditionalLibraryDirectories="..\lib\x64\;..\bin\x64" -				GenerateDebugInformation="true" -				SubSystem="1" -				OptimizeReferences="2" -				EnableCOMDATFolding="2" -				RandomizedBaseAddress="1" -				DataExecutionPrevention="0" -				TargetMachine="17" -			/> -			<Tool -				Name="VCALinkTool" -			/> -			<Tool -				Name="VCManifestTool" -			/> -			<Tool -				Name="VCXDCMakeTool" -			/> -			<Tool -				Name="VCBscMakeTool" -			/> -			<Tool -				Name="VCFxCopTool" -			/> -			<Tool -				Name="VCAppVerifierTool" -			/> -			<Tool -				Name="VCPostBuildEventTool" -			/> -		</Configuration> -		<Configuration -			Name="Debug_CUDA|Win32" -			OutputDirectory="$(SolutionDir)\tests\$(PlatformName)\$(ConfigurationName)" -			IntermediateDirectory="$(OutDir)\obj\" -			ConfigurationType="1" -			CharacterSet="1" -			> -			<Tool -				Name="VCPreBuildEventTool" -			/> -			<Tool -				Name="VCCustomBuildTool" -			/> -			<Tool -				Name="VCXMLDataGeneratorTool" -			/> -			<Tool -				Name="VCWebServiceProxyGeneratorTool" -			/> -			<Tool -				Name="VCMIDLTool" -			/> -			<Tool -				Name="VCCLCompilerTool" -				Optimization="0" -				AdditionalIncludeDirectories="..\lib\include\;..\include\" -				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" -				MinimalRebuild="true" -				BasicRuntimeChecks="0" -				RuntimeLibrary="3" -				UsePrecompiledHeader="0" -				WarningLevel="3" -				Detect64BitPortabilityProblems="true" -				DebugInformationFormat="4" -			/> -			<Tool -				Name="VCManagedResourceCompilerTool" -			/> -			<Tool -				Name="VCResourceCompilerTool" -			/> -			<Tool -				Name="VCPreLinkEventTool" -			/> -			<Tool -				Name="VCLinkerTool" -				AdditionalDependencies="AstraCuda32D.lib" -				LinkIncremental="2" -				AdditionalLibraryDirectories="..\lib\win32\;..\bin\win32" -				GenerateDebugInformation="true" -				SubSystem="1" -				RandomizedBaseAddress="1" -				DataExecutionPrevention="0" -				TargetMachine="1" -			/> -			<Tool -				Name="VCALinkTool" -			/> -			<Tool -				Name="VCManifestTool" -			/> -			<Tool -				Name="VCXDCMakeTool" -			/> -			<Tool -				Name="VCBscMakeTool" -			/> -			<Tool -				Name="VCFxCopTool" -			/> -			<Tool -				Name="VCAppVerifierTool" -			/> -			<Tool -				Name="VCPostBuildEventTool" -			/> -		</Configuration> -		<Configuration -			Name="Debug_CUDA|x64" -			OutputDirectory="$(SolutionDir)\tests\$(PlatformName)\$(ConfigurationName)" -			IntermediateDirectory="$(OutDir)\obj\" -			ConfigurationType="1" -			CharacterSet="1" -			> -			<Tool -				Name="VCPreBuildEventTool" -			/> -			<Tool -				Name="VCCustomBuildTool" -			/> -			<Tool -				Name="VCXMLDataGeneratorTool" -			/> -			<Tool -				Name="VCWebServiceProxyGeneratorTool" -			/> -			<Tool -				Name="VCMIDLTool" -				TargetEnvironment="3" -			/> -			<Tool -				Name="VCCLCompilerTool" -				Optimization="0" -				AdditionalIncludeDirectories="..\lib\include\;..\include\" -				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" -				MinimalRebuild="true" -				BasicRuntimeChecks="0" -				RuntimeLibrary="3" -				UsePrecompiledHeader="0" -				WarningLevel="3" -				Detect64BitPortabilityProblems="true" -				DebugInformationFormat="3" -			/> -			<Tool -				Name="VCManagedResourceCompilerTool" -			/> -			<Tool -				Name="VCResourceCompilerTool" -			/> -			<Tool -				Name="VCPreLinkEventTool" -			/> -			<Tool -				Name="VCLinkerTool" -				AdditionalDependencies="AstraCuda64D.lib" -				LinkIncremental="2" -				AdditionalLibraryDirectories="..\lib\x64\;..\bin\x64" -				GenerateDebugInformation="true" -				SubSystem="1" -				RandomizedBaseAddress="1" -				DataExecutionPrevention="0" -				TargetMachine="17" -			/> -			<Tool -				Name="VCALinkTool" -			/> -			<Tool -				Name="VCManifestTool" -			/> -			<Tool -				Name="VCXDCMakeTool" -			/> -			<Tool -				Name="VCBscMakeTool" -			/> -			<Tool -				Name="VCFxCopTool" -			/> -			<Tool -				Name="VCAppVerifierTool" -			/> -			<Tool -				Name="VCPostBuildEventTool" -			/> -		</Configuration> -		<Configuration -			Name="Release_CUDA|Win32" -			OutputDirectory="$(SolutionDir)\tests\$(PlatformName)\$(ConfigurationName)" -			IntermediateDirectory="$(OutDir)\obj\" -			ConfigurationType="1" -			CharacterSet="1" -			WholeProgramOptimization="1" -			> -			<Tool -				Name="VCPreBuildEventTool" -			/> -			<Tool -				Name="VCCustomBuildTool" -			/> -			<Tool -				Name="VCXMLDataGeneratorTool" -			/> -			<Tool -				Name="VCWebServiceProxyGeneratorTool" -			/> -			<Tool -				Name="VCMIDLTool" -			/> -			<Tool -				Name="VCCLCompilerTool" -				AdditionalIncludeDirectories="..\lib\include\;..\include\" -				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" -				RuntimeLibrary="2" -				UsePrecompiledHeader="0" -				WarningLevel="3" -				Detect64BitPortabilityProblems="true" -				DebugInformationFormat="3" -			/> -			<Tool -				Name="VCManagedResourceCompilerTool" -			/> -			<Tool -				Name="VCResourceCompilerTool" -			/> -			<Tool -				Name="VCPreLinkEventTool" -			/> -			<Tool -				Name="VCLinkerTool" -				AdditionalDependencies="AstraCuda32.lib" -				LinkIncremental="1" -				AdditionalLibraryDirectories="..\lib\win32\;..\bin\win32" -				GenerateDebugInformation="true" -				SubSystem="1" -				OptimizeReferences="2" -				EnableCOMDATFolding="2" -				RandomizedBaseAddress="1" -				DataExecutionPrevention="0" -				TargetMachine="1" -			/> -			<Tool -				Name="VCALinkTool" -			/> -			<Tool -				Name="VCManifestTool" -			/> -			<Tool -				Name="VCXDCMakeTool" -			/> -			<Tool -				Name="VCBscMakeTool" -			/> -			<Tool -				Name="VCFxCopTool" -			/> -			<Tool -				Name="VCAppVerifierTool" -			/> -			<Tool -				Name="VCPostBuildEventTool" -			/> -		</Configuration> -		<Configuration -			Name="Release_CUDA|x64" -			OutputDirectory="$(SolutionDir)\tests\$(PlatformName)\$(ConfigurationName)" -			IntermediateDirectory="$(OutDir)\obj\" -			ConfigurationType="1" -			CharacterSet="1" -			WholeProgramOptimization="1" -			> -			<Tool -				Name="VCPreBuildEventTool" -			/> -			<Tool -				Name="VCCustomBuildTool" -			/> -			<Tool -				Name="VCXMLDataGeneratorTool" -			/> -			<Tool -				Name="VCWebServiceProxyGeneratorTool" -			/> -			<Tool -				Name="VCMIDLTool" -				TargetEnvironment="3" -			/> -			<Tool -				Name="VCCLCompilerTool" -				AdditionalIncludeDirectories="..\lib\include\;..\include\" -				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" -				RuntimeLibrary="2" -				UsePrecompiledHeader="0" -				WarningLevel="3" -				Detect64BitPortabilityProblems="true" -				DebugInformationFormat="3" -			/> -			<Tool -				Name="VCManagedResourceCompilerTool" -			/> -			<Tool -				Name="VCResourceCompilerTool" -			/> -			<Tool -				Name="VCPreLinkEventTool" -			/> -			<Tool -				Name="VCLinkerTool" -				AdditionalDependencies="AstraCuda64.lib" -				LinkIncremental="1" -				AdditionalLibraryDirectories="..\lib\x64\;..\bin\x64" -				GenerateDebugInformation="true" -				SubSystem="1" -				OptimizeReferences="2" -				EnableCOMDATFolding="2" -				RandomizedBaseAddress="1" -				DataExecutionPrevention="0" -				TargetMachine="17" -			/> -			<Tool -				Name="VCALinkTool" -			/> -			<Tool -				Name="VCManifestTool" -			/> -			<Tool -				Name="VCXDCMakeTool" -			/> -			<Tool -				Name="VCBscMakeTool" -			/> -			<Tool -				Name="VCFxCopTool" -			/> -			<Tool -				Name="VCAppVerifierTool" -			/> -			<Tool -				Name="VCPostBuildEventTool" -			/> -		</Configuration> -	</Configurations> -	<References> -	</References> -	<Files> -		<Filter -			Name="Test Files" -			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" -			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" -			> -			<File -				RelativePath=".\test_FanFlatProjectionGeometry2D.cpp" -				> -			</File> -			<File -				RelativePath=".\test_Float32Data2D.cpp" -				> -			</File> -			<File -				RelativePath=".\test_Float32ProjectionData2D.cpp" -				> -			</File> -			<File -				RelativePath=".\test_Float32VolumeData2D.cpp" -				> -			</File> -			<File -				RelativePath=".\test_Fourier.cpp" -				> -			</File> -			<File -				RelativePath=".\test_ParallelBeamLinearKernelProjector2D.cpp" -				> -			</File> -			<File -				RelativePath=".\test_ParallelBeamLineKernelProjector2D.cpp" -				> -			</File> -			<File -				RelativePath=".\test_ParallelProjectionGeometry2D.cpp" -				> -			</File> -			<File -				RelativePath=".\test_VolumeGeometry2D.cpp" -				> -			</File> -		</Filter> -		<Filter -			Name="Main" -			> -			<File -				RelativePath=".\main.cpp" -				> -			</File> -		</Filter> -	</Files> -	<Globals> -	</Globals> -</VisualStudioProject>  | 
