From f8c6579b910d2752f40850fbf17f045fa5de0366 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 12 Dec 2014 12:01:59 +0100 Subject: Update copyright headers --- NEWS.txt | 15 ++++++------ README.txt | 12 +++++----- build/linux/configure.ac | 10 ++++---- cuda/2d/algo.cu | 10 ++++---- cuda/2d/algo.h | 10 ++++---- cuda/2d/arith.cu | 10 ++++---- cuda/2d/arith.h | 10 ++++---- cuda/2d/astra.cu | 10 ++++---- cuda/2d/astra.h | 10 ++++---- cuda/2d/cgls.cu | 10 ++++---- cuda/2d/cgls.h | 10 ++++---- cuda/2d/darthelper.cu | 10 ++++---- cuda/2d/darthelper.h | 10 ++++---- cuda/2d/dataop.cu | 10 ++++---- cuda/2d/dataop.h | 10 ++++---- cuda/2d/dims.h | 10 ++++---- cuda/2d/em.cu | 10 ++++---- cuda/2d/em.h | 10 ++++---- cuda/2d/fan_bp.cu | 10 ++++---- cuda/2d/fan_bp.h | 10 ++++---- cuda/2d/fan_fp.cu | 10 ++++---- cuda/2d/fan_fp.h | 10 ++++---- cuda/2d/fbp_filters.h | 10 ++++---- cuda/2d/fft.cu | 10 ++++---- cuda/2d/fft.h | 10 ++++---- cuda/2d/par_bp.cu | 10 ++++---- cuda/2d/par_bp.h | 10 ++++---- cuda/2d/par_fp.cu | 10 ++++---- cuda/2d/par_fp.h | 10 ++++---- cuda/2d/sart.cu | 10 ++++---- cuda/2d/sart.h | 10 ++++---- cuda/2d/sirt.cu | 10 ++++---- cuda/2d/sirt.h | 10 ++++---- cuda/2d/util.cu | 10 ++++---- cuda/2d/util.h | 10 ++++---- cuda/3d/algo3d.cu | 10 ++++---- cuda/3d/algo3d.h | 10 ++++---- cuda/3d/arith3d.cu | 10 ++++---- cuda/3d/arith3d.h | 10 ++++---- cuda/3d/astra3d.cu | 10 ++++---- cuda/3d/astra3d.h | 10 ++++---- cuda/3d/cgls3d.cu | 10 ++++---- cuda/3d/cgls3d.h | 10 ++++---- cuda/3d/cone_bp.cu | 10 ++++---- cuda/3d/cone_bp.h | 10 ++++---- cuda/3d/cone_fp.cu | 10 ++++---- cuda/3d/cone_fp.h | 10 ++++---- cuda/3d/darthelper3d.cu | 10 ++++---- cuda/3d/darthelper3d.h | 10 ++++---- cuda/3d/dims3d.h | 10 ++++---- cuda/3d/fdk.cu | 10 ++++---- cuda/3d/fdk.h | 10 ++++---- cuda/3d/par3d_bp.cu | 10 ++++---- cuda/3d/par3d_bp.h | 10 ++++---- cuda/3d/par3d_fp.cu | 10 ++++---- cuda/3d/par3d_fp.h | 10 ++++---- cuda/3d/sirt3d.cu | 10 ++++---- cuda/3d/sirt3d.h | 10 ++++---- cuda/3d/util3d.cu | 10 ++++---- cuda/3d/util3d.h | 10 ++++---- include/astra/Algorithm.h | 10 ++++---- include/astra/AlgorithmTypelist.h | 10 ++++---- include/astra/ArtAlgorithm.h | 10 ++++---- include/astra/AstraObjectFactory.h | 10 ++++---- include/astra/AstraObjectManager.h | 10 ++++---- include/astra/AsyncAlgorithm.h | 10 ++++---- include/astra/BackProjectionAlgorithm.h | 10 ++++---- include/astra/CglsAlgorithm.h | 10 ++++---- include/astra/ConeProjectionGeometry3D.h | 10 ++++---- include/astra/ConeVecProjectionGeometry3D.h | 10 ++++---- include/astra/Config.h | 10 ++++---- include/astra/CudaBackProjectionAlgorithm.h | 10 ++++---- include/astra/CudaBackProjectionAlgorithm3D.h | 10 ++++---- include/astra/CudaCglsAlgorithm.h | 10 ++++---- include/astra/CudaCglsAlgorithm3D.h | 10 ++++---- include/astra/CudaDartMaskAlgorithm.h | 10 ++++---- include/astra/CudaDartMaskAlgorithm3D.h | 10 ++++---- include/astra/CudaDartSmoothingAlgorithm.h | 10 ++++---- include/astra/CudaDartSmoothingAlgorithm3D.h | 10 ++++---- include/astra/CudaDataOperationAlgorithm.h | 10 ++++---- include/astra/CudaEMAlgorithm.h | 10 ++++---- include/astra/CudaFDKAlgorithm3D.h | 10 ++++---- .../astra/CudaFilteredBackProjectionAlgorithm.h | 10 ++++---- include/astra/CudaForwardProjectionAlgorithm.h | 10 ++++---- include/astra/CudaForwardProjectionAlgorithm3D.h | 10 ++++---- include/astra/CudaProjector2D.h | 10 ++++---- include/astra/CudaProjector3D.h | 10 ++++---- include/astra/CudaReconstructionAlgorithm2D.h | 10 ++++---- include/astra/CudaRoiSelectAlgorithm.h | 10 ++++---- include/astra/CudaSartAlgorithm.h | 10 ++++---- include/astra/CudaSirtAlgorithm.h | 10 ++++---- include/astra/CudaSirtAlgorithm3D.h | 10 ++++---- include/astra/DataProjector.h | 10 ++++---- include/astra/DataProjectorPolicies.h | 10 ++++---- include/astra/DataProjectorPolicies.inl | 10 ++++---- include/astra/FanFlatBeamLineKernelProjector2D.h | 10 ++++---- include/astra/FanFlatBeamLineKernelProjector2D.inl | 10 ++++---- include/astra/FanFlatBeamStripKernelProjector2D.h | 10 ++++---- .../astra/FanFlatBeamStripKernelProjector2D.inl | 10 ++++---- include/astra/FanFlatProjectionGeometry2D.h | 10 ++++---- include/astra/FanFlatVecProjectionGeometry2D.h | 10 ++++---- include/astra/FilteredBackProjectionAlgorithm.h | 10 ++++---- include/astra/Float32Data.h | 10 ++++---- include/astra/Float32Data2D.h | 10 ++++---- include/astra/Float32Data3D.h | 10 ++++---- include/astra/Float32Data3DMemory.h | 10 ++++---- include/astra/Float32ProjectionData2D.h | 10 ++++---- include/astra/Float32ProjectionData3D.h | 10 ++++---- include/astra/Float32ProjectionData3DMemory.h | 10 ++++---- include/astra/Float32VolumeData2D.h | 10 ++++---- include/astra/Float32VolumeData3D.h | 10 ++++---- include/astra/Float32VolumeData3DMemory.h | 10 ++++---- include/astra/ForwardProjectionAlgorithm.h | 10 ++++---- include/astra/Fourier.h | 10 ++++---- include/astra/Globals.h | 10 ++++---- include/astra/Logger.h | 10 ++++---- include/astra/ParallelBeamBlobKernelProjector2D.h | 10 ++++---- .../astra/ParallelBeamBlobKernelProjector2D.inl | 10 ++++---- include/astra/ParallelBeamLineKernelProjector2D.h | 10 ++++---- .../astra/ParallelBeamLineKernelProjector2D.inl | 10 ++++---- .../astra/ParallelBeamLinearKernelProjector2D.h | 10 ++++---- .../astra/ParallelBeamLinearKernelProjector2D.inl | 10 ++++---- include/astra/ParallelBeamStripKernelProjector2D.h | 10 ++++---- .../astra/ParallelBeamStripKernelProjector2D.inl | 10 ++++---- include/astra/ParallelProjectionGeometry2D.h | 10 ++++---- include/astra/ParallelProjectionGeometry3D.h | 10 ++++---- include/astra/ParallelVecProjectionGeometry3D.h | 10 ++++---- include/astra/PlatformDepSystemCode.h | 10 ++++---- include/astra/ProjectionGeometry2D.h | 10 ++++---- include/astra/ProjectionGeometry3D.h | 10 ++++---- include/astra/Projector2D.h | 10 ++++---- include/astra/Projector2DImpl.inl | 10 ++++---- include/astra/Projector3D.h | 10 ++++---- include/astra/ProjectorTypelist.h | 10 ++++---- include/astra/ReconstructionAlgorithm2D.h | 10 ++++---- include/astra/ReconstructionAlgorithm3D.h | 10 ++++---- include/astra/SartAlgorithm.h | 10 ++++---- include/astra/Singleton.h | 10 ++++---- include/astra/SirtAlgorithm.h | 10 ++++---- include/astra/SparseMatrix.h | 10 ++++---- include/astra/SparseMatrixProjectionGeometry2D.h | 10 ++++---- include/astra/SparseMatrixProjector2D.h | 10 ++++---- include/astra/SparseMatrixProjector2D.inl | 10 ++++---- include/astra/TypeList.h | 10 ++++---- include/astra/Utilities.h | 10 ++++---- include/astra/Vector3D.h | 10 ++++---- include/astra/VolumeGeometry2D.h | 10 ++++---- include/astra/VolumeGeometry3D.h | 10 ++++---- include/astra/XMLDocument.h | 10 ++++---- include/astra/XMLNode.h | 10 ++++---- include/astra/swrap.h | 10 ++++---- matlab/mex/astra_mex.cpp | 10 ++++---- matlab/mex/astra_mex_algorithm_c.cpp | 10 ++++---- matlab/mex/astra_mex_c.cpp | 10 ++++---- matlab/mex/astra_mex_data2d_c.cpp | 10 ++++---- matlab/mex/astra_mex_data3d_c.cpp | 10 ++++---- matlab/mex/astra_mex_matrix_c.cpp | 10 ++++---- matlab/mex/astra_mex_projector3d_c.cpp | 10 ++++---- matlab/mex/astra_mex_projector_c.cpp | 10 ++++---- matlab/mex/mexHelpFunctions.cpp | 10 ++++---- matlab/tools/astra_add_noise_to_sino.m | 16 ++++++------- matlab/tools/astra_clear.m | 16 ++++++------- matlab/tools/astra_create_backprojection.m | 16 ++++++------- matlab/tools/astra_create_backprojection3d_cuda.m | 16 ++++++------- matlab/tools/astra_create_backprojection_cuda.m | 16 ++++++------- matlab/tools/astra_create_proj_geom.m | 16 ++++++------- matlab/tools/astra_create_projector.m | 16 ++++++------- matlab/tools/astra_create_reconstruction.m | 16 ++++++------- matlab/tools/astra_create_reconstruction_cuda.m | 16 ++++++------- matlab/tools/astra_create_sino.m | 16 ++++++------- matlab/tools/astra_create_sino3d_cuda.m | 16 ++++++------- matlab/tools/astra_create_sino_cuda.m | 16 ++++++------- matlab/tools/astra_create_sino_gpu.m | 16 ++++++------- matlab/tools/astra_create_sino_sampling.m | 16 ++++++------- matlab/tools/astra_create_vol_geom.m | 16 ++++++------- matlab/tools/astra_downsample_sinogram.m | 12 +++++----- matlab/tools/astra_mex.m | 12 +++++----- matlab/tools/astra_mex_algorithm.m | 12 +++++----- matlab/tools/astra_mex_data2d.m | 12 +++++----- matlab/tools/astra_mex_data3d.m | 12 +++++----- matlab/tools/astra_mex_matrix.m | 12 +++++----- matlab/tools/astra_mex_projector.m | 12 +++++----- matlab/tools/astra_mex_projector3d.m | 12 +++++----- matlab/tools/astra_projector_handle.m | 12 +++++----- matlab/tools/astra_set_directory.m | 12 +++++----- matlab/tools/astra_set_gpu_index.m | 16 ++++++------- matlab/tools/astra_struct.m | 12 +++++----- matlab/tools/createOrderART.m | 12 +++++----- matlab/tools/imreadgs.m | 12 +++++----- matlab/tools/imresize3D.m | 12 +++++----- matlab/tools/imscale.m | 12 +++++----- matlab/tools/imwritesc.m | 12 +++++----- matlab/tools/kaiserBessel.m | 12 +++++----- matlab/tools/linspace2.m | 12 +++++----- matlab/tools/overlayImage.m | 12 +++++----- matlab/tools/rebin_fan2par.m | 12 +++++----- matlab/tools/sliceExtractor.m | 12 +++++----- samples/s001_sinogram_par2d.m | 16 ++++++------- samples/s002_data2d.m | 16 ++++++------- samples/s003_gpu_reconstruction.m | 16 ++++++------- samples/s004_cpu_reconstruction.m | 16 ++++++------- samples/s005_3d_geometry.m | 16 ++++++------- samples/s006_3d_data.m | 16 ++++++------- samples/s007_3d_reconstruction.m | 16 ++++++------- samples/s008_gpu_selection.m | 16 ++++++------- samples/s009_projection_matrix.m | 16 ++++++------- samples/s010_supersampling.m | 16 ++++++------- samples/s011_object_info.m | 16 ++++++------- samples/s012_masks.m | 16 ++++++------- samples/s013_constraints.m | 16 ++++++------- samples/s014_FBP.m | 16 ++++++------- samples/s015_fp_bp.m | 16 ++++++------- samples/s016_plots.m | 16 ++++++------- src/Algorithm.cpp | 10 ++++---- src/ArtAlgorithm.cpp | 10 ++++---- src/AstraObjectFactory.cpp | 10 ++++---- src/AstraObjectManager.cpp | 10 ++++---- src/AsyncAlgorithm.cpp | 10 ++++---- src/BackProjectionAlgorithm.cpp | 10 ++++---- src/CglsAlgorithm.cpp | 10 ++++---- src/ConeProjectionGeometry3D.cpp | 10 ++++---- src/ConeVecProjectionGeometry3D.cpp | 10 ++++---- src/Config.cpp | 10 ++++---- src/ConvexHullAlgorithm.cpp | 10 ++++---- src/CudaBackProjectionAlgorithm.cpp | 10 ++++---- src/CudaBackProjectionAlgorithm3D.cpp | 10 ++++---- src/CudaCglsAlgorithm.cpp | 10 ++++---- src/CudaCglsAlgorithm3D.cpp | 10 ++++---- src/CudaDartMaskAlgorithm.cpp | 10 ++++---- src/CudaDartMaskAlgorithm3D.cpp | 10 ++++---- src/CudaDartSmoothingAlgorithm.cpp | 10 ++++---- src/CudaDartSmoothingAlgorithm3D.cpp | 10 ++++---- src/CudaDataOperationAlgorithm.cpp | 10 ++++---- src/CudaEMAlgorithm.cpp | 10 ++++---- src/CudaFDKAlgorithm3D.cpp | 10 ++++---- src/CudaFilteredBackProjectionAlgorithm.cpp | 10 ++++---- src/CudaForwardProjectionAlgorithm.cpp | 10 ++++---- src/CudaForwardProjectionAlgorithm3D.cpp | 10 ++++---- src/CudaProjector2D.cpp | 27 ++++++++++++++++++---- src/CudaProjector3D.cpp | 10 ++++---- src/CudaReconstructionAlgorithm2D.cpp | 10 ++++---- src/CudaRoiSelectAlgorithm.cpp | 10 ++++---- src/CudaSartAlgorithm.cpp | 10 ++++---- src/CudaSirtAlgorithm.cpp | 10 ++++---- src/CudaSirtAlgorithm3D.cpp | 10 ++++---- src/DataProjector.cpp | 10 ++++---- src/DataProjectorPolicies.cpp | 10 ++++---- src/FanFlatBeamLineKernelProjector2D.cpp | 10 ++++---- src/FanFlatBeamStripKernelProjector2D.cpp | 10 ++++---- src/FanFlatProjectionGeometry2D.cpp | 10 ++++---- src/FanFlatVecProjectionGeometry2D.cpp | 10 ++++---- src/FilteredBackProjectionAlgorithm.cpp | 10 ++++---- src/Float32Data.cpp | 10 ++++---- src/Float32Data2D.cpp | 10 ++++---- src/Float32Data3D.cpp | 10 ++++---- src/Float32Data3DMemory.cpp | 10 ++++---- src/Float32ProjectionData2D.cpp | 10 ++++---- src/Float32ProjectionData3D.cpp | 10 ++++---- src/Float32ProjectionData3DMemory.cpp | 10 ++++---- src/Float32VolumeData2D.cpp | 10 ++++---- src/Float32VolumeData3D.cpp | 10 ++++---- src/Float32VolumeData3DMemory.cpp | 10 ++++---- src/ForwardProjectionAlgorithm.cpp | 10 ++++---- src/Fourier.cpp | 10 ++++---- src/Globals.cpp | 10 ++++---- src/Logger.cpp | 10 ++++---- src/ParallelBeamBlobKernelProjector2D.cpp | 10 ++++---- src/ParallelBeamLineKernelProjector2D.cpp | 10 ++++---- src/ParallelBeamLinearKernelProjector2D.cpp | 10 ++++---- src/ParallelBeamStripKernelProjector2D.cpp | 10 ++++---- src/ParallelProjectionGeometry2D.cpp | 10 ++++---- src/ParallelProjectionGeometry3D.cpp | 10 ++++---- src/ParallelVecProjectionGeometry3D.cpp | 10 ++++---- src/PlatformDepSystemCode.cpp | 10 ++++---- src/ProjectionGeometry2D.cpp | 10 ++++---- src/ProjectionGeometry3D.cpp | 10 ++++---- src/Projector2D.cpp | 10 ++++---- src/Projector3D.cpp | 10 ++++---- src/ReconstructionAlgorithm2D.cpp | 10 ++++---- src/ReconstructionAlgorithm3D.cpp | 10 ++++---- src/ReconstructionAlgorithmMultiSlice2D.cpp | 10 ++++---- src/SartAlgorithm.cpp | 10 ++++---- src/SirtAlgorithm.cpp | 10 ++++---- src/SparseMatrix.cpp | 10 ++++---- src/SparseMatrixProjectionGeometry2D.cpp | 10 ++++---- src/SparseMatrixProjector2D.cpp | 10 ++++---- src/Utilities.cpp | 10 ++++---- src/Vector3D.cpp | 10 ++++---- src/VolumeGeometry2D.cpp | 10 ++++---- src/VolumeGeometry3D.cpp | 10 ++++---- src/XMLDocument.cpp | 10 ++++---- src/XMLNode.cpp | 10 ++++---- src/swrap.cpp | 10 ++++---- 293 files changed, 1603 insertions(+), 1585 deletions(-) diff --git a/NEWS.txt b/NEWS.txt index 9796b25..c96098b 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -1,18 +1,19 @@ ----------------------------------------------------------------------- -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA Toolbox") +This file is part of the ASTRA Toolbox -Copyright: iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam + http://visielab.uantwerpen.be/ and http://www.cwi.nl/ License: Open Source under GPLv3 -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be - http://sf.net/projects/astra-toolbox +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox ----------------------------------------------------------------------- -1.5 (2014-05-??) +1.5 (2014-??-??) * various consistency and bug fixes * add support for fan beam FBP * add astra_mex_data3d_c('link') command + * build fixes for newer platforms 1.4 (2014-04-07) * various consistency and bug fixes diff --git a/README.txt b/README.txt index 97fed55..6ae1852 100644 --- a/README.txt +++ b/README.txt @@ -1,12 +1,12 @@ ----------------------------------------------------------------------- -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA Toolbox") +This file is part of the ASTRA Toolbox -Copyright: iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam + http://visielab.uantwerpen.be/ and http://www.cwi.nl/ License: Open Source under GPLv3 -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be - http://sf.net/projects/astra-toolbox +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox ----------------------------------------------------------------------- diff --git a/build/linux/configure.ac b/build/linux/configure.ac index 5fe6863..4c9685b 100644 --- a/build/linux/configure.ac +++ b/build/linux/configure.ac @@ -1,12 +1,12 @@ dnl ----------------------------------------------------------------------- -dnl Copyright 2012 iMinds-Vision Lab, University of Antwerp +dnl Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +dnl 2014, CWI, Amsterdam dnl -dnl Contact: astra@ua.ac.be -dnl Website: http://astra.ua.ac.be +dnl Contact: astra@uantwerpen.be +dnl Website: http://sf.net/projects/astra-toolbox dnl +dnl This file is part of the ASTRA Toolbox. dnl -dnl This file is part of the -dnl All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA Toolbox"). dnl dnl The ASTRA Toolbox is free software: you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by diff --git a/cuda/2d/algo.cu b/cuda/2d/algo.cu index 33ca1a3..f40b642 100644 --- a/cuda/2d/algo.cu +++ b/cuda/2d/algo.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/algo.h b/cuda/2d/algo.h index 96195a3..d39935d 100644 --- a/cuda/2d/algo.h +++ b/cuda/2d/algo.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/arith.cu b/cuda/2d/arith.cu index 04d4de9..d1b189c 100644 --- a/cuda/2d/arith.cu +++ b/cuda/2d/arith.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/arith.h b/cuda/2d/arith.h index f730e2f..f87db99 100644 --- a/cuda/2d/arith.h +++ b/cuda/2d/arith.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/astra.cu b/cuda/2d/astra.cu index f4d4717..2dd819d 100644 --- a/cuda/2d/astra.cu +++ b/cuda/2d/astra.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/astra.h b/cuda/2d/astra.h index 42b15e8..728449b 100644 --- a/cuda/2d/astra.h +++ b/cuda/2d/astra.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/cgls.cu b/cuda/2d/cgls.cu index 066ac5d..40e2f93 100644 --- a/cuda/2d/cgls.cu +++ b/cuda/2d/cgls.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/cgls.h b/cuda/2d/cgls.h index 1013bf8..fa4118f 100644 --- a/cuda/2d/cgls.h +++ b/cuda/2d/cgls.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/darthelper.cu b/cuda/2d/darthelper.cu index 9b5141b..a40a2f1 100644 --- a/cuda/2d/darthelper.cu +++ b/cuda/2d/darthelper.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/darthelper.h b/cuda/2d/darthelper.h index 8f57d3c..336372e 100644 --- a/cuda/2d/darthelper.h +++ b/cuda/2d/darthelper.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/dataop.cu b/cuda/2d/dataop.cu index 9dc193e..4b64775 100644 --- a/cuda/2d/dataop.cu +++ b/cuda/2d/dataop.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/dataop.h b/cuda/2d/dataop.h index 3e9c7e2..2693f1a 100644 --- a/cuda/2d/dataop.h +++ b/cuda/2d/dataop.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/dims.h b/cuda/2d/dims.h index df349f7..9678050 100644 --- a/cuda/2d/dims.h +++ b/cuda/2d/dims.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/em.cu b/cuda/2d/em.cu index ebb76b5..a8fd689 100644 --- a/cuda/2d/em.cu +++ b/cuda/2d/em.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/em.h b/cuda/2d/em.h index 5a9ffed..b3149cc 100644 --- a/cuda/2d/em.h +++ b/cuda/2d/em.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/fan_bp.cu b/cuda/2d/fan_bp.cu index 8983a9c..e71d676 100644 --- a/cuda/2d/fan_bp.cu +++ b/cuda/2d/fan_bp.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/fan_bp.h b/cuda/2d/fan_bp.h index f498ac7..f94d2ca 100644 --- a/cuda/2d/fan_bp.h +++ b/cuda/2d/fan_bp.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/fan_fp.cu b/cuda/2d/fan_fp.cu index 5f1ccdf..036006d 100644 --- a/cuda/2d/fan_fp.cu +++ b/cuda/2d/fan_fp.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/fan_fp.h b/cuda/2d/fan_fp.h index 0734f40..11e9281 100644 --- a/cuda/2d/fan_fp.h +++ b/cuda/2d/fan_fp.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/fbp_filters.h b/cuda/2d/fbp_filters.h index 1232f8e..befd270 100644 --- a/cuda/2d/fbp_filters.h +++ b/cuda/2d/fbp_filters.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/fft.cu b/cuda/2d/fft.cu index 75bd92c..f0cc103 100644 --- a/cuda/2d/fft.cu +++ b/cuda/2d/fft.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/fft.h b/cuda/2d/fft.h index d4428a5..4811761 100644 --- a/cuda/2d/fft.h +++ b/cuda/2d/fft.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/par_bp.cu b/cuda/2d/par_bp.cu index fc99102..f9147c8 100644 --- a/cuda/2d/par_bp.cu +++ b/cuda/2d/par_bp.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/par_bp.h b/cuda/2d/par_bp.h index c6dbd59..68b61b5 100644 --- a/cuda/2d/par_bp.h +++ b/cuda/2d/par_bp.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/par_fp.cu b/cuda/2d/par_fp.cu index 097122b..390c3bb 100644 --- a/cuda/2d/par_fp.cu +++ b/cuda/2d/par_fp.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/par_fp.h b/cuda/2d/par_fp.h index 3213b14..9352be0 100644 --- a/cuda/2d/par_fp.h +++ b/cuda/2d/par_fp.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/sart.cu b/cuda/2d/sart.cu index 28a18d8..6c03933 100644 --- a/cuda/2d/sart.cu +++ b/cuda/2d/sart.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/sart.h b/cuda/2d/sart.h index ad80259..cda38de 100644 --- a/cuda/2d/sart.h +++ b/cuda/2d/sart.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/sirt.cu b/cuda/2d/sirt.cu index d34a180..c7fe219 100644 --- a/cuda/2d/sirt.cu +++ b/cuda/2d/sirt.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/sirt.h b/cuda/2d/sirt.h index 5592616..1dbf675 100644 --- a/cuda/2d/sirt.h +++ b/cuda/2d/sirt.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/util.cu b/cuda/2d/util.cu index dba70d9..f4e6094 100644 --- a/cuda/2d/util.cu +++ b/cuda/2d/util.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/2d/util.h b/cuda/2d/util.h index c0ec49e..d73445e 100644 --- a/cuda/2d/util.h +++ b/cuda/2d/util.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/algo3d.cu b/cuda/3d/algo3d.cu index 20e7381..1372495 100644 --- a/cuda/3d/algo3d.cu +++ b/cuda/3d/algo3d.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/algo3d.h b/cuda/3d/algo3d.h index 2b44f6f..cbb42e5 100644 --- a/cuda/3d/algo3d.h +++ b/cuda/3d/algo3d.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/arith3d.cu b/cuda/3d/arith3d.cu index f5badad..659a8d3 100644 --- a/cuda/3d/arith3d.cu +++ b/cuda/3d/arith3d.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/arith3d.h b/cuda/3d/arith3d.h index 5635ffd..b0cd42d 100644 --- a/cuda/3d/arith3d.h +++ b/cuda/3d/arith3d.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/astra3d.cu b/cuda/3d/astra3d.cu index 2e14744..e28c42f 100644 --- a/cuda/3d/astra3d.cu +++ b/cuda/3d/astra3d.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/astra3d.h b/cuda/3d/astra3d.h index 9d87e33..50cdecf 100644 --- a/cuda/3d/astra3d.h +++ b/cuda/3d/astra3d.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/cgls3d.cu b/cuda/3d/cgls3d.cu index 773981b..fd0e1ca 100644 --- a/cuda/3d/cgls3d.cu +++ b/cuda/3d/cgls3d.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/cgls3d.h b/cuda/3d/cgls3d.h index d16b571..4545cee 100644 --- a/cuda/3d/cgls3d.h +++ b/cuda/3d/cgls3d.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/cone_bp.cu b/cuda/3d/cone_bp.cu index 3b0fd70..6bc3374 100644 --- a/cuda/3d/cone_bp.cu +++ b/cuda/3d/cone_bp.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/cone_bp.h b/cuda/3d/cone_bp.h index c77714e..8a4d250 100644 --- a/cuda/3d/cone_bp.h +++ b/cuda/3d/cone_bp.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/cone_fp.cu b/cuda/3d/cone_fp.cu index d049151..88cf08e 100644 --- a/cuda/3d/cone_fp.cu +++ b/cuda/3d/cone_fp.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/cone_fp.h b/cuda/3d/cone_fp.h index 2a0463b..4734ca9 100644 --- a/cuda/3d/cone_fp.h +++ b/cuda/3d/cone_fp.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/darthelper3d.cu b/cuda/3d/darthelper3d.cu index 6e60ec2..9a8857a 100644 --- a/cuda/3d/darthelper3d.cu +++ b/cuda/3d/darthelper3d.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/darthelper3d.h b/cuda/3d/darthelper3d.h index 7899629..0b6fb79 100644 --- a/cuda/3d/darthelper3d.h +++ b/cuda/3d/darthelper3d.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/dims3d.h b/cuda/3d/dims3d.h index ec3c4a3..6adc454 100644 --- a/cuda/3d/dims3d.h +++ b/cuda/3d/dims3d.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/fdk.cu b/cuda/3d/fdk.cu index d1c23c6..0b2c6c0 100644 --- a/cuda/3d/fdk.cu +++ b/cuda/3d/fdk.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/fdk.h b/cuda/3d/fdk.h index c9123b9..021f16b 100644 --- a/cuda/3d/fdk.h +++ b/cuda/3d/fdk.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/par3d_bp.cu b/cuda/3d/par3d_bp.cu index 58b19fe..1247c4c 100644 --- a/cuda/3d/par3d_bp.cu +++ b/cuda/3d/par3d_bp.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/par3d_bp.h b/cuda/3d/par3d_bp.h index 399a3cb..34bd04b 100644 --- a/cuda/3d/par3d_bp.h +++ b/cuda/3d/par3d_bp.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/par3d_fp.cu b/cuda/3d/par3d_fp.cu index 264b54c..c235e15 100644 --- a/cuda/3d/par3d_fp.cu +++ b/cuda/3d/par3d_fp.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/par3d_fp.h b/cuda/3d/par3d_fp.h index 7208361..0c41fcd 100644 --- a/cuda/3d/par3d_fp.h +++ b/cuda/3d/par3d_fp.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/sirt3d.cu b/cuda/3d/sirt3d.cu index 787d39f..d143d38 100644 --- a/cuda/3d/sirt3d.cu +++ b/cuda/3d/sirt3d.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/sirt3d.h b/cuda/3d/sirt3d.h index c3752c2..9e61162 100644 --- a/cuda/3d/sirt3d.h +++ b/cuda/3d/sirt3d.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/util3d.cu b/cuda/3d/util3d.cu index cf40fdc..cb43144 100644 --- a/cuda/3d/util3d.cu +++ b/cuda/3d/util3d.cu @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/cuda/3d/util3d.h b/cuda/3d/util3d.h index cf04a18..018cf6c 100644 --- a/cuda/3d/util3d.h +++ b/cuda/3d/util3d.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/Algorithm.h b/include/astra/Algorithm.h index 21632eb..334dc01 100644 --- a/include/astra/Algorithm.h +++ b/include/astra/Algorithm.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/AlgorithmTypelist.h b/include/astra/AlgorithmTypelist.h index 615c143..349fc93 100644 --- a/include/astra/AlgorithmTypelist.h +++ b/include/astra/AlgorithmTypelist.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/ArtAlgorithm.h b/include/astra/ArtAlgorithm.h index bd02fc4..ff9f8ad 100644 --- a/include/astra/ArtAlgorithm.h +++ b/include/astra/ArtAlgorithm.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/AstraObjectFactory.h b/include/astra/AstraObjectFactory.h index 784d698..bd050dd 100644 --- a/include/astra/AstraObjectFactory.h +++ b/include/astra/AstraObjectFactory.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/AstraObjectManager.h b/include/astra/AstraObjectManager.h index afb6312..ab4f39c 100644 --- a/include/astra/AstraObjectManager.h +++ b/include/astra/AstraObjectManager.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/AsyncAlgorithm.h b/include/astra/AsyncAlgorithm.h index 64f70c3..9e72682 100644 --- a/include/astra/AsyncAlgorithm.h +++ b/include/astra/AsyncAlgorithm.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/BackProjectionAlgorithm.h b/include/astra/BackProjectionAlgorithm.h index d50b406..608a133 100644 --- a/include/astra/BackProjectionAlgorithm.h +++ b/include/astra/BackProjectionAlgorithm.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/CglsAlgorithm.h b/include/astra/CglsAlgorithm.h index 1700d74..2c59c56 100644 --- a/include/astra/CglsAlgorithm.h +++ b/include/astra/CglsAlgorithm.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/ConeProjectionGeometry3D.h b/include/astra/ConeProjectionGeometry3D.h index 497ce7d..64bd51d 100644 --- a/include/astra/ConeProjectionGeometry3D.h +++ b/include/astra/ConeProjectionGeometry3D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/ConeVecProjectionGeometry3D.h b/include/astra/ConeVecProjectionGeometry3D.h index 1765cdd..b829d0e 100644 --- a/include/astra/ConeVecProjectionGeometry3D.h +++ b/include/astra/ConeVecProjectionGeometry3D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/Config.h b/include/astra/Config.h index 5a629a2..65b47a2 100644 --- a/include/astra/Config.h +++ b/include/astra/Config.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/CudaBackProjectionAlgorithm.h b/include/astra/CudaBackProjectionAlgorithm.h index 09a2a65..0b11b1e 100644 --- a/include/astra/CudaBackProjectionAlgorithm.h +++ b/include/astra/CudaBackProjectionAlgorithm.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/CudaBackProjectionAlgorithm3D.h b/include/astra/CudaBackProjectionAlgorithm3D.h index 90a085d..1f73c6b 100644 --- a/include/astra/CudaBackProjectionAlgorithm3D.h +++ b/include/astra/CudaBackProjectionAlgorithm3D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/CudaCglsAlgorithm.h b/include/astra/CudaCglsAlgorithm.h index a529bfd..b5af2db 100644 --- a/include/astra/CudaCglsAlgorithm.h +++ b/include/astra/CudaCglsAlgorithm.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/CudaCglsAlgorithm3D.h b/include/astra/CudaCglsAlgorithm3D.h index 0d66327..9968eda 100644 --- a/include/astra/CudaCglsAlgorithm3D.h +++ b/include/astra/CudaCglsAlgorithm3D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/CudaDartMaskAlgorithm.h b/include/astra/CudaDartMaskAlgorithm.h index f370f42..ae6ecba 100644 --- a/include/astra/CudaDartMaskAlgorithm.h +++ b/include/astra/CudaDartMaskAlgorithm.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/CudaDartMaskAlgorithm3D.h b/include/astra/CudaDartMaskAlgorithm3D.h index bdbce2b..8024574 100644 --- a/include/astra/CudaDartMaskAlgorithm3D.h +++ b/include/astra/CudaDartMaskAlgorithm3D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/CudaDartSmoothingAlgorithm.h b/include/astra/CudaDartSmoothingAlgorithm.h index f90f9cf..2bc8965 100644 --- a/include/astra/CudaDartSmoothingAlgorithm.h +++ b/include/astra/CudaDartSmoothingAlgorithm.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/CudaDartSmoothingAlgorithm3D.h b/include/astra/CudaDartSmoothingAlgorithm3D.h index 9942de8..d8d5c25 100644 --- a/include/astra/CudaDartSmoothingAlgorithm3D.h +++ b/include/astra/CudaDartSmoothingAlgorithm3D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/CudaDataOperationAlgorithm.h b/include/astra/CudaDataOperationAlgorithm.h index a5ab01a..28ec653 100644 --- a/include/astra/CudaDataOperationAlgorithm.h +++ b/include/astra/CudaDataOperationAlgorithm.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/CudaEMAlgorithm.h b/include/astra/CudaEMAlgorithm.h index ca9c9f6..61c9802 100644 --- a/include/astra/CudaEMAlgorithm.h +++ b/include/astra/CudaEMAlgorithm.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/CudaFDKAlgorithm3D.h b/include/astra/CudaFDKAlgorithm3D.h index 393e6c8..458161e 100644 --- a/include/astra/CudaFDKAlgorithm3D.h +++ b/include/astra/CudaFDKAlgorithm3D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/CudaFilteredBackProjectionAlgorithm.h b/include/astra/CudaFilteredBackProjectionAlgorithm.h index 1b481b3..9928a33 100644 --- a/include/astra/CudaFilteredBackProjectionAlgorithm.h +++ b/include/astra/CudaFilteredBackProjectionAlgorithm.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/CudaForwardProjectionAlgorithm.h b/include/astra/CudaForwardProjectionAlgorithm.h index 6a6ba24..8b29359 100644 --- a/include/astra/CudaForwardProjectionAlgorithm.h +++ b/include/astra/CudaForwardProjectionAlgorithm.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/CudaForwardProjectionAlgorithm3D.h b/include/astra/CudaForwardProjectionAlgorithm3D.h index 3312eec..985147b 100644 --- a/include/astra/CudaForwardProjectionAlgorithm3D.h +++ b/include/astra/CudaForwardProjectionAlgorithm3D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/CudaProjector2D.h b/include/astra/CudaProjector2D.h index c24c239..6837c21 100644 --- a/include/astra/CudaProjector2D.h +++ b/include/astra/CudaProjector2D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/CudaProjector3D.h b/include/astra/CudaProjector3D.h index 66071f0..82d5a5f 100644 --- a/include/astra/CudaProjector3D.h +++ b/include/astra/CudaProjector3D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/CudaReconstructionAlgorithm2D.h b/include/astra/CudaReconstructionAlgorithm2D.h index 68f4b5d..f2b3580 100644 --- a/include/astra/CudaReconstructionAlgorithm2D.h +++ b/include/astra/CudaReconstructionAlgorithm2D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/CudaRoiSelectAlgorithm.h b/include/astra/CudaRoiSelectAlgorithm.h index 1ee9c32..3ba17e7 100644 --- a/include/astra/CudaRoiSelectAlgorithm.h +++ b/include/astra/CudaRoiSelectAlgorithm.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/CudaSartAlgorithm.h b/include/astra/CudaSartAlgorithm.h index 49845f2..b7320d7 100644 --- a/include/astra/CudaSartAlgorithm.h +++ b/include/astra/CudaSartAlgorithm.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/CudaSirtAlgorithm.h b/include/astra/CudaSirtAlgorithm.h index 34b5a66..cbb97fb 100644 --- a/include/astra/CudaSirtAlgorithm.h +++ b/include/astra/CudaSirtAlgorithm.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/CudaSirtAlgorithm3D.h b/include/astra/CudaSirtAlgorithm3D.h index c9f2df5..bff4058 100644 --- a/include/astra/CudaSirtAlgorithm3D.h +++ b/include/astra/CudaSirtAlgorithm3D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/DataProjector.h b/include/astra/DataProjector.h index a324625..a9b5fd1 100644 --- a/include/astra/DataProjector.h +++ b/include/astra/DataProjector.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/DataProjectorPolicies.h b/include/astra/DataProjectorPolicies.h index 5ec08bd..2572d6f 100644 --- a/include/astra/DataProjectorPolicies.h +++ b/include/astra/DataProjectorPolicies.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/DataProjectorPolicies.inl b/include/astra/DataProjectorPolicies.inl index b2166c3..98d3252 100644 --- a/include/astra/DataProjectorPolicies.inl +++ b/include/astra/DataProjectorPolicies.inl @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/FanFlatBeamLineKernelProjector2D.h b/include/astra/FanFlatBeamLineKernelProjector2D.h index 8ead007..76852bd 100644 --- a/include/astra/FanFlatBeamLineKernelProjector2D.h +++ b/include/astra/FanFlatBeamLineKernelProjector2D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/FanFlatBeamLineKernelProjector2D.inl b/include/astra/FanFlatBeamLineKernelProjector2D.inl index 7ea2749..8d490be 100644 --- a/include/astra/FanFlatBeamLineKernelProjector2D.inl +++ b/include/astra/FanFlatBeamLineKernelProjector2D.inl @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/FanFlatBeamStripKernelProjector2D.h b/include/astra/FanFlatBeamStripKernelProjector2D.h index 6b95427..475b030 100644 --- a/include/astra/FanFlatBeamStripKernelProjector2D.h +++ b/include/astra/FanFlatBeamStripKernelProjector2D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/FanFlatBeamStripKernelProjector2D.inl b/include/astra/FanFlatBeamStripKernelProjector2D.inl index 9c3697e..6d3fd67 100644 --- a/include/astra/FanFlatBeamStripKernelProjector2D.inl +++ b/include/astra/FanFlatBeamStripKernelProjector2D.inl @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/FanFlatProjectionGeometry2D.h b/include/astra/FanFlatProjectionGeometry2D.h index 0e790ae..b581c28 100644 --- a/include/astra/FanFlatProjectionGeometry2D.h +++ b/include/astra/FanFlatProjectionGeometry2D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/FanFlatVecProjectionGeometry2D.h b/include/astra/FanFlatVecProjectionGeometry2D.h index d370b24..33e15e3 100644 --- a/include/astra/FanFlatVecProjectionGeometry2D.h +++ b/include/astra/FanFlatVecProjectionGeometry2D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/FilteredBackProjectionAlgorithm.h b/include/astra/FilteredBackProjectionAlgorithm.h index cda7962..6495d7d 100644 --- a/include/astra/FilteredBackProjectionAlgorithm.h +++ b/include/astra/FilteredBackProjectionAlgorithm.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/Float32Data.h b/include/astra/Float32Data.h index 99bbaf3..ffd9b08 100644 --- a/include/astra/Float32Data.h +++ b/include/astra/Float32Data.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/Float32Data2D.h b/include/astra/Float32Data2D.h index c5d2c70..53ec23f 100644 --- a/include/astra/Float32Data2D.h +++ b/include/astra/Float32Data2D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/Float32Data3D.h b/include/astra/Float32Data3D.h index ee385f0..502e62d 100644 --- a/include/astra/Float32Data3D.h +++ b/include/astra/Float32Data3D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/Float32Data3DMemory.h b/include/astra/Float32Data3DMemory.h index f72e0ee..6c21fed 100644 --- a/include/astra/Float32Data3DMemory.h +++ b/include/astra/Float32Data3DMemory.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/Float32ProjectionData2D.h b/include/astra/Float32ProjectionData2D.h index d9fe51a..7728bee 100644 --- a/include/astra/Float32ProjectionData2D.h +++ b/include/astra/Float32ProjectionData2D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/Float32ProjectionData3D.h b/include/astra/Float32ProjectionData3D.h index 92122a7..9bbd423 100644 --- a/include/astra/Float32ProjectionData3D.h +++ b/include/astra/Float32ProjectionData3D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/Float32ProjectionData3DMemory.h b/include/astra/Float32ProjectionData3DMemory.h index fb54425..d104b53 100644 --- a/include/astra/Float32ProjectionData3DMemory.h +++ b/include/astra/Float32ProjectionData3DMemory.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/Float32VolumeData2D.h b/include/astra/Float32VolumeData2D.h index d7bf2f6..2a39599 100644 --- a/include/astra/Float32VolumeData2D.h +++ b/include/astra/Float32VolumeData2D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/Float32VolumeData3D.h b/include/astra/Float32VolumeData3D.h index 0b1bd96..5f717c3 100644 --- a/include/astra/Float32VolumeData3D.h +++ b/include/astra/Float32VolumeData3D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/Float32VolumeData3DMemory.h b/include/astra/Float32VolumeData3DMemory.h index b3f3891..6b195ee 100644 --- a/include/astra/Float32VolumeData3DMemory.h +++ b/include/astra/Float32VolumeData3DMemory.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/ForwardProjectionAlgorithm.h b/include/astra/ForwardProjectionAlgorithm.h index 147002b..3354f16 100644 --- a/include/astra/ForwardProjectionAlgorithm.h +++ b/include/astra/ForwardProjectionAlgorithm.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/Fourier.h b/include/astra/Fourier.h index 290c094..2060b51 100644 --- a/include/astra/Fourier.h +++ b/include/astra/Fourier.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/Globals.h b/include/astra/Globals.h index d82c238..480638f 100644 --- a/include/astra/Globals.h +++ b/include/astra/Globals.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/Logger.h b/include/astra/Logger.h index ae064fe..9145bcd 100644 --- a/include/astra/Logger.h +++ b/include/astra/Logger.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/ParallelBeamBlobKernelProjector2D.h b/include/astra/ParallelBeamBlobKernelProjector2D.h index 38b209c..bfce99c 100644 --- a/include/astra/ParallelBeamBlobKernelProjector2D.h +++ b/include/astra/ParallelBeamBlobKernelProjector2D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/ParallelBeamBlobKernelProjector2D.inl b/include/astra/ParallelBeamBlobKernelProjector2D.inl index 70764b1..24684aa 100644 --- a/include/astra/ParallelBeamBlobKernelProjector2D.inl +++ b/include/astra/ParallelBeamBlobKernelProjector2D.inl @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/ParallelBeamLineKernelProjector2D.h b/include/astra/ParallelBeamLineKernelProjector2D.h index 64b5ef3..2c0b920 100644 --- a/include/astra/ParallelBeamLineKernelProjector2D.h +++ b/include/astra/ParallelBeamLineKernelProjector2D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/ParallelBeamLineKernelProjector2D.inl b/include/astra/ParallelBeamLineKernelProjector2D.inl index 149ac46..3cf3958 100644 --- a/include/astra/ParallelBeamLineKernelProjector2D.inl +++ b/include/astra/ParallelBeamLineKernelProjector2D.inl @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/ParallelBeamLinearKernelProjector2D.h b/include/astra/ParallelBeamLinearKernelProjector2D.h index 0a011f1..7d9023a 100644 --- a/include/astra/ParallelBeamLinearKernelProjector2D.h +++ b/include/astra/ParallelBeamLinearKernelProjector2D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/ParallelBeamLinearKernelProjector2D.inl b/include/astra/ParallelBeamLinearKernelProjector2D.inl index d545f30..df1a475 100644 --- a/include/astra/ParallelBeamLinearKernelProjector2D.inl +++ b/include/astra/ParallelBeamLinearKernelProjector2D.inl @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/ParallelBeamStripKernelProjector2D.h b/include/astra/ParallelBeamStripKernelProjector2D.h index e3808ca..f1954d5 100644 --- a/include/astra/ParallelBeamStripKernelProjector2D.h +++ b/include/astra/ParallelBeamStripKernelProjector2D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/ParallelBeamStripKernelProjector2D.inl b/include/astra/ParallelBeamStripKernelProjector2D.inl index 11a1d54..2e5a023 100644 --- a/include/astra/ParallelBeamStripKernelProjector2D.inl +++ b/include/astra/ParallelBeamStripKernelProjector2D.inl @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/ParallelProjectionGeometry2D.h b/include/astra/ParallelProjectionGeometry2D.h index c91fb4d..f41e7fd 100644 --- a/include/astra/ParallelProjectionGeometry2D.h +++ b/include/astra/ParallelProjectionGeometry2D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/ParallelProjectionGeometry3D.h b/include/astra/ParallelProjectionGeometry3D.h index 85d0687..a1fae4d 100644 --- a/include/astra/ParallelProjectionGeometry3D.h +++ b/include/astra/ParallelProjectionGeometry3D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/ParallelVecProjectionGeometry3D.h b/include/astra/ParallelVecProjectionGeometry3D.h index 0b4a766..981f1f9 100644 --- a/include/astra/ParallelVecProjectionGeometry3D.h +++ b/include/astra/ParallelVecProjectionGeometry3D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/PlatformDepSystemCode.h b/include/astra/PlatformDepSystemCode.h index 1e254b4..57ad0db 100644 --- a/include/astra/PlatformDepSystemCode.h +++ b/include/astra/PlatformDepSystemCode.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/ProjectionGeometry2D.h b/include/astra/ProjectionGeometry2D.h index bcaee7a..58351f8 100644 --- a/include/astra/ProjectionGeometry2D.h +++ b/include/astra/ProjectionGeometry2D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/ProjectionGeometry3D.h b/include/astra/ProjectionGeometry3D.h index 0deffa6..99c5a2f 100644 --- a/include/astra/ProjectionGeometry3D.h +++ b/include/astra/ProjectionGeometry3D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/Projector2D.h b/include/astra/Projector2D.h index a359aba..73d8862 100644 --- a/include/astra/Projector2D.h +++ b/include/astra/Projector2D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/Projector2DImpl.inl b/include/astra/Projector2DImpl.inl index 97341c8..0bb39ee 100644 --- a/include/astra/Projector2DImpl.inl +++ b/include/astra/Projector2DImpl.inl @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/Projector3D.h b/include/astra/Projector3D.h index ec81bc8..6dcf08f 100644 --- a/include/astra/Projector3D.h +++ b/include/astra/Projector3D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/ProjectorTypelist.h b/include/astra/ProjectorTypelist.h index ddc345a..d448445 100644 --- a/include/astra/ProjectorTypelist.h +++ b/include/astra/ProjectorTypelist.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/ReconstructionAlgorithm2D.h b/include/astra/ReconstructionAlgorithm2D.h index 25a6c0a..2ac3811 100644 --- a/include/astra/ReconstructionAlgorithm2D.h +++ b/include/astra/ReconstructionAlgorithm2D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/ReconstructionAlgorithm3D.h b/include/astra/ReconstructionAlgorithm3D.h index 063ff6e..6ed0f73 100644 --- a/include/astra/ReconstructionAlgorithm3D.h +++ b/include/astra/ReconstructionAlgorithm3D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/SartAlgorithm.h b/include/astra/SartAlgorithm.h index 1a79a60..5ca52e3 100644 --- a/include/astra/SartAlgorithm.h +++ b/include/astra/SartAlgorithm.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/Singleton.h b/include/astra/Singleton.h index 5a494e4..e5c5db5 100644 --- a/include/astra/Singleton.h +++ b/include/astra/Singleton.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/SirtAlgorithm.h b/include/astra/SirtAlgorithm.h index 5cbc4d4..9cba671 100644 --- a/include/astra/SirtAlgorithm.h +++ b/include/astra/SirtAlgorithm.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/SparseMatrix.h b/include/astra/SparseMatrix.h index e07be87..767f654 100644 --- a/include/astra/SparseMatrix.h +++ b/include/astra/SparseMatrix.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/SparseMatrixProjectionGeometry2D.h b/include/astra/SparseMatrixProjectionGeometry2D.h index e334dd1..4bc8034 100644 --- a/include/astra/SparseMatrixProjectionGeometry2D.h +++ b/include/astra/SparseMatrixProjectionGeometry2D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/SparseMatrixProjector2D.h b/include/astra/SparseMatrixProjector2D.h index f2554bf..c0e3af6 100644 --- a/include/astra/SparseMatrixProjector2D.h +++ b/include/astra/SparseMatrixProjector2D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/SparseMatrixProjector2D.inl b/include/astra/SparseMatrixProjector2D.inl index 8256232..b190110 100644 --- a/include/astra/SparseMatrixProjector2D.inl +++ b/include/astra/SparseMatrixProjector2D.inl @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/TypeList.h b/include/astra/TypeList.h index fcf985d..65487e4 100644 --- a/include/astra/TypeList.h +++ b/include/astra/TypeList.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/Utilities.h b/include/astra/Utilities.h index 7bf0cae..94adea9 100644 --- a/include/astra/Utilities.h +++ b/include/astra/Utilities.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/Vector3D.h b/include/astra/Vector3D.h index ee923c9..66b47b4 100644 --- a/include/astra/Vector3D.h +++ b/include/astra/Vector3D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/VolumeGeometry2D.h b/include/astra/VolumeGeometry2D.h index 99d480d..a709b2a 100644 --- a/include/astra/VolumeGeometry2D.h +++ b/include/astra/VolumeGeometry2D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/VolumeGeometry3D.h b/include/astra/VolumeGeometry3D.h index 4ca8042..7354f33 100644 --- a/include/astra/VolumeGeometry3D.h +++ b/include/astra/VolumeGeometry3D.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/XMLDocument.h b/include/astra/XMLDocument.h index dbcc679..2c188f0 100644 --- a/include/astra/XMLDocument.h +++ b/include/astra/XMLDocument.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/XMLNode.h b/include/astra/XMLNode.h index 3ed6417..38dd2db 100644 --- a/include/astra/XMLNode.h +++ b/include/astra/XMLNode.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/include/astra/swrap.h b/include/astra/swrap.h index af45838..e011617 100644 --- a/include/astra/swrap.h +++ b/include/astra/swrap.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/matlab/mex/astra_mex.cpp b/matlab/mex/astra_mex.cpp index 4b77f76..7478c48 100644 --- a/matlab/mex/astra_mex.cpp +++ b/matlab/mex/astra_mex.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/matlab/mex/astra_mex_algorithm_c.cpp b/matlab/mex/astra_mex_algorithm_c.cpp index 7476ba4..1c0ab79 100644 --- a/matlab/mex/astra_mex_algorithm_c.cpp +++ b/matlab/mex/astra_mex_algorithm_c.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/matlab/mex/astra_mex_c.cpp b/matlab/mex/astra_mex_c.cpp index 816f1f3..b9bd18e 100644 --- a/matlab/mex/astra_mex_c.cpp +++ b/matlab/mex/astra_mex_c.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/matlab/mex/astra_mex_data2d_c.cpp b/matlab/mex/astra_mex_data2d_c.cpp index 57f61c3..c5e271a 100644 --- a/matlab/mex/astra_mex_data2d_c.cpp +++ b/matlab/mex/astra_mex_data2d_c.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/matlab/mex/astra_mex_data3d_c.cpp b/matlab/mex/astra_mex_data3d_c.cpp index 8b6fb95..fdd801e 100644 --- a/matlab/mex/astra_mex_data3d_c.cpp +++ b/matlab/mex/astra_mex_data3d_c.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/matlab/mex/astra_mex_matrix_c.cpp b/matlab/mex/astra_mex_matrix_c.cpp index accaab5..1285eb2 100644 --- a/matlab/mex/astra_mex_matrix_c.cpp +++ b/matlab/mex/astra_mex_matrix_c.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/matlab/mex/astra_mex_projector3d_c.cpp b/matlab/mex/astra_mex_projector3d_c.cpp index 1385863..7dc2f9a 100644 --- a/matlab/mex/astra_mex_projector3d_c.cpp +++ b/matlab/mex/astra_mex_projector3d_c.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/matlab/mex/astra_mex_projector_c.cpp b/matlab/mex/astra_mex_projector_c.cpp index 5cbe502..9dfd2d0 100644 --- a/matlab/mex/astra_mex_projector_c.cpp +++ b/matlab/mex/astra_mex_projector_c.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/matlab/mex/mexHelpFunctions.cpp b/matlab/mex/mexHelpFunctions.cpp index 4105ee1..eacb209 100644 --- a/matlab/mex/mexHelpFunctions.cpp +++ b/matlab/mex/mexHelpFunctions.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/matlab/tools/astra_add_noise_to_sino.m b/matlab/tools/astra_add_noise_to_sino.m index a262f49..6ced65b 100644 --- a/matlab/tools/astra_add_noise_to_sino.m +++ b/matlab/tools/astra_add_noise_to_sino.m @@ -12,15 +12,15 @@ function sinogram_out = astra_add_noise_to_sino(sinogram_in,I0) % noise % sinogram_out: output sinogram in MATLAB-data. %-------------------------------------------------------------------------- -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- % $Id$ if numel(sinogram_in) == 1 diff --git a/matlab/tools/astra_clear.m b/matlab/tools/astra_clear.m index bc5f190..e558161 100644 --- a/matlab/tools/astra_clear.m +++ b/matlab/tools/astra_clear.m @@ -2,15 +2,15 @@ % Clears and frees memory of all objects (data, projectors, algorithms) % currently in the astra-library. %-------------------------------------------------------------------------- -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- % $Id$ astra_mex_data2d('clear'); diff --git a/matlab/tools/astra_create_backprojection.m b/matlab/tools/astra_create_backprojection.m index 7f0b02f..a6d6e1c 100644 --- a/matlab/tools/astra_create_backprojection.m +++ b/matlab/tools/astra_create_backprojection.m @@ -10,15 +10,15 @@ function [vol_id, vol] = astra_create_backprojection(data, proj_id) % vol_id: identifier of the volume data object as it is now stored in the astra-library. % vol: MATLAB data version of the volume %-------------------------------------------------------------------------- -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- % $Id$ diff --git a/matlab/tools/astra_create_backprojection3d_cuda.m b/matlab/tools/astra_create_backprojection3d_cuda.m index afa41db..3b1663d 100644 --- a/matlab/tools/astra_create_backprojection3d_cuda.m +++ b/matlab/tools/astra_create_backprojection3d_cuda.m @@ -12,15 +12,15 @@ function [vol_id, vol] = astra_create_backprojection3d_cuda(data, proj_geom, vol % the astra-library. % vol: MATLAB data version of the volume. %-------------------------------------------------------------------------- -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- % $Id$ diff --git a/matlab/tools/astra_create_backprojection_cuda.m b/matlab/tools/astra_create_backprojection_cuda.m index cef7864..4c39f13 100644 --- a/matlab/tools/astra_create_backprojection_cuda.m +++ b/matlab/tools/astra_create_backprojection_cuda.m @@ -11,15 +11,15 @@ function backProj = astra_create_backprojection_cuda(sinogramData, proj_geom, vo % the reconstruction image % backProj: 2D back projection from sinogram data %-------------------------------------------------------------------------- - %------------------------------------------------------------------------ - % This file is part of the - % All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") - % - % Copyright: iMinds-Vision Lab, University of Antwerp + %-------------------------------------------------------------------------- + % This file is part of the ASTRA Toolbox + % + % Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + % 2014, CWI, Amsterdam % License: Open Source under GPLv3 - % Contact: mailto:astra@ua.ac.be - % Website: http://astra.ua.ac.be - %------------------------------------------------------------------------ + % Contact: astra@uantwerpen.be + % Website: http://sf.net/projects/astra-toolbox + %-------------------------------------------------------------------------- % $Id$ recon_id = astra_mex_data2d('create', '-vol', vol_geom, 0); diff --git a/matlab/tools/astra_create_proj_geom.m b/matlab/tools/astra_create_proj_geom.m index dbf0464..a389573 100644 --- a/matlab/tools/astra_create_proj_geom.m +++ b/matlab/tools/astra_create_proj_geom.m @@ -84,15 +84,15 @@ function proj_geom = astra_create_proj_geom(type, varargin) % v : the vector from detector pixel (0,0) to (1,0) % proj_geom: MATLAB struct containing all information of the geometry %-------------------------------------------------------------------------- -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- % $Id$ diff --git a/matlab/tools/astra_create_projector.m b/matlab/tools/astra_create_projector.m index f773d0d..e930450 100644 --- a/matlab/tools/astra_create_projector.m +++ b/matlab/tools/astra_create_projector.m @@ -11,15 +11,15 @@ function proj_id = astra_create_projector(type, proj_geom, vol_geom) % vol_geom: MATLAB struct containing the volume geometry. % proj_id: identifier of the projector as it is now stored in the astra-library. %-------------------------------------------------------------------------- -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +% ------------------------------------------------------------------------- % $Id$ diff --git a/matlab/tools/astra_create_reconstruction.m b/matlab/tools/astra_create_reconstruction.m index 15e452c..1e25fc9 100644 --- a/matlab/tools/astra_create_reconstruction.m +++ b/matlab/tools/astra_create_reconstruction.m @@ -18,15 +18,15 @@ function [recon_id, recon] = astra_create_reconstruction(rec_type, proj_id, sino % recon_id: identifier of the reconstruction data object as it is now stored in the astra-library % recon: MATLAB data version of the reconstruction %-------------------------------------------------------------------------- -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- % $Id$ diff --git a/matlab/tools/astra_create_reconstruction_cuda.m b/matlab/tools/astra_create_reconstruction_cuda.m index 726aa98..ffd3ede 100644 --- a/matlab/tools/astra_create_reconstruction_cuda.m +++ b/matlab/tools/astra_create_reconstruction_cuda.m @@ -19,15 +19,15 @@ function [recon_id, recon] = astra_create_reconstruction_cuda(rec_type, proj_geo % recon_id: identifier of the reconstruction data object as it is now stored in the astra-library % recon: MATLAB data version of the reconstruction %-------------------------------------------------------------------------- -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- % $Id$ diff --git a/matlab/tools/astra_create_sino.m b/matlab/tools/astra_create_sino.m index 4771bd6..a51f0e4 100644 --- a/matlab/tools/astra_create_sino.m +++ b/matlab/tools/astra_create_sino.m @@ -10,15 +10,15 @@ function [sino_id, sino] = astra_create_sino(data, proj_id) % sino_id: identifier of the sinogram data object as it is now stored in the astra-library. % sino: MATLAB data version of the sinogram %-------------------------------------------------------------------------- -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- % $Id$ diff --git a/matlab/tools/astra_create_sino3d_cuda.m b/matlab/tools/astra_create_sino3d_cuda.m index a725d82..54ca58d 100644 --- a/matlab/tools/astra_create_sino3d_cuda.m +++ b/matlab/tools/astra_create_sino3d_cuda.m @@ -12,15 +12,15 @@ function [sino_id, sino] = astra_create_sino3d_cuda(data, proj_geom, vol_geom) % the astra-library. % sino: MATLAB data version of the sinogram. %-------------------------------------------------------------------------- -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- % $Id$ diff --git a/matlab/tools/astra_create_sino_cuda.m b/matlab/tools/astra_create_sino_cuda.m index 82bda7c..a2e7f53 100644 --- a/matlab/tools/astra_create_sino_cuda.m +++ b/matlab/tools/astra_create_sino_cuda.m @@ -13,15 +13,15 @@ function [sino_id, sino] = astra_create_sino_cuda(data, proj_geom, vol_geom, gpu % the astra-library. % sino: MATLAB data version of the sinogram. %-------------------------------------------------------------------------- -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- % $Id$ diff --git a/matlab/tools/astra_create_sino_gpu.m b/matlab/tools/astra_create_sino_gpu.m index 95a3b09..75a47f7 100644 --- a/matlab/tools/astra_create_sino_gpu.m +++ b/matlab/tools/astra_create_sino_gpu.m @@ -13,15 +13,15 @@ function [sino_id, sino] = astra_create_sino_gpu(data, proj_geom, vol_geom, gpu_ % the astra-library. % sino: MATLAB data version of the sinogram. %-------------------------------------------------------------------------- -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- % $Id$ diff --git a/matlab/tools/astra_create_sino_sampling.m b/matlab/tools/astra_create_sino_sampling.m index 6b86d61..0b33994 100644 --- a/matlab/tools/astra_create_sino_sampling.m +++ b/matlab/tools/astra_create_sino_sampling.m @@ -13,15 +13,15 @@ function [sino_id, sino] = astra_create_sino_sampling(data, proj_geom, vol_geom, % the astra-library. % sino: MATLAB data version of the sinogram. %-------------------------------------------------------------------------- -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- % $Id$ diff --git a/matlab/tools/astra_create_vol_geom.m b/matlab/tools/astra_create_vol_geom.m index 61db8fb..0de5168 100644 --- a/matlab/tools/astra_create_vol_geom.m +++ b/matlab/tools/astra_create_vol_geom.m @@ -22,15 +22,15 @@ function vol_geom = astra_create_vol_geom(varargin) % slice_count: number of slices. % vol_geom: MATLAB struct containing all information of the geometry. %-------------------------------------------------------------------------- -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- % $Id$ % astra_create_vol_geom([row_and_col_count ]) diff --git a/matlab/tools/astra_downsample_sinogram.m b/matlab/tools/astra_downsample_sinogram.m index 30c1cdd..805fcc2 100644 --- a/matlab/tools/astra_downsample_sinogram.m +++ b/matlab/tools/astra_downsample_sinogram.m @@ -13,13 +13,13 @@ function [sinogram_new, proj_geom_new] = astra_downsample_sinogram(sinogram, pro % proj_geom_new: MATLAB struct containing the new projection geometry. %------------------------------------------------------------------------ %------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox %------------------------------------------------------------------------ % $Id$ diff --git a/matlab/tools/astra_mex.m b/matlab/tools/astra_mex.m index e04cfea..c1f8bf8 100644 --- a/matlab/tools/astra_mex.m +++ b/matlab/tools/astra_mex.m @@ -4,13 +4,13 @@ function [varargout] = astra_mex(varargin) % astra_mex. %------------------------------------------------------------------------ %------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox %------------------------------------------------------------------------ % $Id$ if nargout == 0 diff --git a/matlab/tools/astra_mex_algorithm.m b/matlab/tools/astra_mex_algorithm.m index 138a43c..901e90c 100644 --- a/matlab/tools/astra_mex_algorithm.m +++ b/matlab/tools/astra_mex_algorithm.m @@ -4,13 +4,13 @@ function [varargout] = astra_mex_algorithm(varargin) % astra_mex_algorithm. %------------------------------------------------------------------------ %------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox %------------------------------------------------------------------------ % $Id$ if nargout == 0 diff --git a/matlab/tools/astra_mex_data2d.m b/matlab/tools/astra_mex_data2d.m index eacbcb9..542d7c6 100644 --- a/matlab/tools/astra_mex_data2d.m +++ b/matlab/tools/astra_mex_data2d.m @@ -4,13 +4,13 @@ function [varargout] = astra_mex_data2d(varargin) % astra_mex_data2d. %------------------------------------------------------------------------ %------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox %------------------------------------------------------------------------ % $Id$ if nargout == 0 diff --git a/matlab/tools/astra_mex_data3d.m b/matlab/tools/astra_mex_data3d.m index 3bbbd68..66e507a 100644 --- a/matlab/tools/astra_mex_data3d.m +++ b/matlab/tools/astra_mex_data3d.m @@ -4,13 +4,13 @@ function [varargout] = astra_mex_data3d(varargin) % astra_mex_data3d. %------------------------------------------------------------------------ %------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox %------------------------------------------------------------------------ % $Id$ if nargout == 0 diff --git a/matlab/tools/astra_mex_matrix.m b/matlab/tools/astra_mex_matrix.m index 182ab1e..35e266e 100644 --- a/matlab/tools/astra_mex_matrix.m +++ b/matlab/tools/astra_mex_matrix.m @@ -4,13 +4,13 @@ function [varargout] = astra_mex_matrix(varargin) % astra_mex_matrix. %------------------------------------------------------------------------ %------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox %------------------------------------------------------------------------ % $Id$ if nargout == 0 diff --git a/matlab/tools/astra_mex_projector.m b/matlab/tools/astra_mex_projector.m index 487da06..08f9e54 100644 --- a/matlab/tools/astra_mex_projector.m +++ b/matlab/tools/astra_mex_projector.m @@ -4,13 +4,13 @@ function [varargout] = astra_mex_projector(varargin) % astra_mex_projector. %------------------------------------------------------------------------ %------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox %------------------------------------------------------------------------ % $Id$ if nargout == 0 diff --git a/matlab/tools/astra_mex_projector3d.m b/matlab/tools/astra_mex_projector3d.m index 3d21ce9..f72abe2 100644 --- a/matlab/tools/astra_mex_projector3d.m +++ b/matlab/tools/astra_mex_projector3d.m @@ -4,13 +4,13 @@ function [varargout] = astra_mex_projector3d(varargin) % astra_mex_projector3d. %------------------------------------------------------------------------ %------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox %------------------------------------------------------------------------ % $Id$ if nargout == 0 diff --git a/matlab/tools/astra_projector_handle.m b/matlab/tools/astra_projector_handle.m index 72d4c73..2d1eba2 100644 --- a/matlab/tools/astra_projector_handle.m +++ b/matlab/tools/astra_projector_handle.m @@ -3,13 +3,13 @@ classdef astra_projector_handle < handle % Automatically deletes the projector when deleted. %------------------------------------------------------------------------ - % This file is part of the - % All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") - % - % Copyright: iMinds-Vision Lab, University of Antwerp + % This file is part of the ASTRA Toolbox + % + % Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + % 2014, CWI, Amsterdam % License: Open Source under GPLv3 - % Contact: mailto:astra@ua.ac.be - % Website: http://astra.ua.ac.be + % Contact: astra@uantwerpen.be + % Website: http://sf.net/projects/astra-toolbox %------------------------------------------------------------------------ properties diff --git a/matlab/tools/astra_set_directory.m b/matlab/tools/astra_set_directory.m index 1d5a368..6018bad 100644 --- a/matlab/tools/astra_set_directory.m +++ b/matlab/tools/astra_set_directory.m @@ -9,13 +9,13 @@ function in = astra_set_directory(in) % in: input path. %------------------------------------------------------------------------ %------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox %------------------------------------------------------------------------ % $Id$ diff --git a/matlab/tools/astra_set_gpu_index.m b/matlab/tools/astra_set_gpu_index.m index 192ba00..fb2b64b 100644 --- a/matlab/tools/astra_set_gpu_index.m +++ b/matlab/tools/astra_set_gpu_index.m @@ -3,15 +3,15 @@ function astra_set_gpu_index(index) %-------------------------------------------------------------------------- % Set the index of the GPU to use %-------------------------------------------------------------------------- -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- % $Id$ astra_mex('set_gpu_index', index); diff --git a/matlab/tools/astra_struct.m b/matlab/tools/astra_struct.m index f65b2ec..f7da5fe 100644 --- a/matlab/tools/astra_struct.m +++ b/matlab/tools/astra_struct.m @@ -9,13 +9,13 @@ function res = astra_struct(type) % res: the generated matlab struct. %------------------------------------------------------------------------ %------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox %------------------------------------------------------------------------ % $Id$ res = struct(); diff --git a/matlab/tools/createOrderART.m b/matlab/tools/createOrderART.m index a469d8a..95d8fae 100644 --- a/matlab/tools/createOrderART.m +++ b/matlab/tools/createOrderART.m @@ -14,13 +14,13 @@ function rayOrder = createOrderART(proj_geom, mode) % the index of the ray. %------------------------------------------------------------------------ %------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox %------------------------------------------------------------------------ % $Id$ diff --git a/matlab/tools/imreadgs.m b/matlab/tools/imreadgs.m index 9c27eb4..c9d60f9 100644 --- a/matlab/tools/imreadgs.m +++ b/matlab/tools/imreadgs.m @@ -10,13 +10,13 @@ function Im = imreadgs(filename) % Im: a grayscale image in double. %------------------------------------------------------------------------ %------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox %------------------------------------------------------------------------ % $Id$ diff --git a/matlab/tools/imresize3D.m b/matlab/tools/imresize3D.m index 9032cc3..42d50b0 100644 --- a/matlab/tools/imresize3D.m +++ b/matlab/tools/imresize3D.m @@ -10,13 +10,13 @@ function out = imresize3D(in, s_out, method) % out: the resized 3-component image. %------------------------------------------------------------------------ %------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox %------------------------------------------------------------------------ % $Id$ diff --git a/matlab/tools/imscale.m b/matlab/tools/imscale.m index 957f11f..ddaa457 100644 --- a/matlab/tools/imscale.m +++ b/matlab/tools/imscale.m @@ -9,13 +9,13 @@ function out = imscale(in) % out: scaled output image. %------------------------------------------------------------------------ %------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox %------------------------------------------------------------------------ % $Id$ diff --git a/matlab/tools/imwritesc.m b/matlab/tools/imwritesc.m index 2f81dc8..fa059d6 100644 --- a/matlab/tools/imwritesc.m +++ b/matlab/tools/imwritesc.m @@ -9,13 +9,13 @@ function imwritesc(in, filename) % filename: name of output image file. %------------------------------------------------------------------------ %------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox %------------------------------------------------------------------------ % $Id$ diff --git a/matlab/tools/kaiserBessel.m b/matlab/tools/kaiserBessel.m index aef7b9d..808a5ac 100644 --- a/matlab/tools/kaiserBessel.m +++ b/matlab/tools/kaiserBessel.m @@ -12,13 +12,13 @@ function res = kaiserBessel(m,alpha,a,r) % res: the window values. %------------------------------------------------------------------------ %------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox %------------------------------------------------------------------------ % $Id$ diff --git a/matlab/tools/linspace2.m b/matlab/tools/linspace2.m index 2787fd9..422f03a 100644 --- a/matlab/tools/linspace2.m +++ b/matlab/tools/linspace2.m @@ -11,13 +11,13 @@ function out = linspace2(a,b,c) % out: linearly spaced vector. %------------------------------------------------------------------------ %------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox %------------------------------------------------------------------------ % $Id$ diff --git a/matlab/tools/overlayImage.m b/matlab/tools/overlayImage.m index 7c81e55..b4f24ce 100644 --- a/matlab/tools/overlayImage.m +++ b/matlab/tools/overlayImage.m @@ -9,13 +9,13 @@ function im = overlayImage(reconstruction, ground_truth) % im: output 3-component image, third channel is 0. %------------------------------------------------------------------------ %------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox %------------------------------------------------------------------------ % $Id$ diff --git a/matlab/tools/rebin_fan2par.m b/matlab/tools/rebin_fan2par.m index da20932..e0c713d 100644 --- a/matlab/tools/rebin_fan2par.m +++ b/matlab/tools/rebin_fan2par.m @@ -17,13 +17,13 @@ function F = rebin_fan2par(RadonData, BetaDeg, D, thetaDeg) % D,gamma,beta, theta zoals gebruikt in Kak & Slaney %------------------------------------------------------------------------ %------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox %------------------------------------------------------------------------ % $Id$ diff --git a/matlab/tools/sliceExtractor.m b/matlab/tools/sliceExtractor.m index dfc87ee..c612152 100644 --- a/matlab/tools/sliceExtractor.m +++ b/matlab/tools/sliceExtractor.m @@ -11,13 +11,13 @@ function slice = sliceExtractor(data, dir, slicenr) % slice: 2D image matrix containing the slice. %------------------------------------------------------------------------ %------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox %------------------------------------------------------------------------ % $Id$ diff --git a/samples/s001_sinogram_par2d.m b/samples/s001_sinogram_par2d.m index 9f50c14..e6d8da1 100644 --- a/samples/s001_sinogram_par2d.m +++ b/samples/s001_sinogram_par2d.m @@ -1,12 +1,12 @@ -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% ----------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +% ----------------------------------------------------------------------- % Create a basic 256x256 square volume geometry vol_geom = astra_create_vol_geom(256, 256); diff --git a/samples/s002_data2d.m b/samples/s002_data2d.m index 37b5549..4259794 100644 --- a/samples/s002_data2d.m +++ b/samples/s002_data2d.m @@ -1,12 +1,12 @@ -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% ----------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +% ----------------------------------------------------------------------- vol_geom = astra_create_vol_geom(256, 256); diff --git a/samples/s003_gpu_reconstruction.m b/samples/s003_gpu_reconstruction.m index 749f91a..41bb9b9 100644 --- a/samples/s003_gpu_reconstruction.m +++ b/samples/s003_gpu_reconstruction.m @@ -1,12 +1,12 @@ -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% ----------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +% ----------------------------------------------------------------------- vol_geom = astra_create_vol_geom(256, 256); proj_geom = astra_create_proj_geom('parallel', 1.0, 384, linspace2(0,pi,180)); diff --git a/samples/s004_cpu_reconstruction.m b/samples/s004_cpu_reconstruction.m index 69414e2..24d7ad2 100644 --- a/samples/s004_cpu_reconstruction.m +++ b/samples/s004_cpu_reconstruction.m @@ -1,12 +1,12 @@ -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% ----------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +% ----------------------------------------------------------------------- vol_geom = astra_create_vol_geom(256, 256); proj_geom = astra_create_proj_geom('parallel', 1.0, 384, linspace2(0,pi,180)); diff --git a/samples/s005_3d_geometry.m b/samples/s005_3d_geometry.m index fa959c9..63cb683 100644 --- a/samples/s005_3d_geometry.m +++ b/samples/s005_3d_geometry.m @@ -1,12 +1,12 @@ -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% ----------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +% ----------------------------------------------------------------------- vol_geom = astra_create_vol_geom(64, 64, 64); diff --git a/samples/s006_3d_data.m b/samples/s006_3d_data.m index b836198..7b74460 100644 --- a/samples/s006_3d_data.m +++ b/samples/s006_3d_data.m @@ -1,12 +1,12 @@ -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% ----------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +% ----------------------------------------------------------------------- % Create a 3D volume geometry. % Parameter order: rows, colums, slices (y, x, z) diff --git a/samples/s007_3d_reconstruction.m b/samples/s007_3d_reconstruction.m index 1bc9da3..3ca8da8 100644 --- a/samples/s007_3d_reconstruction.m +++ b/samples/s007_3d_reconstruction.m @@ -1,12 +1,12 @@ -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% ----------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +% ----------------------------------------------------------------------- vol_geom = astra_create_vol_geom(128, 128, 128); diff --git a/samples/s008_gpu_selection.m b/samples/s008_gpu_selection.m index 252ba0c..4ea4ba6 100644 --- a/samples/s008_gpu_selection.m +++ b/samples/s008_gpu_selection.m @@ -1,12 +1,12 @@ -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% ----------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +% ----------------------------------------------------------------------- vol_geom = astra_create_vol_geom(256, 256); proj_geom = astra_create_proj_geom('parallel', 1.0, 384, linspace2(0,pi,180)); diff --git a/samples/s009_projection_matrix.m b/samples/s009_projection_matrix.m index c0df79e..a1b0036 100644 --- a/samples/s009_projection_matrix.m +++ b/samples/s009_projection_matrix.m @@ -1,12 +1,12 @@ -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% ----------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +% ----------------------------------------------------------------------- vol_geom = astra_create_vol_geom(256, 256); proj_geom = astra_create_proj_geom('parallel', 1.0, 384, linspace2(0,pi,180)); diff --git a/samples/s010_supersampling.m b/samples/s010_supersampling.m index 4436625..0275bd6 100644 --- a/samples/s010_supersampling.m +++ b/samples/s010_supersampling.m @@ -1,12 +1,12 @@ -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% ----------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +% ----------------------------------------------------------------------- vol_geom = astra_create_vol_geom(256, 256); proj_geom = astra_create_proj_geom('parallel', 3.0, 128, linspace2(0,pi,180)); diff --git a/samples/s011_object_info.m b/samples/s011_object_info.m index a3725f3..e68e8ba 100644 --- a/samples/s011_object_info.m +++ b/samples/s011_object_info.m @@ -1,12 +1,12 @@ -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% ----------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +% ----------------------------------------------------------------------- % Create two volume geometries vol_geom1 = astra_create_vol_geom(256, 256); diff --git a/samples/s012_masks.m b/samples/s012_masks.m index b7b8df6..212743a 100644 --- a/samples/s012_masks.m +++ b/samples/s012_masks.m @@ -1,12 +1,12 @@ -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% ----------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +% ----------------------------------------------------------------------- % In this example we will create a reconstruction in a circular region, diff --git a/samples/s013_constraints.m b/samples/s013_constraints.m index 9cb9612..988cf97 100644 --- a/samples/s013_constraints.m +++ b/samples/s013_constraints.m @@ -1,12 +1,12 @@ -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% ----------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +% ----------------------------------------------------------------------- % In this example we will create a reconstruction constrained to % greyvalues between 0 and 1 diff --git a/samples/s014_FBP.m b/samples/s014_FBP.m index 7cce28f..1e1a2cb 100644 --- a/samples/s014_FBP.m +++ b/samples/s014_FBP.m @@ -1,12 +1,12 @@ -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% ----------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +% ----------------------------------------------------------------------- vol_geom = astra_create_vol_geom(256, 256); proj_geom = astra_create_proj_geom('parallel', 1.0, 384, linspace2(0,pi,180)); diff --git a/samples/s015_fp_bp.m b/samples/s015_fp_bp.m index 815f478..131b7e0 100644 --- a/samples/s015_fp_bp.m +++ b/samples/s015_fp_bp.m @@ -1,12 +1,12 @@ -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% ----------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +% ----------------------------------------------------------------------- % This example demonstrates using the FP and BP primitives with Matlab's lsqr diff --git a/samples/s016_plots.m b/samples/s016_plots.m index 1eeca58..0baa82a 100644 --- a/samples/s016_plots.m +++ b/samples/s016_plots.m @@ -1,12 +1,12 @@ -%------------------------------------------------------------------------ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp +% ----------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -%------------------------------------------------------------------------ +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +% ----------------------------------------------------------------------- vol_geom = astra_create_vol_geom(256, 256); proj_geom = astra_create_proj_geom('parallel', 1.0, 384, linspace2(0,pi,180)); diff --git a/src/Algorithm.cpp b/src/Algorithm.cpp index 38ae65d..8997dbf 100644 --- a/src/Algorithm.cpp +++ b/src/Algorithm.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/ArtAlgorithm.cpp b/src/ArtAlgorithm.cpp index 77ab5ab..27392fe 100644 --- a/src/ArtAlgorithm.cpp +++ b/src/ArtAlgorithm.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/AstraObjectFactory.cpp b/src/AstraObjectFactory.cpp index 195c431..bc068c2 100644 --- a/src/AstraObjectFactory.cpp +++ b/src/AstraObjectFactory.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/AstraObjectManager.cpp b/src/AstraObjectManager.cpp index 597119d..a4fdeb7 100644 --- a/src/AstraObjectManager.cpp +++ b/src/AstraObjectManager.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/AsyncAlgorithm.cpp b/src/AsyncAlgorithm.cpp index 431dbbc..ea02138 100644 --- a/src/AsyncAlgorithm.cpp +++ b/src/AsyncAlgorithm.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/BackProjectionAlgorithm.cpp b/src/BackProjectionAlgorithm.cpp index cf8c9ca..f2f267c 100644 --- a/src/BackProjectionAlgorithm.cpp +++ b/src/BackProjectionAlgorithm.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/CglsAlgorithm.cpp b/src/CglsAlgorithm.cpp index f3e1be1..855f789 100644 --- a/src/CglsAlgorithm.cpp +++ b/src/CglsAlgorithm.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/ConeProjectionGeometry3D.cpp b/src/ConeProjectionGeometry3D.cpp index 129e675..f6c628f 100644 --- a/src/ConeProjectionGeometry3D.cpp +++ b/src/ConeProjectionGeometry3D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/ConeVecProjectionGeometry3D.cpp b/src/ConeVecProjectionGeometry3D.cpp index 875a2c7..d58a5ce 100644 --- a/src/ConeVecProjectionGeometry3D.cpp +++ b/src/ConeVecProjectionGeometry3D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/Config.cpp b/src/Config.cpp index 8c5cbf5..ab505c3 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/ConvexHullAlgorithm.cpp b/src/ConvexHullAlgorithm.cpp index e769420..fa69431 100644 --- a/src/ConvexHullAlgorithm.cpp +++ b/src/ConvexHullAlgorithm.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/CudaBackProjectionAlgorithm.cpp b/src/CudaBackProjectionAlgorithm.cpp index 7d597b8..0265238 100644 --- a/src/CudaBackProjectionAlgorithm.cpp +++ b/src/CudaBackProjectionAlgorithm.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/CudaBackProjectionAlgorithm3D.cpp b/src/CudaBackProjectionAlgorithm3D.cpp index 891d7fe..2df7ec0 100644 --- a/src/CudaBackProjectionAlgorithm3D.cpp +++ b/src/CudaBackProjectionAlgorithm3D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/CudaCglsAlgorithm.cpp b/src/CudaCglsAlgorithm.cpp index c408638..3357a9d 100644 --- a/src/CudaCglsAlgorithm.cpp +++ b/src/CudaCglsAlgorithm.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/CudaCglsAlgorithm3D.cpp b/src/CudaCglsAlgorithm3D.cpp index 1b505ed..f356be8 100644 --- a/src/CudaCglsAlgorithm3D.cpp +++ b/src/CudaCglsAlgorithm3D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/CudaDartMaskAlgorithm.cpp b/src/CudaDartMaskAlgorithm.cpp index 911e448..60e0ec2 100644 --- a/src/CudaDartMaskAlgorithm.cpp +++ b/src/CudaDartMaskAlgorithm.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/CudaDartMaskAlgorithm3D.cpp b/src/CudaDartMaskAlgorithm3D.cpp index f5d5d82..f540602 100644 --- a/src/CudaDartMaskAlgorithm3D.cpp +++ b/src/CudaDartMaskAlgorithm3D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/CudaDartSmoothingAlgorithm.cpp b/src/CudaDartSmoothingAlgorithm.cpp index e77606b..0f450c0 100644 --- a/src/CudaDartSmoothingAlgorithm.cpp +++ b/src/CudaDartSmoothingAlgorithm.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/CudaDartSmoothingAlgorithm3D.cpp b/src/CudaDartSmoothingAlgorithm3D.cpp index e44970f..d4b49b1 100644 --- a/src/CudaDartSmoothingAlgorithm3D.cpp +++ b/src/CudaDartSmoothingAlgorithm3D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/CudaDataOperationAlgorithm.cpp b/src/CudaDataOperationAlgorithm.cpp index dcb6c3c..aeb3f7a 100644 --- a/src/CudaDataOperationAlgorithm.cpp +++ b/src/CudaDataOperationAlgorithm.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/CudaEMAlgorithm.cpp b/src/CudaEMAlgorithm.cpp index 44dd0fd..8feae52 100644 --- a/src/CudaEMAlgorithm.cpp +++ b/src/CudaEMAlgorithm.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/CudaFDKAlgorithm3D.cpp b/src/CudaFDKAlgorithm3D.cpp index 6b65641..8535319 100644 --- a/src/CudaFDKAlgorithm3D.cpp +++ b/src/CudaFDKAlgorithm3D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/CudaFilteredBackProjectionAlgorithm.cpp b/src/CudaFilteredBackProjectionAlgorithm.cpp index 39740c8..a6e7aa4 100644 --- a/src/CudaFilteredBackProjectionAlgorithm.cpp +++ b/src/CudaFilteredBackProjectionAlgorithm.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/CudaForwardProjectionAlgorithm.cpp b/src/CudaForwardProjectionAlgorithm.cpp index bd9cffb..5fdc220 100644 --- a/src/CudaForwardProjectionAlgorithm.cpp +++ b/src/CudaForwardProjectionAlgorithm.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/CudaForwardProjectionAlgorithm3D.cpp b/src/CudaForwardProjectionAlgorithm3D.cpp index f64620f..53e9c86 100644 --- a/src/CudaForwardProjectionAlgorithm3D.cpp +++ b/src/CudaForwardProjectionAlgorithm3D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/CudaProjector2D.cpp b/src/CudaProjector2D.cpp index 731a3e1..a324c0a 100644 --- a/src/CudaProjector2D.cpp +++ b/src/CudaProjector2D.cpp @@ -1,14 +1,31 @@ /* ----------------------------------------------------------------------- -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam + +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox + +This file is part of the ASTRA Toolbox. + + +The ASTRA Toolbox is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +The ASTRA Toolbox is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with the ASTRA Toolbox. If not, see . -Copyright: IBBT-Vision Lab, University of Antwerp -Contact: mailto:wim.vanaarle@ua.ac.be -Website: http://astra.ua.ac.be ----------------------------------------------------------------------- $Id$ */ + #include "astra/CudaProjector2D.h" diff --git a/src/CudaProjector3D.cpp b/src/CudaProjector3D.cpp index 4687825..fe0e7a0 100644 --- a/src/CudaProjector3D.cpp +++ b/src/CudaProjector3D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/CudaReconstructionAlgorithm2D.cpp b/src/CudaReconstructionAlgorithm2D.cpp index 0443303..e458ca8 100644 --- a/src/CudaReconstructionAlgorithm2D.cpp +++ b/src/CudaReconstructionAlgorithm2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/CudaRoiSelectAlgorithm.cpp b/src/CudaRoiSelectAlgorithm.cpp index bbe2235..5fc4a33 100644 --- a/src/CudaRoiSelectAlgorithm.cpp +++ b/src/CudaRoiSelectAlgorithm.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/CudaSartAlgorithm.cpp b/src/CudaSartAlgorithm.cpp index 610793f..1b62b45 100644 --- a/src/CudaSartAlgorithm.cpp +++ b/src/CudaSartAlgorithm.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/CudaSirtAlgorithm.cpp b/src/CudaSirtAlgorithm.cpp index a2a30eb..47fb13c 100644 --- a/src/CudaSirtAlgorithm.cpp +++ b/src/CudaSirtAlgorithm.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/CudaSirtAlgorithm3D.cpp b/src/CudaSirtAlgorithm3D.cpp index 80b8bcb..d50194c 100644 --- a/src/CudaSirtAlgorithm3D.cpp +++ b/src/CudaSirtAlgorithm3D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/DataProjector.cpp b/src/DataProjector.cpp index d4b2f84..dcc8b2b 100644 --- a/src/DataProjector.cpp +++ b/src/DataProjector.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/DataProjectorPolicies.cpp b/src/DataProjectorPolicies.cpp index 2535706..e403188 100644 --- a/src/DataProjectorPolicies.cpp +++ b/src/DataProjectorPolicies.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/FanFlatBeamLineKernelProjector2D.cpp b/src/FanFlatBeamLineKernelProjector2D.cpp index 0891801..6f14955 100644 --- a/src/FanFlatBeamLineKernelProjector2D.cpp +++ b/src/FanFlatBeamLineKernelProjector2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/FanFlatBeamStripKernelProjector2D.cpp b/src/FanFlatBeamStripKernelProjector2D.cpp index 87ae8d6..a7bce84 100644 --- a/src/FanFlatBeamStripKernelProjector2D.cpp +++ b/src/FanFlatBeamStripKernelProjector2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/FanFlatProjectionGeometry2D.cpp b/src/FanFlatProjectionGeometry2D.cpp index b74536a..ea297e3 100644 --- a/src/FanFlatProjectionGeometry2D.cpp +++ b/src/FanFlatProjectionGeometry2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/FanFlatVecProjectionGeometry2D.cpp b/src/FanFlatVecProjectionGeometry2D.cpp index e42a4f1..c6805fd 100644 --- a/src/FanFlatVecProjectionGeometry2D.cpp +++ b/src/FanFlatVecProjectionGeometry2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/FilteredBackProjectionAlgorithm.cpp b/src/FilteredBackProjectionAlgorithm.cpp index 8063f7b..b99930a 100644 --- a/src/FilteredBackProjectionAlgorithm.cpp +++ b/src/FilteredBackProjectionAlgorithm.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/Float32Data.cpp b/src/Float32Data.cpp index 47bbcc9..fc5dda9 100644 --- a/src/Float32Data.cpp +++ b/src/Float32Data.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/Float32Data2D.cpp b/src/Float32Data2D.cpp index e2d7ef3..ed01124 100644 --- a/src/Float32Data2D.cpp +++ b/src/Float32Data2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/Float32Data3D.cpp b/src/Float32Data3D.cpp index 57c72ed..c581cea 100644 --- a/src/Float32Data3D.cpp +++ b/src/Float32Data3D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/Float32Data3DMemory.cpp b/src/Float32Data3DMemory.cpp index 7b79d03..fca79ea 100644 --- a/src/Float32Data3DMemory.cpp +++ b/src/Float32Data3DMemory.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/Float32ProjectionData2D.cpp b/src/Float32ProjectionData2D.cpp index a74fc14..0afd0ce 100644 --- a/src/Float32ProjectionData2D.cpp +++ b/src/Float32ProjectionData2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/Float32ProjectionData3D.cpp b/src/Float32ProjectionData3D.cpp index 66bb5e3..641a206 100644 --- a/src/Float32ProjectionData3D.cpp +++ b/src/Float32ProjectionData3D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/Float32ProjectionData3DMemory.cpp b/src/Float32ProjectionData3DMemory.cpp index 6d89f95..749dd0d 100644 --- a/src/Float32ProjectionData3DMemory.cpp +++ b/src/Float32ProjectionData3DMemory.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/Float32VolumeData2D.cpp b/src/Float32VolumeData2D.cpp index f07fd71..ce21875 100644 --- a/src/Float32VolumeData2D.cpp +++ b/src/Float32VolumeData2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/Float32VolumeData3D.cpp b/src/Float32VolumeData3D.cpp index d269aa8..a5c2627 100644 --- a/src/Float32VolumeData3D.cpp +++ b/src/Float32VolumeData3D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/Float32VolumeData3DMemory.cpp b/src/Float32VolumeData3DMemory.cpp index 96119f5..dcb824d 100644 --- a/src/Float32VolumeData3DMemory.cpp +++ b/src/Float32VolumeData3DMemory.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/ForwardProjectionAlgorithm.cpp b/src/ForwardProjectionAlgorithm.cpp index 970d5b0..abb0d86 100644 --- a/src/ForwardProjectionAlgorithm.cpp +++ b/src/ForwardProjectionAlgorithm.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/Fourier.cpp b/src/Fourier.cpp index 0f7da28..7d7b2f1 100644 --- a/src/Fourier.cpp +++ b/src/Fourier.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/Globals.cpp b/src/Globals.cpp index 7f93fae..e71b4e4 100644 --- a/src/Globals.cpp +++ b/src/Globals.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/Logger.cpp b/src/Logger.cpp index 28368b2..d927e51 100644 --- a/src/Logger.cpp +++ b/src/Logger.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/ParallelBeamBlobKernelProjector2D.cpp b/src/ParallelBeamBlobKernelProjector2D.cpp index e08f616..8f448a4 100644 --- a/src/ParallelBeamBlobKernelProjector2D.cpp +++ b/src/ParallelBeamBlobKernelProjector2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/ParallelBeamLineKernelProjector2D.cpp b/src/ParallelBeamLineKernelProjector2D.cpp index 16cc614..8b2a8fc 100644 --- a/src/ParallelBeamLineKernelProjector2D.cpp +++ b/src/ParallelBeamLineKernelProjector2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/ParallelBeamLinearKernelProjector2D.cpp b/src/ParallelBeamLinearKernelProjector2D.cpp index 5f1679d..d317e48 100644 --- a/src/ParallelBeamLinearKernelProjector2D.cpp +++ b/src/ParallelBeamLinearKernelProjector2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/ParallelBeamStripKernelProjector2D.cpp b/src/ParallelBeamStripKernelProjector2D.cpp index 78997af..3dafa22 100644 --- a/src/ParallelBeamStripKernelProjector2D.cpp +++ b/src/ParallelBeamStripKernelProjector2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/ParallelProjectionGeometry2D.cpp b/src/ParallelProjectionGeometry2D.cpp index 79a325b..49cc028 100644 --- a/src/ParallelProjectionGeometry2D.cpp +++ b/src/ParallelProjectionGeometry2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/ParallelProjectionGeometry3D.cpp b/src/ParallelProjectionGeometry3D.cpp index c0366bc..ff46ae2 100644 --- a/src/ParallelProjectionGeometry3D.cpp +++ b/src/ParallelProjectionGeometry3D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/ParallelVecProjectionGeometry3D.cpp b/src/ParallelVecProjectionGeometry3D.cpp index c1265dd..4e59932 100644 --- a/src/ParallelVecProjectionGeometry3D.cpp +++ b/src/ParallelVecProjectionGeometry3D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/PlatformDepSystemCode.cpp b/src/PlatformDepSystemCode.cpp index a628aeb..a9614e8 100644 --- a/src/PlatformDepSystemCode.cpp +++ b/src/PlatformDepSystemCode.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/ProjectionGeometry2D.cpp b/src/ProjectionGeometry2D.cpp index 982a1e4..2b823c1 100644 --- a/src/ProjectionGeometry2D.cpp +++ b/src/ProjectionGeometry2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/ProjectionGeometry3D.cpp b/src/ProjectionGeometry3D.cpp index b78b7b8..2cd0dd3 100644 --- a/src/ProjectionGeometry3D.cpp +++ b/src/ProjectionGeometry3D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/Projector2D.cpp b/src/Projector2D.cpp index e67cd0c..da6c47f 100644 --- a/src/Projector2D.cpp +++ b/src/Projector2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/Projector3D.cpp b/src/Projector3D.cpp index f8fddf4..1ab5d09 100644 --- a/src/Projector3D.cpp +++ b/src/Projector3D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/ReconstructionAlgorithm2D.cpp b/src/ReconstructionAlgorithm2D.cpp index 2e7b8c4..01bfc86 100644 --- a/src/ReconstructionAlgorithm2D.cpp +++ b/src/ReconstructionAlgorithm2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/ReconstructionAlgorithm3D.cpp b/src/ReconstructionAlgorithm3D.cpp index 4d9bbc6..d50431c 100644 --- a/src/ReconstructionAlgorithm3D.cpp +++ b/src/ReconstructionAlgorithm3D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/ReconstructionAlgorithmMultiSlice2D.cpp b/src/ReconstructionAlgorithmMultiSlice2D.cpp index 648db61..17a9aaa 100644 --- a/src/ReconstructionAlgorithmMultiSlice2D.cpp +++ b/src/ReconstructionAlgorithmMultiSlice2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/SartAlgorithm.cpp b/src/SartAlgorithm.cpp index d898297..062ca5e 100644 --- a/src/SartAlgorithm.cpp +++ b/src/SartAlgorithm.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/SirtAlgorithm.cpp b/src/SirtAlgorithm.cpp index 60cee8a..101fd34 100644 --- a/src/SirtAlgorithm.cpp +++ b/src/SirtAlgorithm.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/SparseMatrix.cpp b/src/SparseMatrix.cpp index e6d115f..0f2858c 100644 --- a/src/SparseMatrix.cpp +++ b/src/SparseMatrix.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/SparseMatrixProjectionGeometry2D.cpp b/src/SparseMatrixProjectionGeometry2D.cpp index b95bbf4..199b215 100644 --- a/src/SparseMatrixProjectionGeometry2D.cpp +++ b/src/SparseMatrixProjectionGeometry2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/SparseMatrixProjector2D.cpp b/src/SparseMatrixProjector2D.cpp index ba3a46b..f8754f3 100644 --- a/src/SparseMatrixProjector2D.cpp +++ b/src/SparseMatrixProjector2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/Utilities.cpp b/src/Utilities.cpp index 94992a9..c72e8b2 100644 --- a/src/Utilities.cpp +++ b/src/Utilities.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/Vector3D.cpp b/src/Vector3D.cpp index 1e571b1..62175da 100644 --- a/src/Vector3D.cpp +++ b/src/Vector3D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/VolumeGeometry2D.cpp b/src/VolumeGeometry2D.cpp index 01d9b9a..2e5fde5 100644 --- a/src/VolumeGeometry2D.cpp +++ b/src/VolumeGeometry2D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/VolumeGeometry3D.cpp b/src/VolumeGeometry3D.cpp index 86b8642..1744ab9 100644 --- a/src/VolumeGeometry3D.cpp +++ b/src/VolumeGeometry3D.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/XMLDocument.cpp b/src/XMLDocument.cpp index 96d0f80..b0e426d 100644 --- a/src/XMLDocument.cpp +++ b/src/XMLDocument.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/XMLNode.cpp b/src/XMLNode.cpp index e47c3e7..f5d61f6 100644 --- a/src/XMLNode.cpp +++ b/src/XMLNode.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 diff --git a/src/swrap.cpp b/src/swrap.cpp index be8238e..c28de93 100644 --- a/src/swrap.cpp +++ b/src/swrap.cpp @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +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 -- cgit v1.2.3 From be0ba0549d417c8e5821a3d08faa149ddbabf446 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Mon, 24 Nov 2014 15:18:48 +0100 Subject: Avoid mxIsSharedArray Matlab R2014b no longer seems to support it. --- matlab/mex/astra_mex_data3d_c.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/matlab/mex/astra_mex_data3d_c.cpp b/matlab/mex/astra_mex_data3d_c.cpp index fdd801e..35f3480 100644 --- a/matlab/mex/astra_mex_data3d_c.cpp +++ b/matlab/mex/astra_mex_data3d_c.cpp @@ -278,7 +278,10 @@ extern "C" { mxArray *mxCreateSharedDataCopy(const mxArray *pr); bool mxUnshareArray(const mxArray *pr, const bool noDeepCopy); mxArray *mxUnreference(const mxArray *pr); +#if 0 +// Unsupported in Matlab R2014b bool mxIsSharedArray(const mxArray *pr); +#endif } class CFloat32CustomMemoryMatlab3D : public CFloat32CustomMemory { @@ -289,9 +292,12 @@ public: //fprintf(stderr, "Passed:\narray: %p\tdata: %p\n", (void*)_pArray, (void*)mxGetData(_pArray)); // First unshare the input array, so that we may modify it. if (bUnshare) { +#if 0 + // Unsupported in Matlab R2014b if (mxIsSharedArray(_pArray)) { fprintf(stderr, "Performance note: unsharing shared array in link\n"); } +#endif mxUnshareArray(_pArray, false); //fprintf(stderr, "Unshared:\narray: %p\tdata: %p\n", (void*)_pArray, (void*)mxGetData(_pArray)); } -- cgit v1.2.3 From 1341bd26aa9007c3fe91044425ae3a96e8b4854b Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Thu, 2 Oct 2014 15:04:07 +0200 Subject: Prettify nvcc arch output slightly --- build/linux/acinclude.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/linux/acinclude.m4 b/build/linux/acinclude.m4 index b6c1b2d..313e849 100644 --- a/build/linux/acinclude.m4 +++ b/build/linux/acinclude.m4 @@ -93,7 +93,7 @@ for arch in $1; do $NVCC -c -o conftest.o conftest.cu $$2 $NVCC_opt >conftest.nvcc.out 2>&1 && { NVCC_lastarch=$arch NVCC_extra="$NVCC_extra $NVCC_opt" - NVCC_list="$NVCC_list $arch" + NVCC_list="${NVCC_list:+$NVCC_list, }$arch" } done if test $NVCC_lastarch != none; then -- cgit v1.2.3 From 35fa8514fcd344615f19fb359471161b6bd58c73 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Thu, 2 Oct 2014 15:19:47 +0200 Subject: Add --with-cuda-compute option to configure --- build/linux/acinclude.m4 | 6 +++++- build/linux/configure.ac | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/build/linux/acinclude.m4 b/build/linux/acinclude.m4 index 313e849..5022e5b 100644 --- a/build/linux/acinclude.m4 +++ b/build/linux/acinclude.m4 @@ -74,7 +74,7 @@ rm -f conftest.cu conftest.o conftest.nvcc.out ]) dnl ASTRA_FIND_NVCC_ARCHS(archs-to-try,cppflags-to-extend,output-list) -dnl Architectures should be of the form 10, 20, 30, 35, +dnl Architectures should be of the form 10,20,30,35, dnl and should be in order. The last accepted one will be used for PTX output. dnl All accepted ones will be used for cubin output. AC_DEFUN([ASTRA_FIND_NVCC_ARCHS],[ @@ -88,7 +88,10 @@ _ACEOF NVCC_lastarch="none" NVCC_extra="" NVCC_list="" +astra_save_IFS=$IFS +IFS=, for arch in $1; do + IFS=$astra_save_IFS NVCC_opt="-gencode=arch=compute_$arch,code=sm_$arch" $NVCC -c -o conftest.o conftest.cu $$2 $NVCC_opt >conftest.nvcc.out 2>&1 && { NVCC_lastarch=$arch @@ -96,6 +99,7 @@ for arch in $1; do NVCC_list="${NVCC_list:+$NVCC_list, }$arch" } done +IFS=$astra_save_IFS if test $NVCC_lastarch != none; then NVCC_extra="$NVCC_extra -gencode=arch=compute_${NVCC_lastarch},code=compute_${NVCC_lastarch}" $3="$NVCC_list" diff --git a/build/linux/configure.ac b/build/linux/configure.ac index 4c9685b..11a8ff2 100644 --- a/build/linux/configure.ac +++ b/build/linux/configure.ac @@ -121,11 +121,15 @@ if test x"$HAVECUDA" = xyes; then fi AC_MSG_RESULT($HAVECUDA) +AC_ARG_WITH(cuda_compute, [[ --with-cuda-compute=archs comma separated list of CUDA compute models (optional)]],,) if test x"$HAVECUDA" = xyes; then AC_MSG_CHECKING([for nvcc archs]) dnl 10 11 12 13 20 30 32 35 37 50 - ASTRA_FIND_NVCC_ARCHS([10 12 20 30 35 50],NVCCFLAGS,NVCCARCHS) - AC_MSG_RESULT($NVCCARCHS) + if test x"$with_cuda_compute" = x; then + with_cuda_compute="10,12,20,30,35,50" + fi + ASTRA_FIND_NVCC_ARCHS([$with_cuda_compute],NVCCFLAGS,NVCCARCHS) + AC_MSG_RESULT([$NVCCARCHS]) fi -- cgit v1.2.3 From 5efafd026ce9ab99ff7901e1765ebc92fb84cf4f Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Mon, 6 Oct 2014 13:24:42 +0200 Subject: Fix warning --- src/CudaFilteredBackProjectionAlgorithm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CudaFilteredBackProjectionAlgorithm.cpp b/src/CudaFilteredBackProjectionAlgorithm.cpp index a6e7aa4..7cc8b99 100644 --- a/src/CudaFilteredBackProjectionAlgorithm.cpp +++ b/src/CudaFilteredBackProjectionAlgorithm.cpp @@ -109,7 +109,7 @@ bool CCudaFilteredBackProjectionAlgorithm::initialize(const Config& _cfg) node = _cfg.self->getSingleNode("FilterSinogramId"); if(node != NULL) { - int id = boost::lexical_cast(node->getContent()); + id = boost::lexical_cast(node->getContent()); const CFloat32ProjectionData2D * pFilterData = dynamic_cast(CData2DManager::getSingleton().get(id)); m_iFilterWidth = pFilterData->getGeometry()->getDetectorCount(); int iFilterProjectionCount = pFilterData->getGeometry()->getProjectionAngleCount(); -- cgit v1.2.3 From 2a39390355f55956d6ec1ce204726f979f74b340 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Thu, 16 Oct 2014 14:31:10 +0200 Subject: Make CXX configurable --- build/linux/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index 42cc9fc..49bc981 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -46,8 +46,8 @@ LDFLAGS+=$(BOOST_LDFLAGS) MKDIR=mkdir -p -CXX=g++ -LD=g++ +CXX=@CXX@ +LD=@CXX@ SHELL=@SHELL@ ifeq ($(matlab),yes) -- cgit v1.2.3 From 9715fadb1511277add807fc033c32d417fa6ffe0 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Thu, 2 Oct 2014 13:42:42 +0200 Subject: Improve cuda 2d header comments --- cuda/2d/algo.h | 7 +++++++ cuda/2d/dims.h | 19 ++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/cuda/2d/algo.h b/cuda/2d/algo.h index d39935d..954bb88 100644 --- a/cuda/2d/algo.h +++ b/cuda/2d/algo.h @@ -74,6 +74,13 @@ public: // instead of calling setBuffers, you can also call allocateBuffers // to let ReconAlgo manage its own GPU memory virtual bool allocateBuffers(); + + // copy data to GPU. This must be called after allocateBuffers. + // pfSinogram, pfReconstruction, pfVolMask, pfSinoMask are the + // sinogram, reconstruction, volume mask and sinogram mask in system RAM, + // respectively. The corresponding pitch variables give the pitches + // of these buffers, measured in floats. + // The sinogram is multiplied by fSinogramScale after uploading it. virtual bool copyDataToGPU(const float* pfSinogram, unsigned int iSinogramPitch, float fSinogramScale, const float* pfReconstruction, unsigned int iReconstructionPitch, const float* pfVolMask, unsigned int iVolMaskPitch, diff --git a/cuda/2d/dims.h b/cuda/2d/dims.h index 9678050..961f38c 100644 --- a/cuda/2d/dims.h +++ b/cuda/2d/dims.h @@ -44,12 +44,29 @@ struct SFanProjection { struct SDimensions { + // Width, height of reconstruction volume unsigned int iVolWidth; unsigned int iVolHeight; + + // Number of projection angles unsigned int iProjAngles; + + // Number of detector pixels unsigned int iProjDets; - float fDetScale; // size of detector compared to volume pixels + + // size of detector compared to volume pixels + float fDetScale; + + // in FP, number of rays to trace per detector pixel. + // This should usually be set to 1. + // If fDetScale > 1, this should be set to an integer of roughly + // the same size as fDetScale. unsigned int iRaysPerDet; + + // in BP, square root of number of rays to trace per volume pixel + // This should usually be set to 1. + // If fDetScale < 1, this should be set to an integer of roughly + // the same size as 1 / fDetScale. unsigned int iRaysPerPixelDim; }; -- cgit v1.2.3 From 3eb6f61e48f7ab6ddaa0e78d9140a4322dbb92fb Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Thu, 2 Oct 2014 13:50:59 +0200 Subject: Add CUDA SIRT::doSlabCorrections() function This function optionally compensates for effectively infinitely large slab-like objects of finite thickness 1. --- cuda/2d/arith.cu | 9 +++++++++ cuda/2d/arith.h | 1 + cuda/2d/sirt.cu | 45 +++++++++++++++++++++++++++++++++++++++++++++ cuda/2d/sirt.h | 4 ++++ 4 files changed, 59 insertions(+) diff --git a/cuda/2d/arith.cu b/cuda/2d/arith.cu index d1b189c..0f84e52 100644 --- a/cuda/2d/arith.cu +++ b/cuda/2d/arith.cu @@ -68,6 +68,14 @@ struct opMul { out *= in; } }; +struct opDiv { + __device__ void operator()(float& out, const float in) { + if (in > 0.000001f) // out is assumed to be positive + out /= in; + else + out = 0.0f; + } +}; struct opMul2 { __device__ void operator()(float& out, const float in1, const float in2) { out *= in1 * in2; @@ -682,6 +690,7 @@ INST_DtoD(opDividedBy) INST_toD(opInvert) INST_FtoD(opSet) INST_FtoD(opMul) +INST_DtoD(opDiv) INST_DFtoD(opMulMask) INST_FtoD(opAdd) INST_FtoD(opClampMin) diff --git a/cuda/2d/arith.h b/cuda/2d/arith.h index f87db99..31ecc17 100644 --- a/cuda/2d/arith.h +++ b/cuda/2d/arith.h @@ -41,6 +41,7 @@ struct opAddMul; struct opAdd; struct opAdd2; struct opMul; +struct opDiv; struct opMul2; struct opDividedBy; struct opInvert; diff --git a/cuda/2d/sirt.cu b/cuda/2d/sirt.cu index c7fe219..8dcd553 100644 --- a/cuda/2d/sirt.cu +++ b/cuda/2d/sirt.cu @@ -142,6 +142,51 @@ bool SIRT::precomputeWeights() return true; } +bool SIRT::doSlabCorrections() +{ + // This function compensates for effectively infinitely large slab-like + // objects of finite thickness 1. + + // Each ray through the object has an intersection of length d/cos(alpha). + // The length of the ray actually intersecting the reconstruction volume is + // given by D_lineWeight. By dividing by 1/cos(alpha) and multiplying by the + // lineweights, we correct for this missing attenuation outside of the + // reconstruction volume, assuming the object is homogeneous. + + // This effectively scales the output values by assuming the thickness d + // is 1 unit. + + + // This function in its current implementation only works if there are no masks. + // In this case, init() will also have already called precomputeWeights(), + // so we can use D_lineWeight. + if (useVolumeMask || useSinogramMask) + return false; + + // multiply by line weights + processSino(D_sinoData, D_lineWeight, projPitch, dims); + + SDimensions subdims = dims; + subdims.iProjAngles = 1; + + // divide by 1/cos(angle) + // ...but limit the correction to -80/+80 degrees. + float bound = cosf(1.3963f); + float* t = (float*)D_sinoData; + for (int i = 0; i < dims.iProjAngles; ++i) { + float f = fabs(cosf(angles[i])); + + if (f < bound) + f = bound; + + processSino(t, f, sinoPitch, subdims); + t += sinoPitch; + } + + return true; +} + + bool SIRT::setMinMaxMasks(float* D_minMaskData_, float* D_maxMaskData_, unsigned int iPitch) { diff --git a/cuda/2d/sirt.h b/cuda/2d/sirt.h index 1dbf675..0edddab 100644 --- a/cuda/2d/sirt.h +++ b/cuda/2d/sirt.h @@ -41,6 +41,10 @@ public: virtual bool init(); + // Do optional long-object compensation. See the comments in sirt.cu. + // Call this after init(). It can not be used in combination with masks. + bool doSlabCorrections(); + // Set min/max masks to existing GPU memory buffers bool setMinMaxMasks(float* D_minMaskData, float* D_maxMaskData, unsigned int pitch); -- cgit v1.2.3 From 44442e9e3212d0f4f72e41bc94e935d0b2dd7033 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Mon, 1 Dec 2014 11:53:07 +0100 Subject: Remove unused DetectorOffsetX/Y in ProjectionGeometry3D --- include/astra/ParallelProjectionGeometry3D.h | 8 +- include/astra/ProjectionGeometry3D.h | 64 +--------------- src/ParallelProjectionGeometry3D.cpp | 24 ++---- src/ProjectionGeometry3D.cpp | 109 +-------------------------- 4 files changed, 13 insertions(+), 192 deletions(-) diff --git a/include/astra/ParallelProjectionGeometry3D.h b/include/astra/ParallelProjectionGeometry3D.h index a1fae4d..2c11328 100644 --- a/include/astra/ParallelProjectionGeometry3D.h +++ b/include/astra/ParallelProjectionGeometry3D.h @@ -84,9 +84,7 @@ public: int _iDetectorColCount, float32 _fDetectorWidth, float32 _fDetectorHeight, - const float32* _pfProjectionAngles, - const float32* _pfExtraDetectorOffsetsX = NULL, - const float32* _pfExtraDetectorOffsetsY = NULL); + const float32* _pfProjectionAngles); /** Copy constructor. */ @@ -119,9 +117,7 @@ public: int _iDetectorColCount, float32 _fDetectorWidth, float32 _fDetectorHeight, - const float32* _pfProjectionAngles, - const float32* _pfExtraDetectorOffsetsX = NULL, - const float32* _pfExtraDetectorOffsetsY = NULL); + const float32* _pfProjectionAngles); /** Create a hard copy. */ diff --git a/include/astra/ProjectionGeometry3D.h b/include/astra/ProjectionGeometry3D.h index 99c5a2f..18f7e41 100644 --- a/include/astra/ProjectionGeometry3D.h +++ b/include/astra/ProjectionGeometry3D.h @@ -92,12 +92,6 @@ protected: */ float32* m_pfProjectionAngles; - /** Dynamically allocated array of vectors that represents the amount by which an image has been shifted after - * projection. Each projection image has a 2 shifts associated with it, one x-translation and y-translation - */ - float32* m_pfExtraDetectorOffsetsX; - float32* m_pfExtraDetectorOffsetsY; - /** Default constructor. Sets all numeric member variables to 0 and all pointer member variables to NULL. * * If an object is constructed using this default constructor, it must always be followed by a call @@ -122,9 +116,7 @@ protected: int _iDetectorColCount, float32 _fDetectorSpacingX, float32 _fDetectorSpacingY, - const float32* _pfProjectionAngles, - const float32* _pfExtraDetectorOffsetsX = NULL, - const float32* _pfExtraDetectorOffsetsY = NULL); + const float32* _pfProjectionAngles); /** Copy constructor. */ @@ -160,9 +152,7 @@ protected: int _iDetectorColCount, float32 _fDetectorSpacingX, float32 _fDetectorSpacingY, - const float32* _pfProjectionAngles, - const float32* _pfExtraDetectorOffsetsX = NULL, - const float32* _pfExtraDetectorOffsetsY = NULL); + const float32* _pfProjectionAngles); public: @@ -254,18 +244,6 @@ public: */ const float32* getProjectionAngles() const; - const float32* getExtraDetectorOffsetsX() const; - - const float32* getExtraDetectorOffsetsY() const; - - float32 getExtraDetectorOffsetX(int _iProjectionIndex) const; - - float32 getExtraDetectorOffsetY(int _iProjectionIndex) const; - - AstraError setExtraDetectorOffsetsX(float32* _pfExtraDetectorOffsetsX); - - AstraError setExtraDetectorOffsetsY(float32* _pfExtraDetectorOffsetsY); - /** Get the column index coordinate of a point on a detector array. * * @param _fOffsetX Distance between the center of the detector array and a certain point (both on the X-axis). @@ -444,44 +422,6 @@ inline const float32* CProjectionGeometry3D::getProjectionAngles() const } -//---------------------------------------------------------------------------------------- -// Get pointer to buffer used to store x-translations of the projection images. -inline const float32* CProjectionGeometry3D::getExtraDetectorOffsetsX() const -{ - // basic checks - ASTRA_ASSERT(m_bInitialized); - - return m_pfExtraDetectorOffsetsX; -} - -//---------------------------------------------------------------------------------------- -// Get pointer to buffer used to store y-translations of the projection images. -inline const float32* CProjectionGeometry3D::getExtraDetectorOffsetsY() const -{ - // basic checks - ASTRA_ASSERT(m_bInitialized); - - return m_pfExtraDetectorOffsetsY; -} -//---------------------------------------------------------------------------------------- -// Get the x-translation of a specific projection image. -inline float32 CProjectionGeometry3D::getExtraDetectorOffsetX(int _iProjectionIndex) const -{ - // basic checks - ASTRA_ASSERT(m_bInitialized); - - return m_pfExtraDetectorOffsetsX[_iProjectionIndex]; -} - -//---------------------------------------------------------------------------------------- -// Get the y-translation of a specific projection image. -inline float32 CProjectionGeometry3D::getExtraDetectorOffsetY(int _iProjectionIndex) const -{ - // basic checks - ASTRA_ASSERT(m_bInitialized); - - return m_pfExtraDetectorOffsetsX[_iProjectionIndex]; -} //---------------------------------------------------------------------------------------- // detector offset X -> detector column index (float) inline float32 CProjectionGeometry3D::detectorOffsetXToColIndexFloat(float32 _fOffsetX) const diff --git a/src/ParallelProjectionGeometry3D.cpp b/src/ParallelProjectionGeometry3D.cpp index ff46ae2..41c79b2 100644 --- a/src/ParallelProjectionGeometry3D.cpp +++ b/src/ParallelProjectionGeometry3D.cpp @@ -50,9 +50,7 @@ CParallelProjectionGeometry3D::CParallelProjectionGeometry3D(int _iProjectionAng int _iDetectorColCount, float32 _fDetectorWidth, float32 _fDetectorHeight, - const float32* _pfProjectionAngles, - const float32* _pfExtraDetectorOffsetsX, - const float32* _pfExtraDetectorOffsetsY) : + const float32* _pfProjectionAngles) : CProjectionGeometry3D() { initialize(_iProjectionAngleCount, @@ -60,9 +58,7 @@ CParallelProjectionGeometry3D::CParallelProjectionGeometry3D(int _iProjectionAng _iDetectorColCount, _fDetectorWidth, _fDetectorHeight, - _pfProjectionAngles, - _pfExtraDetectorOffsetsX, - _pfExtraDetectorOffsetsY); + _pfProjectionAngles); } //---------------------------------------------------------------------------------------- @@ -95,18 +91,14 @@ bool CParallelProjectionGeometry3D::initialize(int _iProjectionAngleCount, int _iDetectorColCount, float32 _fDetectorWidth, float32 _fDetectorHeight, - const float32* _pfProjectionAngles, - const float32* _pfExtraDetectorOffsetsX, - const float32* _pfExtraDetectorOffsetsY) + const float32* _pfProjectionAngles) { _initialize(_iProjectionAngleCount, _iDetectorRowCount, _iDetectorColCount, _fDetectorWidth, _fDetectorHeight, - _pfProjectionAngles, - _pfExtraDetectorOffsetsX, - _pfExtraDetectorOffsetsY); + _pfProjectionAngles); // success m_bInitialized = _check(); @@ -127,10 +119,6 @@ CProjectionGeometry3D* CParallelProjectionGeometry3D::clone() const res->m_fDetectorSpacingY = m_fDetectorSpacingY; res->m_pfProjectionAngles = new float32[m_iProjectionAngleCount]; memcpy(res->m_pfProjectionAngles, m_pfProjectionAngles, sizeof(float32)*m_iProjectionAngleCount); - res->m_pfExtraDetectorOffsetsX = new float32[m_iProjectionAngleCount]; - memcpy(res->m_pfExtraDetectorOffsetsX, m_pfExtraDetectorOffsetsX, sizeof(float32)*m_iProjectionAngleCount); - res->m_pfExtraDetectorOffsetsY = new float32[m_iProjectionAngleCount]; - memcpy(res->m_pfExtraDetectorOffsetsY, m_pfExtraDetectorOffsetsY, sizeof(float32)*m_iProjectionAngleCount); return res; } @@ -178,8 +166,6 @@ void CParallelProjectionGeometry3D::toXML(XMLNode* _sNode) const _sNode->addChildNode("DetectorRowCount", m_iDetectorRowCount); _sNode->addChildNode("DetectorColCount", m_iDetectorColCount); _sNode->addChildNode("ProjectionAngles", m_pfProjectionAngles, m_iProjectionAngleCount); - _sNode->addChildNode("ExtraDetectorOffsetsX", m_pfExtraDetectorOffsetsX, m_iProjectionAngleCount); - _sNode->addChildNode("ExtraDetectorOffsetsY", m_pfExtraDetectorOffsetsY, m_iProjectionAngleCount); } CVector3D CParallelProjectionGeometry3D::getProjectionDirection(int _iProjectionIndex, int _iDetectorIndex) const @@ -199,7 +185,7 @@ CParallelProjectionGeometry2D * CParallelProjectionGeometry3D::createProjectionG //getProjectionAngles(pfProjectionAngles); CParallelProjectionGeometry2D * pOutput = new CParallelProjectionGeometry2D(getProjectionCount(), - getDetectorColCount(), getDetectorSpacingX(), pfProjectionAngles,getExtraDetectorOffsetsX()); + getDetectorColCount(), getDetectorSpacingX(), pfProjectionAngles); //delete [] pfProjectionAngles; diff --git a/src/ProjectionGeometry3D.cpp b/src/ProjectionGeometry3D.cpp index 2cd0dd3..e2108aa 100644 --- a/src/ProjectionGeometry3D.cpp +++ b/src/ProjectionGeometry3D.cpp @@ -72,9 +72,7 @@ CProjectionGeometry3D::CProjectionGeometry3D(int _iAngleCount, int _iDetectorColCount, float32 _fDetectorSpacingX, float32 _fDetectorSpacingY, - const float32 *_pfProjectionAngles, - const float32 *_pfExtraDetectorOffsetsX, - const float32 *_pfExtraDetectorOffsetsY) : configCheckData(0) + const float32 *_pfProjectionAngles) : configCheckData(0) { _clear(); _initialize(_iAngleCount, @@ -82,9 +80,7 @@ CProjectionGeometry3D::CProjectionGeometry3D(int _iAngleCount, _iDetectorColCount, _fDetectorSpacingX, _fDetectorSpacingY, - _pfProjectionAngles, - _pfExtraDetectorOffsetsX, - _pfExtraDetectorOffsetsY); + _pfProjectionAngles); } //---------------------------------------------------------------------------------------- @@ -97,9 +93,7 @@ CProjectionGeometry3D::CProjectionGeometry3D(const CProjectionGeometry3D& _projG _projGeom.m_iDetectorColCount, _projGeom.m_fDetectorSpacingX, _projGeom.m_fDetectorSpacingY, - _projGeom.m_pfProjectionAngles, - _projGeom.m_pfExtraDetectorOffsetsX, - _projGeom.m_pfExtraDetectorOffsetsY); + _projGeom.m_pfProjectionAngles); } //---------------------------------------------------------------------------------------- @@ -122,8 +116,6 @@ void CProjectionGeometry3D::_clear() m_fDetectorSpacingX = 0.0f; m_fDetectorSpacingY = 0.0f; m_pfProjectionAngles = NULL; - m_pfExtraDetectorOffsetsX = NULL; - m_pfExtraDetectorOffsetsY = NULL; m_bInitialized = false; } @@ -139,15 +131,7 @@ void CProjectionGeometry3D::clear() if (m_pfProjectionAngles != NULL) { delete [] m_pfProjectionAngles; } - if (m_pfExtraDetectorOffsetsX != NULL) { - delete [] m_pfExtraDetectorOffsetsX; - } - if (m_pfExtraDetectorOffsetsY != NULL) { - delete [] m_pfExtraDetectorOffsetsY; - } m_pfProjectionAngles = NULL; - m_pfExtraDetectorOffsetsX = NULL; - m_pfExtraDetectorOffsetsY = NULL; m_bInitialized = false; } @@ -206,58 +190,6 @@ bool CProjectionGeometry3D::initialize(const Config& _cfg) CC.markNodeParsed("ProjectionAngles"); ASTRA_DELETE(node); - // Optional: ExtraDetectorOffsetX - node = _cfg.self->getSingleNode("ExtraDetectorOffsetsX"); - m_pfExtraDetectorOffsetsX = new float32[m_iProjectionAngleCount]; - if (node) { - vector translationsX = node->getContentNumericalArray(); - if (translationsX.size() < m_iProjectionAngleCount){ - cout << "Not enough ExtraDetectorOffsetsX components specified. " << endl; - for (int i = 0; i < m_iProjectionAngleCount; i++) { - m_pfExtraDetectorOffsetsX[i] = 0; - } - } - else { - for (int i = 0; i < m_iProjectionAngleCount; i++) { - m_pfExtraDetectorOffsetsX[i] = translationsX[i]; - } - } - } - else { - //cout << "No ExtraDetectorOffsetsX tag specified." << endl; - for (int i = 0; i < m_iProjectionAngleCount; i++) { - m_pfExtraDetectorOffsetsX[i] = 0; - } - } - CC.markOptionParsed("ExtraDetectorOffsetsX"); - ASTRA_DELETE(node); - - // Optional: ExtraDetectorOffsetsY - node = _cfg.self->getSingleNode("ExtraDetectorOffsetsY"); - m_pfExtraDetectorOffsetsY = new float32[m_iProjectionAngleCount]; - if (node) { - vector translationsX = node->getContentNumericalArray(); - if (translationsX.size() < m_iProjectionAngleCount){ - cout << "Not enough ExtraDetectorOffsetsY components specified. " << endl; - for (int i = 0; i < m_iProjectionAngleCount; i++) { - m_pfExtraDetectorOffsetsY[i] = 0; - } - } - else { - for (int i = 0; i < m_iProjectionAngleCount; i++) { - m_pfExtraDetectorOffsetsY[i] = translationsX[i]; - } - } - } - else { - //cout << "No ExtraDetectorOffsetsY tag specified." << endl; - for (int i = 0; i < m_iProjectionAngleCount; i++) { - m_pfExtraDetectorOffsetsY[i] = 0; - } - } - CC.markOptionParsed("ExtraDetectorOffsetsY"); - ASTRA_DELETE(node); - // Interface class, so don't return true return false; } @@ -269,9 +201,7 @@ bool CProjectionGeometry3D::_initialize(int _iProjectionAngleCount, int _iDetectorColCount, float32 _fDetectorSpacingX, float32 _fDetectorSpacingY, - const float32 *_pfProjectionAngles, - const float32 *_pfExtraDetectorOffsetsX, - const float32 *_pfExtraDetectorOffsetsY) + const float32 *_pfProjectionAngles) { if (m_bInitialized) { clear(); @@ -285,14 +215,8 @@ bool CProjectionGeometry3D::_initialize(int _iProjectionAngleCount, m_fDetectorSpacingX = _fDetectorSpacingX; m_fDetectorSpacingY = _fDetectorSpacingY; m_pfProjectionAngles = new float32[m_iProjectionAngleCount]; - m_pfExtraDetectorOffsetsX = new float32[m_iProjectionAngleCount]; - m_pfExtraDetectorOffsetsY = new float32[m_iProjectionAngleCount]; for (int i = 0; i < m_iProjectionAngleCount; i++) { m_pfProjectionAngles[i] = _pfProjectionAngles[i]; - m_pfExtraDetectorOffsetsX[i] = _pfExtraDetectorOffsetsX ? _pfExtraDetectorOffsetsX[i]:0; - m_pfExtraDetectorOffsetsY[i] = _pfExtraDetectorOffsetsY ? _pfExtraDetectorOffsetsY[i]:0; - //m_pfExtraDetectorOffsetsX[i] = 0; - //m_pfExtraDetectorOffsetsY[i] = 0; } m_iDetectorTotCount = m_iProjectionAngleCount * m_iDetectorRowCount * m_iDetectorColCount; @@ -301,29 +225,4 @@ bool CProjectionGeometry3D::_initialize(int _iProjectionAngleCount, return false; } -//--------------------------------------------------------------------------------------- -// -AstraError CProjectionGeometry3D::setExtraDetectorOffsetsX(float32* _pfExtraDetectorOffsetsX) -{ - if (!m_bInitialized) - return ASTRA_ERROR_NOT_INITIALIZED; - - for (int iAngle = 0; iAngle Date: Mon, 1 Dec 2014 11:58:21 +0100 Subject: Fix whitespace --- include/astra/ConeProjectionGeometry3D.h | 56 ++++++++++++++-------------- include/astra/ParallelProjectionGeometry3D.h | 2 +- include/astra/ProjectionGeometry3D.h | 16 ++++---- include/astra/VolumeGeometry3D.h | 32 ++++++++-------- 4 files changed, 53 insertions(+), 53 deletions(-) diff --git a/include/astra/ConeProjectionGeometry3D.h b/include/astra/ConeProjectionGeometry3D.h index 64bd51d..5f6c6b8 100644 --- a/include/astra/ConeProjectionGeometry3D.h +++ b/include/astra/ConeProjectionGeometry3D.h @@ -93,13 +93,13 @@ public: * @param _pfProjectionAngles Pointer to an array of projection angles. The angles will be copied from this array. All angles * are represented in radians and lie in the [0,2pi[ interval. */ - CConeProjectionGeometry3D(int _iProjectionAngleCount, - int _iDetectorRowCount, + CConeProjectionGeometry3D(int _iProjectionAngleCount, + int _iDetectorRowCount, int _iDetectorColCount, - float32 _fDetectorWidth, - float32 _fDetectorHeight, + float32 _fDetectorWidth, + float32 _fDetectorHeight, const float32* _pfProjectionAngles, - float32 _fOriginSourceDistance, + float32 _fOriginSourceDistance, float32 _fOriginDetectorDistance); /** Copy constructor. @@ -128,13 +128,13 @@ public: * @param _pfProjectionAngles Pointer to an array of projection angles. The angles will be copied from this array. All angles * are represented in radians and lie in the [0,2pi[ interval. */ - bool initialize(int _iProjectionAngleCount, - int _iDetectorRowCount, + bool initialize(int _iProjectionAngleCount, + int _iDetectorRowCount, int _iDetectorColCount, - float32 _fDetectorWidth, - float32 _fDetectorHeight, - const float32* _pfProjectionAngles, - float32 _fOriginSourceDistance, + float32 _fDetectorWidth, + float32 _fDetectorHeight, + const float32* _pfProjectionAngles, + float32 _fOriginSourceDistance, float32 _fOriginDetectorDistance); @@ -142,7 +142,7 @@ public: */ virtual CProjectionGeometry3D* clone() const; - /** Return true if this geometry instance is the same as the one specified. + /** Return true if this geometry instance is the same as the one specified. * * @return true if this geometry instance is the same as the one specified. */ @@ -153,38 +153,38 @@ public: * @param _sType geometry type to compare to. * @return true if _sType == "cone". */ - virtual bool isOfType(const std::string& _sType) const; + virtual bool isOfType(const std::string& _sType) const; /** Turn this object into an XML object. * * @param _sNode The XML object to fill. */ - virtual void toXML(XMLNode* _sNode) const; + virtual void toXML(XMLNode* _sNode) const; /** Returns the distance from the origin of the coordinate system to the source. - * - * @return Distance from the origin of the coordinate system to the source - */ + * + * @return Distance from the origin of the coordinate system to the source + */ float32 getOriginSourceDistance() const; /** Returns the distance from the origin of the coordinate system to the detector * (i.e., the distance between the origin and its orthogonal projection onto the detector array). - * - * @return Distance from the origin of the coordinate system to the detector - */ + * + * @return Distance from the origin of the coordinate system to the detector + */ float32 getOriginDetectorDistance() const; /** Returns the distance from the source to the detector * (i.e., the distance between the source and its orthogonal projection onto the detector array). - * - * @return Distance from the source to the detector - */ + * + * @return Distance from the source to the detector + */ float32 getSourceDetectorDistance() const; - /** - * Returns a vector giving the projection direction for a projection and detector index - */ - virtual CVector3D getProjectionDirection(int _iProjectionIndex, int _iDetectorIndex) const; + /** + * Returns a vector giving the projection direction for a projection and detector index + */ + virtual CVector3D getProjectionDirection(int _iProjectionIndex, int _iDetectorIndex) const; }; // Returns the distance from the origin of the coordinate system to the source. @@ -210,4 +210,4 @@ inline float32 CConeProjectionGeometry3D::getSourceDetectorDistance() const } // namespace astra -#endif /* _INC_ASTRA_PARALLELPROJECTIONGEOMETRY3D */ +#endif /* _INC_ASTRA_CONEPROJECTIONGEOMETRY3D */ diff --git a/include/astra/ParallelProjectionGeometry3D.h b/include/astra/ParallelProjectionGeometry3D.h index 2c11328..2a46981 100644 --- a/include/astra/ParallelProjectionGeometry3D.h +++ b/include/astra/ParallelProjectionGeometry3D.h @@ -123,7 +123,7 @@ public: */ virtual CProjectionGeometry3D* clone() const; - /** Return true if this geometry instance is the same as the one specified. + /** Return true if this geometry instance is the same as the one specified. * * @return true if this geometry instance is the same as the one specified. */ diff --git a/include/astra/ProjectionGeometry3D.h b/include/astra/ProjectionGeometry3D.h index 18f7e41..15dab87 100644 --- a/include/astra/ProjectionGeometry3D.h +++ b/include/astra/ProjectionGeometry3D.h @@ -111,11 +111,11 @@ protected: * @param _pfProjectionAngles Pointer to an array of projection angles. The angles will be copied from this array. All angles * are represented in radians and lie in the [0,2pi[ interval. */ - CProjectionGeometry3D(int _iProjectionAngleCount, - int _iDetectorRowCount, + CProjectionGeometry3D(int _iProjectionAngleCount, + int _iDetectorRowCount, int _iDetectorColCount, - float32 _fDetectorSpacingX, - float32 _fDetectorSpacingY, + float32 _fDetectorSpacingX, + float32 _fDetectorSpacingY, const float32* _pfProjectionAngles); /** Copy constructor. @@ -147,11 +147,11 @@ protected: * @param _pfProjectionAngles Pointer to an array of projection angles. The angles will be copied from this array. All angles * are represented in radians and lie in the [0,2pi[ interval. */ - bool _initialize(int _iProjectionAngleCount, - int _iDetectorRowCount, + bool _initialize(int _iProjectionAngleCount, + int _iDetectorRowCount, int _iDetectorColCount, - float32 _fDetectorSpacingX, - float32 _fDetectorSpacingY, + float32 _fDetectorSpacingX, + float32 _fDetectorSpacingY, const float32* _pfProjectionAngles); public: diff --git a/include/astra/VolumeGeometry3D.h b/include/astra/VolumeGeometry3D.h index 7354f33..eba0a92 100644 --- a/include/astra/VolumeGeometry3D.h +++ b/include/astra/VolumeGeometry3D.h @@ -104,7 +104,7 @@ protected: float32 m_fPixelLengthZ; ///< Depth of a single pixel, in unit lengths. float32 m_fPixelArea; ///< Area of a single pixel, in unit lengths squared. - float32 m_fDivPixelLengthX; ///< 1/m_fPixelLengthX, used for fast division. + float32 m_fDivPixelLengthX; ///< 1/m_fPixelLengthX, used for fast division. float32 m_fDivPixelLengthY; ///< 1/m_fPixelLengthY, used for fast division. float32 m_fDivPixelLengthZ; ///< 1/m_fPixelLengthZ, used for fast division. @@ -127,7 +127,7 @@ protected: public: - /** Default constructor. Sets all numeric member variables to 0 and all pointer member variables to NULL. + /** Default constructor. Sets all numeric member variables to 0 and all pointer member variables to NULL. * * If an object is constructed using this default constructor, it must always be followed by a call * to one of the init() methods before the object can be used. Any use before calling init() is not allowed, @@ -240,7 +240,7 @@ public: */ bool isInitialized() const; - /** Return true if this geometry instance is the same as the one specified. + /** Return true if this geometry instance is the same as the one specified. * * @return true if this geometry instance is the same as the one specified. */ @@ -318,37 +318,37 @@ public: */ float32 getPixelArea() const; - /** Get the minimal X-coordinate in the volume window. + /** Get the minimal X-coordinate in the volume window. * * @return Minimal X-coordinate in the volume window. */ float32 getWindowMinX() const; - /** Get the minimal Y-coordinate in the volume window. + /** Get the minimal Y-coordinate in the volume window. * * @return Minimal Y-coordinate in the volume window. */ float32 getWindowMinY() const; - /** Get the minimal Z-coordinate in the volume window. + /** Get the minimal Z-coordinate in the volume window. * * @return Minimal Z-coordinate in the volume window. */ float32 getWindowMinZ() const; - /** Get the maximal X-coordinate in the volume window. + /** Get the maximal X-coordinate in the volume window. * * @return Maximal X-coordinate in the volume window. */ float32 getWindowMaxX() const; - /** Get the maximal Y-coordinate in the volume window. + /** Get the maximal Y-coordinate in the volume window. * * @return Maximal Y-coordinate in the volume window. */ float32 getWindowMaxY() const; - /** Get the maximal Z-coordinate in the volume window. + /** Get the maximal Z-coordinate in the volume window. * * @return Maximal Z-coordinate in the volume window. */ @@ -360,7 +360,7 @@ public: * @param _iPixelCol Column index of the pixel, in the interval [0..getGridColCount()-1]. * @param _iPixelSlice Slice index of the pixel, in the interval [0..getGridSliceCount()-1]. * @return Computed index of the pixel, in the interval [0..getGridTotCount()-1]. - */ + */ int pixelRowColSliceToIndex(int _iPixelRow, int _iPixelCol, int _iPixelSlice) const; /** Convert a pixel index (from the interval [0..getGridTotCount()-1] to row, column and slice index. @@ -440,7 +440,7 @@ public: * @param _fCoordX X-coordinate. * @return If the X-coordinate falls within a column of the volume grid, the column index is returned. * Otherwise, a value of -1 is returned. - */ + */ int coordXToCol(float32 _fCoordX) const; /** Convert a Y-coordinate to a row index in the volume grid. @@ -448,7 +448,7 @@ public: * @param _fCoordY Y-coordinate * @return If the Y-coordinate falls within a row of the volume grid, the row index is returned. * Otherwise, a value of -1 is returned. - */ + */ int coordYToRow(float32 _fCoordY) const; /** Convert a Z-coordinate to a slice index in the volume grid. @@ -456,7 +456,7 @@ public: * @param _fCoordZ Z-coordinate * @return If the Z-coordinate falls within a slice of the volume grid, the slice index is returned. * Otherwise, a value of -1 is returned. - */ + */ int coordZToSlice(float32 _fCoordZ) const; /** Convert an X-coordinate to a column index in the volume grid. @@ -464,7 +464,7 @@ public: * @param _fCoordX X-coordinate. * @return If the X-coordinate falls within a column of the volume grid, the column index is returned. * Otherwise, a value of -1 is returned. - */ + */ float32 coordXToColFloat(float32 _fCoordX) const; /** Convert a Y-coordinate to a row index in the volume grid. @@ -472,7 +472,7 @@ public: * @param _fCoordY Y-coordinate * @return If the Y-coordinate falls within a row of the volume grid, the row index is returned. * Otherwise, a value of -1 is returned. - */ + */ float32 coordYToRowFloat(float32 _fCoordY) const; /** Convert a Z-coordinate to a slice index in the volume grid. @@ -480,7 +480,7 @@ public: * @param _fCoordZ Z-coordinate * @return If the Z-coordinate falls within a slice of the volume grid, the slice index is returned. * Otherwise, a value of -1 is returned. - */ + */ float32 coordZToSliceFloat(float32 _fCoordZ) const; CVolumeGeometry2D * createVolumeGeometry2D() const; -- cgit v1.2.3 From 50598bfd0c4959da66780fe695755e2be1a28b87 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Thu, 30 Oct 2014 17:41:58 +0100 Subject: Refactor astra_mex_data3d MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (Modified) patch by Nicola Viganò --- build/linux/Makefile.in | 6 +- matlab/mex/astra_mex_data3d_c.cpp | 543 +++-------------------------- matlab/mex/mexCopyDataHelpFunctions.cpp | 257 ++++++++++++++ matlab/mex/mexCopyDataHelpFunctions.h | 53 +++ matlab/mex/mexDataManagerHelpFunctions.cpp | 371 ++++++++++++++++++++ matlab/mex/mexDataManagerHelpFunctions.h | 90 +++++ 6 files changed, 827 insertions(+), 493 deletions(-) create mode 100644 matlab/mex/mexCopyDataHelpFunctions.cpp create mode 100644 matlab/mex/mexCopyDataHelpFunctions.h create mode 100644 matlab/mex/mexDataManagerHelpFunctions.cpp create mode 100644 matlab/mex/mexDataManagerHelpFunctions.h diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index 49bc981..a7ac1f2 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -35,6 +35,8 @@ endif ifeq ($(matlab),yes) CPPFLAGS+=-I$(MATLAB_ROOT)/extern/include -DMATLAB_MEX_FILE +CXXFLAGS+=-fopenmp +LDFLAGS+=-fopenmp endif BOOST_CPPFLAGS= @@ -196,7 +198,9 @@ TEST_OBJECTS=\ tests/test_XMLDocument.o MATLAB_CXX_OBJECTS=\ - matlab/mex/mexHelpFunctions.o + matlab/mex/mexHelpFunctions.o \ + matlab/mex/mexCopyDataHelpFunctions.o \ + matlab/mex/mexDataManagerHelpFunctions.o MATLAB_MEX=\ matlab/mex/astra_mex_algorithm_c.$(MEXSUFFIX) \ diff --git a/matlab/mex/astra_mex_data3d_c.cpp b/matlab/mex/astra_mex_data3d_c.cpp index 35f3480..7c2af8f 100644 --- a/matlab/mex/astra_mex_data3d_c.cpp +++ b/matlab/mex/astra_mex_data3d_c.cpp @@ -32,6 +32,8 @@ $Id$ */ #include #include "mexHelpFunctions.h" +#include "mexCopyDataHelpFunctions.h" +#include "mexDataManagerHelpFunctions.h" #include @@ -68,186 +70,38 @@ void astra_mex_data3d_create(int& nlhs, mxArray* plhs[], int& nrhs, const mxArra return; } - string sDataType = mex_util_get_string(prhs[1]); - CFloat32Data3DMemory* pDataObject3D = NULL; + const mxArray * const geometry = prhs[2]; + const mxArray * const data = nrhs > 3 ? prhs[3] : NULL; - if (nrhs >= 4 && !(mex_is_scalar(prhs[3]) || mxIsDouble(prhs[3]) || mxIsSingle(prhs[3]))) { - mexErrMsgTxt("Data must be single or double."); + if (!checkStructs(geometry)) { + mexErrMsgTxt("Argument 3 is not a valid MATLAB struct.\n"); return; } - mwSize dims[3]; - - // SWITCH DataType - if (sDataType == "-vol") { - - // Read geometry - if (!mxIsStruct(prhs[2])) { - mexErrMsgTxt("Argument 3 is not a valid MATLAB struct.\n"); - } - Config cfg; - XMLDocument* xml = struct2XML("VolumeGeometry", prhs[2]); - if (!xml) - return; - cfg.self = xml->getRootNode(); - CVolumeGeometry3D* pGeometry = new CVolumeGeometry3D(); - if (!pGeometry->initialize(cfg)) { - mexErrMsgTxt("Geometry class not initialized. \n"); - delete pGeometry; - delete xml; - return; - } - delete xml; - - // If data is specified, check dimensions - if (nrhs >= 4 && !mex_is_scalar(prhs[3])) { - get3DMatrixDims(prhs[3], dims); - if (pGeometry->getGridColCount() != dims[0] || pGeometry->getGridRowCount() != dims[1] || pGeometry->getGridSliceCount() != dims[2]) { - mexErrMsgTxt("The dimensions of the data do not match those specified in the geometry. \n"); - delete pGeometry; - return; - } - } - - // Initialize data object - pDataObject3D = new CFloat32VolumeData3DMemory(pGeometry); - delete pGeometry; - } - - else if (sDataType == "-sino" || sDataType == "-proj3d") { - - // Read geometry - if (!mxIsStruct(prhs[2])) { - mexErrMsgTxt("Argument 3 is not a valid MATLAB struct.\n"); - } - XMLDocument* xml = struct2XML("ProjectionGeometry", prhs[2]); - if (!xml) - return; - Config cfg; - cfg.self = xml->getRootNode(); - - // FIXME: Change how the base class is created. (This is duplicated - // in Projector2D.cpp.) - std::string type = cfg.self->getAttribute("type"); - CProjectionGeometry3D* pGeometry = 0; - if (type == "parallel3d") { - pGeometry = new CParallelProjectionGeometry3D(); - } else if (type == "parallel3d_vec") { - pGeometry = new CParallelVecProjectionGeometry3D(); - } else if (type == "cone") { - pGeometry = new CConeProjectionGeometry3D(); - } else if (type == "cone_vec") { - pGeometry = new CConeVecProjectionGeometry3D(); - } else { - mexErrMsgTxt("Invalid geometry type.\n"); - return; - } - - if (!pGeometry->initialize(cfg)) { - mexErrMsgTxt("Geometry class not initialized. \n"); - delete pGeometry; - delete xml; - return; - } - delete xml; - - // If data is specified, check dimensions - if (nrhs >= 4 && !mex_is_scalar(prhs[3])) { - get3DMatrixDims(prhs[3], dims); - if (pGeometry->getDetectorColCount() != dims[0] || pGeometry->getProjectionCount() != dims[1] || pGeometry->getDetectorRowCount() != dims[2]) { - mexErrMsgTxt("The dimensions of the data do not match those specified in the geometry. \n"); - delete pGeometry; - return; - } - } - - // Initialize data object - pDataObject3D = new CFloat32ProjectionData3DMemory(pGeometry); - delete pGeometry; - } - - else if (sDataType == "-sinocone") { - // Read geometry - if (!mxIsStruct(prhs[2])) { - mexErrMsgTxt("Argument 3 is not a valid MATLAB struct.\n"); - } - XMLDocument* xml = struct2XML("ProjectionGeometry", prhs[2]); - if (!xml) - return; - Config cfg; - cfg.self = xml->getRootNode(); - CConeProjectionGeometry3D* pGeometry = new CConeProjectionGeometry3D(); - if (!pGeometry->initialize(cfg)) { - mexErrMsgTxt("Geometry class not initialized. \n"); - delete xml; - delete pGeometry; - return; - } - delete xml; - // If data is specified, check dimensions - if (nrhs >= 4 && !mex_is_scalar(prhs[3])) { - get3DMatrixDims(prhs[3], dims); - if (pGeometry->getDetectorRowCount() != dims[2] || pGeometry->getProjectionCount() != dims[1] || pGeometry->getDetectorColCount() != dims[0]) { - mexErrMsgTxt("The dimensions of the data do not match those specified in the geometry. \n"); - delete pGeometry; - return; - } - } - // Initialize data object - pDataObject3D = new CFloat32ProjectionData3DMemory(pGeometry); - delete pGeometry; - } - else { - mexErrMsgTxt("Invalid datatype. Please specify '-vol' or '-proj3d'. \n"); + if (data && !checkDataType(data)) { + mexErrMsgTxt("Data must be single or double."); return; } - // Check initialization - if (!pDataObject3D->isInitialized()) { - mexErrMsgTxt("Couldn't initialize data object.\n"); - delete pDataObject3D; + const string sDataType = mex_util_get_string(prhs[1]); + + // step2: Allocate data + CFloat32Data3DMemory* pDataObject3D = + allocateDataObject(sDataType, geometry, data); + if (!pDataObject3D) { + // Error message was already set by the function return; } - // Store data - - // fill with scalar value - if (nrhs < 4 || mex_is_scalar(prhs[3])) { - float32 fValue = 0.0f; - if (nrhs >= 4) - fValue = (float32)mxGetScalar(prhs[3]); - for (int i = 0; i < pDataObject3D->getSize(); ++i) { - pDataObject3D->getData()[i] = fValue; - } - } - // fill with array value - else if (mxIsDouble(prhs[3])) { - double* pdMatlabData = mxGetPr(prhs[3]); - int i = 0; - int col, row, slice; - for (slice = 0; slice < dims[2]; ++slice) { - for (row = 0; row < dims[1]; ++row) { - for (col = 0; col < dims[0]; ++col) { - // TODO: Benchmark and remove triple indexing? - pDataObject3D->getData3D()[slice][row][col] = pdMatlabData[i]; - ++i; - } - } - } - } - else if (mxIsSingle(prhs[3])) { - const float* pfMatlabData = (const float*)mxGetData(prhs[3]); - int i = 0; - int col, row, slice; - for (slice = 0; slice < dims[2]; ++slice) { - for (row = 0; row < dims[1]; ++row) { - for (col = 0; col < dims[0]; ++col) { - // TODO: Benchmark and remove triple indexing? - pDataObject3D->getData3D()[slice][row][col] = pfMatlabData[i]; - ++i; - } - } - } + // step3: Initialize data + if (!data) { + mxArray * emptyArray = mxCreateDoubleMatrix(0, 0, mxREAL); + copyMexToCFloat32Array(emptyArray, pDataObject3D->getData(), + pDataObject3D->getSize()); + mxDestroyArray(emptyArray); + } else { + copyMexToCFloat32Array(data, pDataObject3D->getData(), + pDataObject3D->getSize()); } pDataObject3D->updateStatistics(); @@ -258,7 +112,6 @@ void astra_mex_data3d_create(int& nlhs, mxArray* plhs[], int& nrhs, const mxArra if (1 <= nlhs) { plhs[0] = mxCreateDoubleScalar(iIndex); } - } //----------------------------------------------------------------------------------------- @@ -274,209 +127,38 @@ void astra_mex_data3d_create(int& nlhs, mxArray* plhs[], int& nrhs, const mxArra */ #ifdef USE_MATLAB_UNDOCUMENTED -extern "C" { -mxArray *mxCreateSharedDataCopy(const mxArray *pr); -bool mxUnshareArray(const mxArray *pr, const bool noDeepCopy); -mxArray *mxUnreference(const mxArray *pr); -#if 0 -// Unsupported in Matlab R2014b -bool mxIsSharedArray(const mxArray *pr); -#endif -} - -class CFloat32CustomMemoryMatlab3D : public CFloat32CustomMemory { -public: - // offset allows linking the data object to a sub-volume (in the z direction) - // offset is measured in floats. - CFloat32CustomMemoryMatlab3D(const mxArray* _pArray, bool bUnshare, size_t iOffset) { - //fprintf(stderr, "Passed:\narray: %p\tdata: %p\n", (void*)_pArray, (void*)mxGetData(_pArray)); - // First unshare the input array, so that we may modify it. - if (bUnshare) { -#if 0 - // Unsupported in Matlab R2014b - if (mxIsSharedArray(_pArray)) { - fprintf(stderr, "Performance note: unsharing shared array in link\n"); - } -#endif - mxUnshareArray(_pArray, false); - //fprintf(stderr, "Unshared:\narray: %p\tdata: %p\n", (void*)_pArray, (void*)mxGetData(_pArray)); - } - // Then create a (persistent) copy so the data won't be deleted - // or changed. - m_pLink = mxCreateSharedDataCopy(_pArray); - //fprintf(stderr, "SharedDataCopy:\narray: %p\tdata: %p\n", (void*)m_pLink, (void*)mxGetData(m_pLink)); - mexMakeArrayPersistent(m_pLink); - m_fPtr = (float *)mxGetData(m_pLink); - m_fPtr += iOffset; - } - virtual ~CFloat32CustomMemoryMatlab3D() { - // destroy the shared array - //fprintf(stderr, "Destroy:\narray: %p\tdata: %p\n", (void*)m_pLink, (void*)mxGetData(m_pLink)); - mxDestroyArray(m_pLink); - } -private: - mxArray* m_pLink; -}; void astra_mex_data3d_link(int& nlhs, mxArray* plhs[], int& nrhs, const mxArray* prhs[]) { - // TODO: Reduce code duplication with _create! - // TODO: Also allow empty argument to let this function create its own mxArray + // TODO: Allow empty argument to let this function create its own mxArray // step1: get datatype if (nrhs < 4) { mexErrMsgTxt("Not enough arguments. See the help document for a detailed argument list. \n"); return; } - if (!mxIsStruct(prhs[2])) { - mexErrMsgTxt("Argument 3 is not a valid MATLAB struct.\n"); - } - - const mxArray* _pArray = prhs[3]; - - string sDataType = mex_util_get_string(prhs[1]); - CFloat32Data3DMemory* pDataObject3D = NULL; + const mxArray * const geometry = prhs[2]; + const mxArray * const data = nrhs > 3 ? prhs[3] : NULL; + const mxArray * const unshare = nrhs > 4 ? prhs[4] : NULL; + const mxArray * const zIndex = nrhs > 5 ? prhs[5] : NULL; - if (mex_is_scalar(_pArray) || !mxIsSingle(_pArray)) { - mexErrMsgTxt("Data must be a single array."); + if (!checkStructs(geometry)) { + mexErrMsgTxt("Argument 3 is not a valid MATLAB struct.\n"); return; } - unsigned int iZ = 0; - bool bUnshare = true; - if (nrhs > 4) { - if (!mex_is_scalar(prhs[4])) { - mexErrMsgTxt("Argument 5 (read-only) must be scalar"); - return; - } - // unshare the array if we're not linking read-only - bUnshare = !(bool)mxGetScalar(prhs[4]); - } - if (nrhs > 5) { - if (!mex_is_scalar(prhs[5])) { - mexErrMsgTxt("Argument 6 (Z) must be scalar"); - return; - } - iZ = (unsigned int)mxGetScalar(prhs[5]); - } - - mwSize dims[3]; - - // SWITCH DataType - if (sDataType == "-vol") { - // Read geometry - Config cfg; - XMLDocument* xml = struct2XML("VolumeGeometry", prhs[2]); - if (!xml) - return; - cfg.self = xml->getRootNode(); - CVolumeGeometry3D* pGeometry = new CVolumeGeometry3D(); - if (!pGeometry->initialize(cfg)) { - mexErrMsgTxt("Geometry class not initialized. \n"); - delete pGeometry; - delete xml; - return; - } - delete xml; - - // If data is specified, check dimensions - if (nrhs >= 4) { - get3DMatrixDims(prhs[3], dims); - bool ok = pGeometry->getGridColCount() == dims[0] && pGeometry->getGridRowCount() == dims[1]; - if (nrhs == 4) { - ok &= pGeometry->getGridSliceCount() == dims[2]; - } else if (nrhs > 4) { - // sub-volume in Z direction - ok &= iZ + pGeometry->getGridSliceCount() <= dims[2]; - } - if (!ok) { - mexErrMsgTxt("The dimensions of the data do not match those specified in the geometry. \n"); - delete pGeometry; - return; - } - } - - size_t iOffset = iZ; - iOffset *= dims[0]; - iOffset *= dims[1]; - CFloat32CustomMemoryMatlab3D* pHandle = new CFloat32CustomMemoryMatlab3D(_pArray, bUnshare, iOffset); - - // Initialize data object - pDataObject3D = new CFloat32VolumeData3DMemory(pGeometry, pHandle); - delete pGeometry; - } - else if (sDataType == "-sino" || sDataType == "-proj3d" || sDataType == "-sinocone") { - - // Read geometry - if (!mxIsStruct(prhs[2])) { - mexErrMsgTxt("Argument 3 is not a valid MATLAB struct.\n"); - } - XMLDocument* xml = struct2XML("ProjectionGeometry", prhs[2]); - if (!xml) - return; - Config cfg; - cfg.self = xml->getRootNode(); - - // FIXME: Change how the base class is created. (This is duplicated - // in Projector2D.cpp.) - std::string type = cfg.self->getAttribute("type"); - CProjectionGeometry3D* pGeometry = 0; - if (type == "parallel3d") { - pGeometry = new CParallelProjectionGeometry3D(); - } else if (type == "parallel3d_vec") { - pGeometry = new CParallelVecProjectionGeometry3D(); - } else if (type == "cone") { - pGeometry = new CConeProjectionGeometry3D(); - } else if (type == "cone_vec") { - pGeometry = new CConeVecProjectionGeometry3D(); - } else { - mexErrMsgTxt("Invalid geometry type.\n"); - return; - } - - if (!pGeometry->initialize(cfg)) { - mexErrMsgTxt("Geometry class not initialized. \n"); - delete pGeometry; - delete xml; - return; - } - delete xml; - - // If data is specified, check dimensions - if (nrhs >= 4) { - get3DMatrixDims(prhs[3], dims); - bool ok = pGeometry->getDetectorColCount() == dims[0] && pGeometry->getProjectionCount() == dims[1]; - if (nrhs == 4) { - ok &= pGeometry->getDetectorRowCount() == dims[2]; - } else if (nrhs > 4) { - // sub-volume in Z direction - ok &= iZ + pGeometry->getDetectorRowCount() <= dims[2]; - } - if (!ok) { - mexErrMsgTxt("The dimensions of the data do not match those specified in the geometry. \n"); - delete pGeometry; - return; - } - } - - size_t iOffset = iZ; - iOffset *= dims[0]; - iOffset *= dims[1]; - CFloat32CustomMemoryMatlab3D* pHandle = new CFloat32CustomMemoryMatlab3D(_pArray, bUnshare, iOffset); - - // Initialize data object - pDataObject3D = new CFloat32ProjectionData3DMemory(pGeometry, pHandle); - delete pGeometry; - } - else { - mexErrMsgTxt("Invalid datatype. Please specify '-vol' or '-proj3d'. \n"); + if (data && !checkDataType(data)) { + mexErrMsgTxt("Data must be single or double."); return; } - // Check initialization - if (!pDataObject3D->isInitialized()) { - mexErrMsgTxt("Couldn't initialize data object.\n"); - delete pDataObject3D; + string sDataType = mex_util_get_string(prhs[1]); + + // step2: Allocate data + CFloat32Data3DMemory* pDataObject3D = + allocateDataObject(sDataType, geometry, data, unshare, zIndex); + if (!pDataObject3D) { + // Error message was already set by the function return; } @@ -489,10 +171,7 @@ void astra_mex_data3d_link(int& nlhs, mxArray* plhs[], int& nrhs, const mxArray* if (1 <= nlhs) { plhs[0] = mxCreateDoubleScalar(iIndex); } - } - - #endif @@ -547,43 +226,8 @@ void astra_mex_data3d_create_cache(int nlhs, mxArray* plhs[], int nrhs, const mx */ void astra_mex_data3d_get(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) -{ - // step1: input - if (nrhs < 2) { - mexErrMsgTxt("Not enough arguments. See the help document for a detailed argument list. \n"); - return; - } - int iDataID = (int)(mxGetScalar(prhs[1])); - - // step2: get data object - CFloat32Data3DMemory* pDataObject = dynamic_cast(astra::CData3DManager::getSingleton().get(iDataID)); - if (!pDataObject || !pDataObject->isInitialized()) { - mexErrMsgTxt("Data object not found or not initialized properly.\n"); - return; - } - - // create output - if (1 <= nlhs) { - mwSize dims[3]; - dims[0] = pDataObject->getWidth(); - dims[1] = pDataObject->getHeight(); - dims[2] = pDataObject->getDepth(); - - plhs[0] = mxCreateNumericArray(3, dims, mxDOUBLE_CLASS, mxREAL); - double* out = mxGetPr(plhs[0]); - - int i = 0; - for (int slice = 0; slice < pDataObject->getDepth(); slice++) { - for (int row = 0; row < pDataObject->getHeight(); row++) { - for (int col = 0; col < pDataObject->getWidth(); col++) { - // TODO: Benchmark and remove triple indexing? - out[i] = pDataObject->getData3D()[slice][row][col]; - ++i; - } - } - } - } - +{ + generic_astra_mex_data3d_get(nlhs, plhs, nrhs, prhs); } //----------------------------------------------------------------------------------------- @@ -596,43 +240,8 @@ void astra_mex_data3d_get(int nlhs, mxArray* plhs[], int nrhs, const mxArray* pr */ void astra_mex_data3d_get_single(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) -{ - // step1: input - if (nrhs < 2) { - mexErrMsgTxt("Not enough arguments. See the help document for a detailed argument list. \n"); - return; - } - int iDataID = (int)(mxGetScalar(prhs[1])); - - // step2: get data object - CFloat32Data3DMemory* pDataObject = dynamic_cast(astra::CData3DManager::getSingleton().get(iDataID)); - if (!pDataObject || !pDataObject->isInitialized()) { - mexErrMsgTxt("Data object not found or not initialized properly.\n"); - return; - } - - // create output - if (1 <= nlhs) { - mwSize dims[3]; - dims[0] = pDataObject->getWidth(); - dims[1] = pDataObject->getHeight(); - dims[2] = pDataObject->getDepth(); - - plhs[0] = mxCreateNumericArray(3, dims, mxSINGLE_CLASS, mxREAL); - float* out = (float *)mxGetData(plhs[0]); - - int i = 0; - for (int slice = 0; slice < pDataObject->getDepth(); slice++) { - for (int row = 0; row < pDataObject->getHeight(); row++) { - for (int col = 0; col < pDataObject->getWidth(); col++) { - // TODO: Benchmark and remove triple indexing? - out[i] = pDataObject->getData3D()[slice][row][col]; - ++i; - } - } - } - } - +{ + generic_astra_mex_data3d_get(nlhs, plhs, nrhs, prhs); } @@ -652,70 +261,20 @@ void astra_mex_data3d_store(int nlhs, mxArray* plhs[], int nrhs, const mxArray* mexErrMsgTxt("Not enough arguments. See the help document for a detailed argument list. \n"); return; } - int iDataID = (int)(mxGetScalar(prhs[1])); - // step2: get data object - CFloat32Data3DMemory* pDataObject = dynamic_cast(astra::CData3DManager::getSingleton().get(iDataID)); - if (!pDataObject || !pDataObject->isInitialized()) { - mexErrMsgTxt("Data object not found or not initialized properly.\n"); + if (!checkDataType(prhs[2])) { + mexErrMsgTxt("Data must be single or double."); return; } - if (!(mex_is_scalar(prhs[2]) || mxIsDouble(prhs[2]) || mxIsSingle(prhs[2]))) { - mexErrMsgTxt("Data must be single or double."); + // step2: get data object + CFloat32Data3DMemory* pDataObject = NULL; + if (!checkID(mxGetScalar(prhs[1]), pDataObject)) { + mexErrMsgTxt("Data object not found or not initialized properly.\n"); return; } - // fill with scalar value - if (mex_is_scalar(prhs[2])) { - float32 fValue = (float32)mxGetScalar(prhs[2]); - for (int i = 0; i < pDataObject->getSize(); ++i) { - pDataObject->getData()[i] = fValue; - } - } - // fill with array value - else if (mxIsDouble(prhs[2])) { - mwSize dims[3]; - get3DMatrixDims(prhs[2], dims); - if (dims[0] != pDataObject->getWidth() || dims[1] != pDataObject->getHeight() || dims[2] != pDataObject->getDepth()) { - mexErrMsgTxt("Data object dimensions don't match.\n"); - return; - - } - double* pdMatlabData = mxGetPr(prhs[2]); - int i = 0; - int col, row, slice; - for (slice = 0; slice < dims[2]; ++slice) { - for (row = 0; row < dims[1]; ++row) { - for (col = 0; col < dims[0]; ++col) { - // TODO: Benchmark and remove triple indexing? - pDataObject->getData3D()[slice][row][col] = pdMatlabData[i]; - ++i; - } - } - } - } - else if (mxIsSingle(prhs[2])) { - mwSize dims[3]; - get3DMatrixDims(prhs[2], dims); - if (dims[0] != pDataObject->getWidth() || dims[1] != pDataObject->getHeight() || dims[2] != pDataObject->getDepth()) { - mexErrMsgTxt("Data object dimensions don't match.\n"); - return; - - } - const float* pfMatlabData = (const float *)mxGetData(prhs[2]); - int i = 0; - int col, row, slice; - for (slice = 0; slice < dims[2]; ++slice) { - for (row = 0; row < dims[1]; ++row) { - for (col = 0; col < dims[0]; ++col) { - // TODO: Benchmark and remove triple indexing? - pDataObject->getData3D()[slice][row][col] = pfMatlabData[i]; - ++i; - } - } - } - } + copyMexToCFloat32Array(prhs[2], pDataObject->getData(), pDataObject->getSize()); pDataObject->updateStatistics(); } diff --git a/matlab/mex/mexCopyDataHelpFunctions.cpp b/matlab/mex/mexCopyDataHelpFunctions.cpp new file mode 100644 index 0000000..bbcad30 --- /dev/null +++ b/matlab/mex/mexCopyDataHelpFunctions.cpp @@ -0,0 +1,257 @@ +/* +----------------------------------------------------------------------- +Copyright 2013 iMinds-Vision Lab, University of Antwerp + +Contact: astra@ua.ac.be +Website: http://astra.ua.ac.be + + +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 +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +The ASTRA Toolbox is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with the ASTRA Toolbox. If not, see . + +----------------------------------------------------------------------- +$Id$ +*/ + +#include "mexCopyDataHelpFunctions.h" + +#include "mexHelpFunctions.h" + +#define HAVE_OMP + +#define ROUND_DOWN(x, s) ((x) & ~((s)-1)) + +#ifdef HAVE_OMP +# include +#endif + +#if defined(__SSE2__) +# include + +# define STORE_32F_64F_CORE8(in, out, count, base) \ + {\ + const __m128 inV0 = *((const __m128 *) &in[count + 0 + base]);\ + const __m128 inV1 = *((const __m128 *) &in[count + 4 + base]);\ +\ + *((__m128d *)&out[count + 0 + base]) = _mm_cvtps_pd(inV0);\ + *((__m128d *)&out[count + 2 + base]) = _mm_cvtps_pd(_mm_movehl_ps(inV0, inV0));\ +\ + *((__m128d *)&out[count + 4 + base]) = _mm_cvtps_pd(inV1);\ + *((__m128d *)&out[count + 6 + base]) = _mm_cvtps_pd(_mm_movehl_ps(inV1, inV1));\ + } +# define STORE_64F_32F_CORE8(in, out, count, base) \ + {\ + const __m128d inV0 = *((const __m128d *) &in[count + 0 + base]);\ + const __m128d inV1 = *((const __m128d *) &in[count + 2 + base]);\ +\ + const __m128d inV2 = *((const __m128d *) &in[count + 4 + base]);\ + const __m128d inV3 = *((const __m128d *) &in[count + 6 + base]);\ +\ + *((__m128 *)&out[count + 0 + base]) = _mm_movelh_ps(_mm_cvtpd_ps(inV0), _mm_cvtpd_ps(inV1));\ + *((__m128 *)&out[count + 4 + base]) = _mm_movelh_ps(_mm_cvtpd_ps(inV2), _mm_cvtpd_ps(inV3));\ + } +# define STORE_32F_32F_CORE8(in, out, count, base) \ + {\ + *((__m128 *)&out[count + 0 + base]) = *((const __m128 *)&in[count + 0 + base]);\ + *((__m128 *)&out[count + 4 + base]) = *((const __m128 *)&in[count + 4 + base]);\ + } +# define STORE_CONST_32F_CORE8(val, out, count, base) \ + {\ + *((__m128 *)&out[count + 0 + base]) = val;\ + *((__m128 *)&out[count + 4 + base]) = val;\ + } +#else +# define STORE_32F_64F_CORE8(in, out, count, base) \ + {\ + out[count + 0 + base] = (double)in[count + 0 + base];\ + out[count + 1 + base] = (double)in[count + 1 + base];\ + out[count + 2 + base] = (double)in[count + 2 + base];\ + out[count + 3 + base] = (double)in[count + 3 + base];\ + out[count + 4 + base] = (double)in[count + 4 + base];\ + out[count + 5 + base] = (double)in[count + 5 + base];\ + out[count + 6 + base] = (double)in[count + 6 + base];\ + out[count + 7 + base] = (double)in[count + 7 + base];\ + } +# define STORE_64F_32F_CORE8(in, out, count, base) \ + {\ + out[count + 0 + base] = (float)in[count + 0 + base];\ + out[count + 1 + base] = (float)in[count + 1 + base];\ + out[count + 2 + base] = (float)in[count + 2 + base];\ + out[count + 3 + base] = (float)in[count + 3 + base];\ + out[count + 4 + base] = (float)in[count + 4 + base];\ + out[count + 5 + base] = (float)in[count + 5 + base];\ + out[count + 6 + base] = (float)in[count + 6 + base];\ + out[count + 7 + base] = (float)in[count + 7 + base];\ + } +# define STORE_32F_32F_CORE8(in, out, count, base) \ + {\ + out[count + 0 + base] = in[count + 0 + base];\ + out[count + 1 + base] = in[count + 1 + base];\ + out[count + 2 + base] = in[count + 2 + base];\ + out[count + 3 + base] = in[count + 3 + base];\ + out[count + 4 + base] = in[count + 4 + base];\ + out[count + 5 + base] = in[count + 5 + base];\ + out[count + 6 + base] = in[count + 6 + base];\ + out[count + 7 + base] = in[count + 7 + base];\ + } +#endif + +const char * warnDataTypeNotSupported = "Data type not supported: nothing was copied"; + +void +_copyMexToCFloat32Array(const mxArray * const inArray, astra::float32 * const out) +{ + const long long tot_size = mxGetNumberOfElements(inArray); + const long long block = 32; + const long long totRoundedPixels = ROUND_DOWN(tot_size, block); + + if (mxIsDouble(inArray)) { + const double * const pdMatlabData = mxGetPr(inArray); + +#pragma omp for nowait + for (long long count = 0; count < totRoundedPixels; count += block) { + STORE_64F_32F_CORE8(pdMatlabData, out, count, 0); + STORE_64F_32F_CORE8(pdMatlabData, out, count, 8); + STORE_64F_32F_CORE8(pdMatlabData, out, count, 16); + STORE_64F_32F_CORE8(pdMatlabData, out, count, 24); + } +#pragma omp for nowait + for (long long count = totRoundedPixels; count < tot_size; count++) { + out[count] = pdMatlabData[count]; + } + } + else if (mxIsSingle(inArray)) { + const float * const pfMatlabData = (const float *)mxGetData(inArray); + +#pragma omp for nowait + for (long long count = 0; count < totRoundedPixels; count += block) { + STORE_32F_32F_CORE8(pfMatlabData, out, count, 0); + STORE_32F_32F_CORE8(pfMatlabData, out, count, 8); + STORE_32F_32F_CORE8(pfMatlabData, out, count, 16); + STORE_32F_32F_CORE8(pfMatlabData, out, count, 24); + } +#pragma omp for nowait + for (long long count = totRoundedPixels; count < tot_size; count++) { + out[count] = pfMatlabData[count]; + } + } + else { +#pragma omp single nowait + mexWarnMsgIdAndTxt("ASTRA_MEX:wrong_datatype", warnDataTypeNotSupported); + } +} + +void +_copyCFloat32ArrayToMex(const astra::float32 * const in, mxArray * const outArray) +{ + const long long tot_size = mxGetNumberOfElements(outArray); + const long long block = 32; + const long long tot_rounded_size = ROUND_DOWN(tot_size, block); + + if (mxIsDouble(outArray)) { + double * const pdMatlabData = mxGetPr(outArray); + +#pragma omp for nowait + for (long long count = 0; count < tot_rounded_size; count += block) { + STORE_32F_64F_CORE8(in, pdMatlabData, count, 0); + STORE_32F_64F_CORE8(in, pdMatlabData, count, 8); + STORE_32F_64F_CORE8(in, pdMatlabData, count, 16); + STORE_32F_64F_CORE8(in, pdMatlabData, count, 24); + } +#pragma omp for nowait + for (long long count = tot_rounded_size; count < tot_size; count++) { + pdMatlabData[count] = in[count]; + } + } + else if (mxIsSingle(outArray)) { + float * const pfMatlabData = (float *) mxGetData(outArray); + +#pragma omp for nowait + for (long long count = 0; count < tot_rounded_size; count += block) { + STORE_32F_32F_CORE8(in, pfMatlabData, count, 0); + STORE_32F_32F_CORE8(in, pfMatlabData, count, 8); + STORE_32F_32F_CORE8(in, pfMatlabData, count, 16); + STORE_32F_32F_CORE8(in, pfMatlabData, count, 24); + } +#pragma omp for nowait + for (long long count = tot_rounded_size; count < tot_size; count++) { + pfMatlabData[count] = in[count]; + } + } + else { +#pragma omp single nowait + mexWarnMsgIdAndTxt("ASTRA_MEX:wrong_datatype", warnDataTypeNotSupported); + } +} + +void +_initializeCFloat32Array(const astra::float32 & val, astra::float32 * const out, + const size_t & tot_size) +{ +#ifdef __SSE2__ + const long long block = 32; + const long long tot_rounded_size = ROUND_DOWN(tot_size, block); + + const __m128 vecVal = _mm_set1_ps(val); + + { +#pragma omp for nowait + for (long long count = 0; count < tot_rounded_size; count += block) { + STORE_CONST_32F_CORE8(vecVal, out, count, 0); + STORE_CONST_32F_CORE8(vecVal, out, count, 8); + STORE_CONST_32F_CORE8(vecVal, out, count, 16); + STORE_CONST_32F_CORE8(vecVal, out, count, 24); + } +#else + const long long tot_rounded_size = 0; + { +#endif +#pragma omp for nowait + for (long long count = tot_rounded_size; count < (long long)tot_size; count++) { + out[count] = val; + } + } +} + +void +copyMexToCFloat32Array(const mxArray * const in, + astra::float32 * const out, const size_t &tot_size) +{ +#pragma omp parallel + { + // fill with scalar value + if (mex_is_scalar(in)) { + astra::float32 fValue = 0.f; + if (!mxIsEmpty(in)) { + fValue = (astra::float32)mxGetScalar(in); + } + _initializeCFloat32Array(fValue, out, tot_size); + } + // fill with array value + else { + _copyMexToCFloat32Array(in, out); + } + } +} + +void +copyCFloat32ArrayToMex(const float * const in, mxArray * const outArray) +{ +#pragma omp parallel + { + _copyCFloat32ArrayToMex(in, outArray); + } +} diff --git a/matlab/mex/mexCopyDataHelpFunctions.h b/matlab/mex/mexCopyDataHelpFunctions.h new file mode 100644 index 0000000..d0cf3c6 --- /dev/null +++ b/matlab/mex/mexCopyDataHelpFunctions.h @@ -0,0 +1,53 @@ +/* +----------------------------------------------------------------------- +Copyright 2013 iMinds-Vision Lab, University of Antwerp + +Contact: astra@ua.ac.be +Website: http://astra.ua.ac.be + + +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 +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +The ASTRA Toolbox is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with the ASTRA Toolbox. If not, see . + +----------------------------------------------------------------------- +$Id$ +*/ + +#ifndef MEXCOPYDATAHELPFUNCTIONS_H_ +#define MEXCOPYDATAHELPFUNCTIONS_H_ + +#include + +#include "astra/Globals.h" + +#include + +void copyMexToCFloat32Array(const mxArray * const, astra::float32 * const, + const size_t &); +void copyCFloat32ArrayToMex(const astra::float32 * const, mxArray * const); + +template +mxArray * createEquivMexArray(const AType * const pDataObj) +{ + mwSize dims[3]; + dims[0] = pDataObj->getWidth(); + dims[1] = pDataObj->getHeight(); + dims[2] = pDataObj->getDepth(); + + return mxCreateNumericArray(3, dims, MType, mxREAL); +} + +#endif /* MEXCOPYDATAHELPFUNCTIONS_H_ */ diff --git a/matlab/mex/mexDataManagerHelpFunctions.cpp b/matlab/mex/mexDataManagerHelpFunctions.cpp new file mode 100644 index 0000000..2985a9d --- /dev/null +++ b/matlab/mex/mexDataManagerHelpFunctions.cpp @@ -0,0 +1,371 @@ +/* +----------------------------------------------------------------------- +Copyright 2013 iMinds-Vision Lab, University of Antwerp + +Contact: astra@ua.ac.be +Website: http://astra.ua.ac.be + + +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 +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +The ASTRA Toolbox is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with the ASTRA Toolbox. If not, see . + +----------------------------------------------------------------------- +$Id$ +*/ + +#include "mexDataManagerHelpFunctions.h" + +#include "mexHelpFunctions.h" + +#include "astra/ParallelProjectionGeometry3D.h" +#include "astra/ParallelVecProjectionGeometry3D.h" +#include "astra/ConeProjectionGeometry3D.h" +#include "astra/ConeVecProjectionGeometry3D.h" +#include "astra/Float32VolumeData3DMemory.h" +#include "astra/Float32ProjectionData3DMemory.h" + +#define USE_MATLAB_UNDOCUMENTED + +#ifdef USE_MATLAB_UNDOCUMENTED +extern "C" { +mxArray *mxCreateSharedDataCopy(const mxArray *pr); +bool mxUnshareArray(const mxArray *pr, const bool noDeepCopy); +mxArray *mxUnreference(const mxArray *pr); +#if 0 +// Unsupported in Matlab R2014b +bool mxIsSharedArray(const mxArray *pr); +#endif +} + +class CFloat32CustomMemoryMatlab3D : public astra::CFloat32CustomMemory { +public: + // offset allows linking the data object to a sub-volume (in the z direction) + // offset is measured in floats. + CFloat32CustomMemoryMatlab3D(const mxArray* _pArray, bool bUnshare, size_t iOffset) + { + // Convert from slice to offset + mwSize dims[3]; + get3DMatrixDims(_pArray, dims); + iOffset *= dims[0]; + iOffset *= dims[1]; + + //fprintf(stderr, "Passed:\narray: %p\tdata: %p\n", (void*)_pArray, (void*)mxGetData(_pArray)); + // First unshare the input array, so that we may modify it. + if (bUnshare) { +#if 0 + // Unsupported in Matlab R2014b + if (mxIsSharedArray(_pArray)) { + fprintf(stderr, "Performance note: unsharing shared array in link\n"); + } +#endif + mxUnshareArray(_pArray, false); + //fprintf(stderr, "Unshared:\narray: %p\tdata: %p\n", (void*)_pArray, (void*)mxGetData(_pArray)); + } + // Then create a (persistent) copy so the data won't be deleted + // or changed. + m_pLink = mxCreateSharedDataCopy(_pArray); + //fprintf(stderr, "SharedDataCopy:\narray: %p\tdata: %p\n", (void*)m_pLink, (void*)mxGetData(m_pLink)); + mexMakeArrayPersistent(m_pLink); + m_fPtr = (float *)mxGetData(m_pLink); + m_fPtr += iOffset; + } + virtual ~CFloat32CustomMemoryMatlab3D() { + // destroy the shared array + //fprintf(stderr, "Destroy:\narray: %p\tdata: %p\n", (void*)m_pLink, (void*)mxGetData(m_pLink)); + mxDestroyArray(m_pLink); + } +private: + mxArray* m_pLink; +}; +#endif + +//----------------------------------------------------------------------------------------- +bool +checkID(const astra::int32 & id, astra::CFloat32Data3DMemory *& pDataObj) +{ + pDataObj = dynamic_cast( + astra::CData3DManager::getSingleton().get(id) ); + return (pDataObj && pDataObj->isInitialized()); +} + +//----------------------------------------------------------------------------------------- +bool +checkDataType(const mxArray * const in) +{ + return (mex_is_scalar(in) || mxIsDouble(in) || mxIsSingle(in)); +} + +//----------------------------------------------------------------------------------------- +bool +checkStructs(const mxArray * const in) +{ + return mxIsStruct(in); +} + +//----------------------------------------------------------------------------------------- +bool +checkDataSize(const mxArray * const mArray, + const astra::CProjectionGeometry3D * const geom) +{ + mwSize dims[3]; + get3DMatrixDims(mArray, dims); + return (geom->getDetectorColCount() == dims[0] + && geom->getProjectionCount() == dims[1] + && geom->getDetectorRowCount() == dims[2]); +} + +//----------------------------------------------------------------------------------------- +bool +checkDataSize(const mxArray * const mArray, + const astra::CVolumeGeometry3D * const geom) +{ + mwSize dims[3]; + get3DMatrixDims(mArray, dims); + return (geom->getGridColCount() == dims[0] + && geom->getGridRowCount() == dims[1] + && geom->getGridSliceCount() == dims[2]); +} + +//----------------------------------------------------------------------------------------- +bool +checkDataSize(const mxArray * const mArray, + const astra::CProjectionGeometry3D * const geom, + const mwIndex & zOffset) +{ + mwSize dims[3]; + get3DMatrixDims(mArray, dims); + return (geom->getDetectorColCount() == dims[0] + && geom->getProjectionCount() == dims[1] + && (zOffset + geom->getDetectorRowCount()) <= dims[2]); +} + +//----------------------------------------------------------------------------------------- +bool +checkDataSize(const mxArray * const mArray, + const astra::CVolumeGeometry3D * const geom, + const mwIndex & zOffset) +{ + mwSize dims[3]; + get3DMatrixDims(mArray, dims); + return (geom->getGridColCount() == dims[0] + && geom->getGridRowCount() == dims[1] + && (zOffset + geom->getGridSliceCount()) <= dims[2]); +} + +//----------------------------------------------------------------------------------------- +void +updateStatistics(const std::vector & vecIn) +{ + const size_t tot_size = vecIn.size(); + for (size_t count = 0; count < tot_size; count++) + { + vecIn[count]->updateStatistics(); + } +} + +//----------------------------------------------------------------------------------------- +void +getDataPointers(const std::vector & vecIn, + std::vector & vecOut) +{ + const size_t tot_size = vecIn.size(); + vecOut.resize(tot_size); + for (size_t count = 0; count < tot_size; count++) + { + vecOut[count] = vecIn[count]->getData(); + } +} + +//----------------------------------------------------------------------------------------- +void +getDataSizes(const std::vector & vecIn, + std::vector & vecOut) +{ + const size_t tot_size = vecIn.size(); + vecOut.resize(tot_size); + for (size_t count = 0; count < tot_size; count++) + { + vecOut[count] = vecIn[count]->getSize(); + } +} + +//----------------------------------------------------------------------------------------- +astra::CFloat32Data3DMemory * +allocateDataObject(const std::string & sDataType, + const mxArray * const geometry, const mxArray * const data, + const mxArray * const unshare, const mxArray * const zIndex) +{ + astra::CFloat32Data3DMemory* pDataObject3D = NULL; + + bool bUnshare = true; + if (unshare) + { + if (!mex_is_scalar(unshare)) + { + mexErrMsgTxt("Argument 5 (read-only) must be scalar"); + return NULL; + } + // unshare the array if we're not linking read-only + bUnshare = !(bool)mxGetScalar(unshare); + } + + mwIndex iZ = 0; + if (zIndex) + { + if (!mex_is_scalar(zIndex)) + { + mexErrMsgTxt("Argument 6 (Z) must be scalar"); + return NULL; + } + iZ = (mwSignedIndex)mxGetScalar(zIndex); + } + + // SWITCH DataType + if (sDataType == "-vol") + { + // Read geometry + astra::XMLDocument* xml = struct2XML("VolumeGeometry", geometry); + if (!xml) { + return NULL; + } + astra::Config cfg; + cfg.self = xml->getRootNode(); + + astra::CVolumeGeometry3D* pGeometry = new astra::CVolumeGeometry3D(); + if (!pGeometry->initialize(cfg)) + { + mexErrMsgTxt("Geometry class not initialized. \n"); + delete pGeometry; + delete xml; + return NULL; + } + delete xml; + + // If data is specified, check dimensions + if (data && !mex_is_scalar(data)) + { + if (! (zIndex + ? checkDataSize(data, pGeometry, iZ) + : checkDataSize(data, pGeometry)) ) + { + mexErrMsgTxt("The dimensions of the data do not match those specified in the geometry. \n"); + delete pGeometry; + return NULL; + } + } + + // Initialize data object +#ifdef USE_MATLAB_UNDOCUMENTED + if (unshare) { + CFloat32CustomMemoryMatlab3D* pHandle = + new CFloat32CustomMemoryMatlab3D(data, bUnshare, iZ); + + // Initialize data object + pDataObject3D = new astra::CFloat32VolumeData3DMemory(pGeometry, pHandle); + } + else + { + pDataObject3D = new astra::CFloat32VolumeData3DMemory(pGeometry); + } +#else + pDataObject3D = new astra::CFloat32VolumeData3DMemory(pGeometry); +#endif + delete pGeometry; + } + else if (sDataType == "-sino" || sDataType == "-proj3d" || sDataType == "-sinocone") + { + // Read geometry + astra::XMLDocument* xml = struct2XML("ProjectionGeometry", geometry); + if (!xml) { + return NULL; + } + astra::Config cfg; + cfg.self = xml->getRootNode(); + + // FIXME: Change how the base class is created. (This is duplicated + // in Projector2D.cpp.) + std::string type = cfg.self->getAttribute("type"); + astra::CProjectionGeometry3D* pGeometry = 0; + if (type == "parallel3d") { + pGeometry = new astra::CParallelProjectionGeometry3D(); + } else if (type == "parallel3d_vec") { + pGeometry = new astra::CParallelVecProjectionGeometry3D(); + } else if (type == "cone") { + pGeometry = new astra::CConeProjectionGeometry3D(); + } else if (type == "cone_vec") { + pGeometry = new astra::CConeVecProjectionGeometry3D(); + } else { + mexErrMsgTxt("Invalid geometry type.\n"); + return NULL; + } + + if (!pGeometry->initialize(cfg)) { + mexErrMsgTxt("Geometry class not initialized. \n"); + delete pGeometry; + delete xml; + return NULL; + } + delete xml; + + // If data is specified, check dimensions + if (data && !mex_is_scalar(data)) + { + if (! (zIndex + ? checkDataSize(data, pGeometry, iZ) + : checkDataSize(data, pGeometry)) ) + { + mexErrMsgTxt("The dimensions of the data do not match those specified in the geometry. \n"); + delete pGeometry; + return NULL; + } + } + + // Initialize data object +#ifdef USE_MATLAB_UNDOCUMENTED + if (unshare) + { + CFloat32CustomMemoryMatlab3D* pHandle = + new CFloat32CustomMemoryMatlab3D(data, bUnshare, iZ); + + // Initialize data object + pDataObject3D = new astra::CFloat32ProjectionData3DMemory(pGeometry, pHandle); + } + else + { + pDataObject3D = new astra::CFloat32ProjectionData3DMemory(pGeometry); + } +#else + pDataObject3D = new astra::CFloat32ProjectionData3DMemory(pGeometry); +#endif + delete pGeometry; + } + else + { + mexErrMsgTxt("Invalid datatype. Please specify '-vol' or '-proj3d'. \n"); + return NULL; + } + + // Check initialization + if (!pDataObject3D->isInitialized()) + { + mexErrMsgTxt("Couldn't initialize data object.\n"); + delete pDataObject3D; + return NULL; + } + + return pDataObject3D; +} + diff --git a/matlab/mex/mexDataManagerHelpFunctions.h b/matlab/mex/mexDataManagerHelpFunctions.h new file mode 100644 index 0000000..36b74d8 --- /dev/null +++ b/matlab/mex/mexDataManagerHelpFunctions.h @@ -0,0 +1,90 @@ +/* +----------------------------------------------------------------------- +Copyright 2013 iMinds-Vision Lab, University of Antwerp + +Contact: astra@ua.ac.be +Website: http://astra.ua.ac.be + + +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 +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +The ASTRA Toolbox is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with the ASTRA Toolbox. If not, see . + +----------------------------------------------------------------------- +$Id$ +*/ + +#ifndef MEXDATAMANAGERHELPFUNCTIONS_H_ +#define MEXDATAMANAGERHELPFUNCTIONS_H_ + +#include + +#include "astra/Globals.h" +#include "astra/AstraObjectManager.h" +#include "astra/Float32Data3DMemory.h" +#include "astra/ProjectionGeometry3D.h" +#include "astra/VolumeGeometry3D.h" + +#include "mexCopyDataHelpFunctions.h" + +bool checkID(const astra::int32 &, astra::CFloat32Data3DMemory *&); + +bool checkDataType(const mxArray * const); +bool checkStructs(const mxArray * const); + +bool checkDataSize(const mxArray * const, const astra::CProjectionGeometry3D * const); +bool checkDataSize(const mxArray * const, const astra::CVolumeGeometry3D * const); +bool checkDataSize(const mxArray * const, const astra::CProjectionGeometry3D * const, + const mwIndex & zOffset); +bool checkDataSize(const mxArray * const, const astra::CVolumeGeometry3D * const, + const mwIndex & zOffset); + +void updateStatistics(const std::vector &); + +void getDataPointers(const std::vector &, + std::vector &); +void getDataSizes(const std::vector &, + std::vector &); + +astra::CFloat32Data3DMemory * allocateDataObject(const std::string & sDataType, + const mxArray * const geometry, const mxArray * const data, + const mxArray * const unshare = NULL, const mxArray * const zOffset = NULL); + +//----------------------------------------------------------------------------------------- +template +void generic_astra_mex_data3d_get(int nlhs, mxArray* plhs[], int nrhs, + const mxArray* prhs[]) +{ + // step1: input + if (nrhs < 2) { + mexErrMsgTxt("Not enough arguments. See the help document for a detailed argument list. \n"); + return; + } + + // step2: get data object/s + astra::CFloat32Data3DMemory* pDataObject = NULL; + if (!checkID(mxGetScalar(prhs[1]), pDataObject)) { + mexErrMsgTxt("Data object not found or not initialized properly.\n"); + return; + } + + // create output + if (1 <= nlhs) { + plhs[0] = createEquivMexArray(pDataObject); + copyCFloat32ArrayToMex(pDataObject->getData(), plhs[0]); + } +} + +#endif /* MEXDATAMANAGERHELPFUNCTIONS_H_ */ -- cgit v1.2.3 From 2a28642b457afc13a2f8fc6219044994c7dc51e0 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 5 Dec 2014 12:22:36 +0100 Subject: Remove unused stubs from mex_data3d --- matlab/mex/astra_mex_data3d_c.cpp | 432 +------------------------------------- 1 file changed, 2 insertions(+), 430 deletions(-) diff --git a/matlab/mex/astra_mex_data3d_c.cpp b/matlab/mex/astra_mex_data3d_c.cpp index 7c2af8f..a1ff42c 100644 --- a/matlab/mex/astra_mex_data3d_c.cpp +++ b/matlab/mex/astra_mex_data3d_c.cpp @@ -175,47 +175,6 @@ void astra_mex_data3d_link(int& nlhs, mxArray* plhs[], int& nrhs, const mxArray* #endif -//----------------------------------------------------------------------------------------- -/** - * [id] = astra_mex_io_data('create_cache', config); - */ -void astra_mex_data3d_create_cache(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) -{ -// if (nrhs < 2) { -// mexErrMsgTxt("Not enough arguments. See the help document for a detailed argument list. \n"); -// return; -// } -// -// if (!mxIsStruct(prhs[1])) { -// mexErrMsgTxt("Argument 1 not a valid MATLAB struct. \n"); -// } -// -// // turn MATLAB struct to an XML-based Config object -// XMLDocument* xml = struct2XML("Data3D", prhs[1]); -// Config cfg; -// cfg.self = xml->getRootNode(); -// -// // create dataobject -// string sType = cfg.self->getAttribute("type"); -// int iIndex; -// if (sType == "ProjectionCached") { -// CFloat32ProjectionData3DCached* pData = new CFloat32ProjectionData3DCached(cfg); -// iIndex = CData3DManager::getSingleton().store(pData); -// } -//// else if (sType == "VolumeCached") { -//// CFloat32VolumeData3DCached* pData = new CFloat32VolumeData3DCached(cfg); -//// pData->initialize(cfg); -//// iIndex = CData3DManager::getSingleton().store(pData); -//// } -// -// // step4: set output -// if (1 <= nlhs) { -// plhs[0] = mxCreateDoubleScalar(iIndex); -// } - -} - - //----------------------------------------------------------------------------------------- /** * data = astra_mex_data3d('get', id); @@ -278,326 +237,6 @@ void astra_mex_data3d_store(int nlhs, mxArray* plhs[], int nrhs, const mxArray* pDataObject->updateStatistics(); } - -//----------------------------------------------------------------------------------------- -/** - * [id] = astra_mex_io_data('fetch_slice', id, slicenr); - */ -void astra_mex_data3d_fetch_slice_z(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) -{ -// // step1: get input -// if (nrhs < 3) { -// mexErrMsgTxt("Not enough arguments. See the help document for a detailed argument list. \n"); -// return; -// } -// int iDid = (int)(mxGetScalar(prhs[1])); -// int iSliceNr = (int)(mxGetScalar(prhs[2])); -// -// // Get data object -// CFloat32Data3D* pData = CData3DManager::getSingleton().get(iDid); -// if (!pData) { -// mexErrMsgTxt("DataObject not valid. \n"); -// return; -// } -// -// CFloat32Data2D* res = NULL; -// // Projection Data -// if (pData->getType() == CFloat32Data3D::PROJECTION) { -// CFloat32ProjectionData3D* pData2 = dynamic_cast(pData); -//// res = pData2->fetchSlice(iSliceNr); -// } -// // Volume Data -// else if (pData->getType() == CFloat32Data3D::VOLUME) { -// CFloat32VolumeData3D* pData2 = dynamic_cast(pData); -//// res = pData2->fetchSliceZ(iSliceNr); -// } -// // Error -// else { -// mexErrMsgTxt("DataObject not valid. \n"); -// return; -// } -// -// // store data -// int iIndex = CData2DManager::getSingleton().store(res); -// -// // step4: set output -// if (1 <= nlhs) { -// plhs[0] = mxCreateDoubleScalar(iIndex); -// } -} - -//----------------------------------------------------------------------------------------- -/** - * astra_mex_io_data('returnSlice', id, slicenr); - */ -void astra_mex_data3d_return_slice_z(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) -{ -// // step1: get input -// if (nrhs < 3) { -// mexErrMsgTxt("Not enough arguments. See the help document for a detailed argument list. \n"); -// return; -// } -// int iDid = (int)(mxGetScalar(prhs[1])); -// int iSliceNr = (int)(mxGetScalar(prhs[2])); -// -// // Get data object -// CFloat32Data3D* pData = CData3DManager::getSingleton().get(iDid); -// if (!pData) { -// mexErrMsgTxt("DataObject not valid. \n"); -// return; -// } -// -// // Projection Data -// if (pData->getType() == CFloat32Data3D::PROJECTION) { -// CFloat32ProjectionData3D* pData2 = dynamic_cast(pData); -//// TODO: think about returning slices -//// pData2->returnSlice(iSliceNr); -// } -// // Volume Data -// else if (pData->getType() == CFloat32Data3D::VOLUME) { -// CFloat32VolumeData3D* pData2 = dynamic_cast(pData); -//// TODO: think about returning slices -//// pData2->returnSliceZ(iSliceNr); -// } -// // Error -// else { -// mexErrMsgTxt("DataObject not valid. \n"); -// return; -// } -} - -//----------------------------------------------------------------------------------------- -/** - * [id] = astra_mex_io_data('fetch_projection', id, slicenr); - */ -void astra_mex_data3d_fetch_projection(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) -{ - //// step1: get input - //if (nrhs < 3) { - // mexErrMsgTxt("Not enough arguments. See the help document for a detailed argument list. \n"); - // return; - //} - //int iDid = (int)(mxGetScalar(prhs[1])); - //int iProjectionNr = (int)(mxGetScalar(prhs[2])); - - //// Get data object - //CFloat32Data3D* pData = CData3DManager::getSingleton().get(iDid); - //if (!pData) { - // mexErrMsgTxt("DataObject not valid. \n"); - // return; - //} - - //CFloat32Data2D* res = NULL; - //// Projection Data - //if (pData->getType() == CFloat32Data3D::PROJECTION) { - // CFloat32ProjectionData3D* pData2 = dynamic_cast(pData); - // res = pData2->fetchProjection(iProjectionNr); - //} - //// Error - //else { - // mexErrMsgTxt("DataObject not valid. \n"); - // return; - //} - // - //// store data - //int iIndex = CData2DManager::getSingleton().store(res); - - //// step4: set output - //if (1 <= nlhs) { - // plhs[0] = mxCreateDoubleScalar(iIndex); - //} -} - -//----------------------------------------------------------------------------------------- -/** - * astra_mex_io_data('return_projection', id, slicenr); - */ -void astra_mex_data3d_return_projection(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) -{ - //// step1: get input - //if (nrhs < 3) { - // mexErrMsgTxt("Not enough arguments. See the help document for a detailed argument list. \n"); - // return; - //} - //int iDid = (int)(mxGetScalar(prhs[1])); - //int iProjectionNr = (int)(mxGetScalar(prhs[2])); - - //// Get data object - //CFloat32Data3D* pData = CData3DManager::getSingleton().get(iDid); - //if (!pData) { - // mexErrMsgTxt("DataObject not valid. \n"); - // return; - //} - - //// Projection Data - //if (pData->getType() == CFloat32Data3D::PROJECTION) { - // CFloat32ProjectionData3D* pData2 = dynamic_cast(pData); - //// pData2->returnProjection(iProjectionNr); - //} - //// Error - //else { - // mexErrMsgTxt("DataObject not valid. \n"); - // return; - //} -} - -//----------------------------------------------------------------------------------------- -/** - * [id] = astra_mex_io_data('fetch_projection', id, slicenr); - */ -void astra_mex_data3d_fetch_slice_x(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) -{ - //// step1: get input - //if (nrhs < 3) { - // mexErrMsgTxt("Not enough arguments. See the help document for a detailed argument list. \n"); - // return; - //} - //int iDid = (int)(mxGetScalar(prhs[1])); - //int iSliceNr = (int)(mxGetScalar(prhs[2])); - - //// Get data object - //CFloat32Data3D* pData = CData3DManager::getSingleton().get(iDid); - //if (!pData) { - // mexErrMsgTxt("DataObject not valid. \n"); - // return; - //} - - //CFloat32Data2D* res = NULL; - //// Projection Data - //if (pData->getType() == CFloat32Data3D::VOLUME) { - // CFloat32VolumeData3D* pData2 = dynamic_cast(pData); - // res = pData2->fetchSliceX(iSliceNr); - //} - //// Error - //else { - // mexErrMsgTxt("DataObject not valid. \n"); - // return; - //} - // - //// store data - //int iIndex = CData2DManager::getSingleton().store(res); - - //// step4: set output - //if (1 <= nlhs) { - // plhs[0] = mxCreateDoubleScalar(iIndex); - //} -} - -//----------------------------------------------------------------------------------------- -/** - * astra_mex_io_data('return_slice_x', id, slicenr); - */ -void astra_mex_data3d_return_slice_x(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) -{ -// // step1: get input -// if (nrhs < 3) { -// mexErrMsgTxt("Not enough arguments. See the help document for a detailed argument list. \n"); -// return; -// } -// int iDid = (int)(mxGetScalar(prhs[1])); -// int iSliceNr = (int)(mxGetScalar(prhs[2])); -// -// // Get data object -// CFloat32Data3D* pData = CData3DManager::getSingleton().get(iDid); -// if (!pData) { -// mexErrMsgTxt("DataObject not valid. \n"); -// return; -// } -// -// // Projection Data -// if (pData->getType() == CFloat32Data3D::VOLUME) { -// CFloat32VolumeData3D* pData2 = dynamic_cast(pData); -//// TODO: think about returning slices -//// pData2->returnSliceX(iSliceNr); -// } -// // Error -// else { -// mexErrMsgTxt("DataObject not valid. \n"); -// return; -// } -} - - -//----------------------------------------------------------------------------------------- -/** - * [id] = astra_mex_io_data('fetch_slice_y', id, slicenr); - */ -void astra_mex_data3d_fetch_slice_y(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) -{ - //// step1: get input - //if (nrhs < 3) { - // mexErrMsgTxt("Not enough arguments. See the help document for a detailed argument list. \n"); - // return; - //} - //int iDid = (int)(mxGetScalar(prhs[1])); - //int iSliceNr = (int)(mxGetScalar(prhs[2])); - - //// Get data object - //CFloat32Data3D* pData = CData3DManager::getSingleton().get(iDid); - //if (!pData) { - // mexErrMsgTxt("DataObject not valid. \n"); - // return; - //} - - //CFloat32Data2D* res = NULL; - //// Projection Data - //if (pData->getType() == CFloat32Data3D::VOLUME) { - // CFloat32VolumeData3D* pData2 = dynamic_cast(pData); - // res = pData2->fetchSliceY(iSliceNr); - //} - //// Error - //else { - // mexErrMsgTxt("DataObject not valid. \n"); - // return; - //} - // - //// store data - //int iIndex = CData2DManager::getSingleton().store(res); - - //// step4: set output - //if (1 <= nlhs) { - // plhs[0] = mxCreateDoubleScalar(iIndex); - //} -} - -//----------------------------------------------------------------------------------------- -/** - * astra_mex_io_data('return_slice_y', id, slicenr); - */ -void astra_mex_data3d_return_slice_y(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) -{ -// // step1: get input -// if (nrhs < 3) { -// mexErrMsgTxt("Not enough arguments. See the help document for a detailed argument list. \n"); -// return; -// } -// int iDid = (int)(mxGetScalar(prhs[1])); -// int iSliceNr = (int)(mxGetScalar(prhs[2])); -// -// // Get data object -// CFloat32Data3D* pData = CData3DManager::getSingleton().get(iDid); -// if (!pData) { -// mexErrMsgTxt("DataObject not valid. \n"); -// return; -// } -// -// // Projection Data -// if (pData->getType() == CFloat32Data3D::VOLUME) { -// CFloat32VolumeData3D* pData2 = dynamic_cast(pData); -//// TODO: think about returning slices -//// pData2->returnSliceY(iSliceNr); -// } -// // Error -// else { -// mexErrMsgTxt("DataObject not valid. \n"); -// return; -// } -} - -//----------------------------------------------------------------------------------------- -/** - * [dim_x dim_y dim_z] = astra_mex_io_data('dimensions', id); - */ void astra_mex_data3d_dimensions(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) { // step1: get input @@ -671,50 +310,6 @@ void astra_mex_data3d_geometry(int nlhs, mxArray* plhs[], int nrhs, const mxArra //} } -//----------------------------------------------------------------------------------------- -/** - * [geom_xml] = astra_mex_data3d('geometry_xml', id); - */ -void astra_mex_data3d_geometry_xml(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) -{ - //// Get input - //if (nrhs < 2) { - // mexErrMsgTxt("Not enough arguments. See the help document for a detailed argument list. \n"); - // return; - //} - //int iDid = (int)(mxGetScalar(prhs[1])); - - //// Get data object - //CFloat32Data3D* pData = CData3DManager::getSingleton().get(iDid); - //if (!pData) { - // mexErrMsgTxt("DataObject not valid. \n"); - // return; - //} - - //// Projection Data - //if (pData->getType() == CFloat32Data3D::PROJECTION) { - // CFloat32ProjectionData3D* pData2 = dynamic_cast(pData); - // CProjectionGeometry3D* pProjGeom = pData2->getGeometry(); - // XMLDocument* config = pProjGeom->toXML(); - - // if (1 <= nlhs) { - // plhs[0] = mxCreateString(config->getRootNode()->toString().c_str()); - // } - //} - //// Volume Data - //else if (pData->getType() == CFloat32Data3D::VOLUME) { - //// CFloat32VolumeData3D* pData2 = dynamic_cast(pData); - //// CVolumeGeometry2D* pVolGeom = pData2->getGeometry2D(iSliceNr); - //// if (1 <= nlhs) { - //// plhs[0] = createVolumeGeometryStruct(pVolGeom); - //// } - //} - //// Error - //else { - // mexErrMsgTxt("Type not valid. \n"); - // return; - //} -} //----------------------------------------------------------------------------------------- /** * astra_mex_data3d('delete', did1, did2, ...); @@ -756,11 +351,8 @@ void astra_mex_data3d_info(int nlhs, mxArray* plhs[], int nrhs, const mxArray* p static void printHelp() { mexPrintf("Please specify a mode of operation.\n"); - mexPrintf("Valid modes: create, create_cache, get, get_single, delete, clear, info\n"); - mexPrintf(" fetch_projection, return_projection, fetch_slice[_z],\n"); - mexPrintf(" return_slice[_z], fetch_slice_x, return slice_x\n"); - mexPrintf(" fetch_slice_y, return slice_y, dimensions, geometry\n"); - mexPrintf(" geometry_xml\n"); + mexPrintf("Valid modes: create, get, get_single, delete, clear, info\n"); + mexPrintf(" dimensions\n"); } @@ -788,8 +380,6 @@ void mexFunction(int nlhs, mxArray* plhs[], } else if (sMode == "link") { astra_mex_data3d_link(nlhs, plhs, nrhs, prhs); #endif - } else if (sMode == std::string("create_cache")) { - astra_mex_data3d_create_cache(nlhs, plhs, nrhs, prhs); } else if (sMode == std::string("get")) { astra_mex_data3d_get(nlhs, plhs, nrhs, prhs); } else if (sMode == std::string("get_single")) { @@ -803,28 +393,10 @@ void mexFunction(int nlhs, mxArray* plhs[], astra_mex_data3d_clear(nlhs, plhs, nrhs, prhs); } else if (sMode == "info") { astra_mex_data3d_info(nlhs, plhs, nrhs, prhs); - } else if (sMode == std::string("fetch_projection")) { - astra_mex_data3d_fetch_projection(nlhs, plhs, nrhs, prhs); - } else if (sMode == std::string("return_projection")) { - astra_mex_data3d_return_projection(nlhs, plhs, nrhs, prhs); - } else if (sMode == std::string("fetch_slice") || sMode == std::string("fetch_slice_z")) { - astra_mex_data3d_fetch_slice_z(nlhs, plhs, nrhs, prhs); - } else if (sMode == std::string("return_slice") || sMode == std::string("return_slice_z")) { - astra_mex_data3d_return_slice_z(nlhs, plhs, nrhs, prhs); - } else if (sMode == std::string("fetch_slice_x")) { - astra_mex_data3d_fetch_slice_x(nlhs, plhs, nrhs, prhs); - } else if (sMode == std::string("return_slice_x")) { - astra_mex_data3d_return_slice_x(nlhs, plhs, nrhs, prhs); - } else if (sMode == std::string("fetch_slice_y")) { - astra_mex_data3d_fetch_slice_y(nlhs, plhs, nrhs, prhs); - } else if (sMode == std::string("return_slice_y")) { - astra_mex_data3d_return_slice_y(nlhs, plhs, nrhs, prhs); } else if (sMode == std::string("dimensions")) { astra_mex_data3d_dimensions(nlhs, plhs, nrhs, prhs); } else if (sMode == std::string("geometry")) { astra_mex_data3d_geometry(nlhs, plhs, nrhs, prhs); - } else if (sMode == std::string("geometry_xml")) { - astra_mex_data3d_geometry_xml(nlhs, plhs, nrhs, prhs); } else { printHelp(); } -- cgit v1.2.3 From 70f522a7a64fa609766c1f5d5edcddc6ec143c6c Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Tue, 25 Nov 2014 18:26:11 +0100 Subject: Remove unused files --- cuda/2d/dataop.cu | 130 -------------------- cuda/2d/dataop.h | 47 -------- src/ConvexHullAlgorithm.cpp | 239 ------------------------------------- src/CudaDataOperationAlgorithm.cpp | 1 - 4 files changed, 417 deletions(-) delete mode 100644 cuda/2d/dataop.cu delete mode 100644 cuda/2d/dataop.h delete mode 100644 src/ConvexHullAlgorithm.cpp diff --git a/cuda/2d/dataop.cu b/cuda/2d/dataop.cu deleted file mode 100644 index 4b64775..0000000 --- a/cuda/2d/dataop.cu +++ /dev/null @@ -1,130 +0,0 @@ -/* ------------------------------------------------------------------------ -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam - -Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox - -This file is part of the ASTRA Toolbox. - - -The ASTRA Toolbox is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -The ASTRA Toolbox is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with the ASTRA Toolbox. If not, see . - ------------------------------------------------------------------------ -$Id$ -*/ - -#include "util.h" -#include "dataop.h" -#include "arith.h" -#include - -namespace astraCUDA { - -void operationVolumeMult(float* data1, float* data2, unsigned int width, unsigned int height) -{ - float* D_data1; - float* D_data2; - - unsigned int pitch; - allocateVolume(D_data1, width, height, pitch); - copyVolumeToDevice(data1, width, width, height, D_data1, pitch); - - allocateVolume(D_data2, width, height, pitch); - copyVolumeToDevice(data2, width, width, height, D_data2, pitch); - - processVol(D_data1, D_data2, pitch, width, height); - - copyVolumeFromDevice(data1, width, width, height, D_data1, pitch); - - cudaFree(D_data1); - cudaFree(D_data2); -} - -void operationVolumeMultScalarMask(float* data, float* mask, float scalar, unsigned int width, unsigned int height) -{ - float* D_data; - float* D_mask; - - unsigned int pitch; - allocateVolume(D_data, width, height, pitch); - copyVolumeToDevice(data, width, width, height, D_data, pitch); - - allocateVolume(D_mask, width, height, pitch); - copyVolumeToDevice(mask, width, width, height, D_mask, pitch); - - processVol(D_data, D_mask, scalar, pitch, width, height); - - copyVolumeFromDevice(data, width, width, height, D_data, pitch); - - cudaFree(D_data); - cudaFree(D_mask); -} - - -void operationVolumeMultScalar(float* data, float scalar, unsigned int width, unsigned int height) -{ - float* D_data; - - unsigned int pitch; - allocateVolume(D_data, width, height, pitch); - copyVolumeToDevice(data, width, width, height, D_data, pitch); - - processVol(D_data, scalar, pitch, width, height); - - copyVolumeFromDevice(data, width, width, height, D_data, pitch); - - cudaFree(D_data); -} - - -void operationVolumeAdd(float* data1, float* data2, unsigned int width, unsigned int height) -{ - float* D_data1; - float* D_data2; - - unsigned int pitch; - allocateVolume(D_data1, width, height, pitch); - copyVolumeToDevice(data1, width, width, height, D_data1, pitch); - - allocateVolume(D_data2, width, height, pitch); - copyVolumeToDevice(data2, width, width, height, D_data2, pitch); - - processVol(D_data1, D_data2, pitch, width, height); - - copyVolumeFromDevice(data1, width, width, height, D_data1, pitch); - - cudaFree(D_data1); - cudaFree(D_data2); -} - - -void operationVolumeAddScalar(float* data, float scalar, unsigned int width, unsigned int height) -{ - float* D_data; - - unsigned int pitch; - allocateVolume(D_data, width, height, pitch); - copyVolumeToDevice(data, width, width, height, D_data, pitch); - - processVol(D_data, scalar, pitch, width, height); - - copyVolumeFromDevice(data, width, width, height, D_data, pitch); - - cudaFree(D_data); -} - - -} diff --git a/cuda/2d/dataop.h b/cuda/2d/dataop.h deleted file mode 100644 index 2693f1a..0000000 --- a/cuda/2d/dataop.h +++ /dev/null @@ -1,47 +0,0 @@ -/* ------------------------------------------------------------------------ -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam - -Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox - -This file is part of the ASTRA Toolbox. - - -The ASTRA Toolbox is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -The ASTRA Toolbox is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with the ASTRA Toolbox. If not, see . - ------------------------------------------------------------------------ -$Id$ -*/ - -#ifndef _CUDA_DATAOP_H -#define _CUDA_DATAOP_H - -#include - -namespace astraCUDA { - - void operationVolumeMult(float* data1, float* data2, unsigned int width, unsigned int height); - - void operationVolumeMultScalar(float* data, float scalar, unsigned int width, unsigned int height); - void operationVolumeMultScalarMask(float* data, float* mask, float scalar, unsigned int width, unsigned int height); - - void operationVolumeAdd(float* data1, float* data2, unsigned int width, unsigned int height); - - void operationVolumeAddScalar(float* data, float scalar, unsigned int width, unsigned int height); - -} - -#endif diff --git a/src/ConvexHullAlgorithm.cpp b/src/ConvexHullAlgorithm.cpp deleted file mode 100644 index fa69431..0000000 --- a/src/ConvexHullAlgorithm.cpp +++ /dev/null @@ -1,239 +0,0 @@ -/* ------------------------------------------------------------------------ -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam - -Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox - -This file is part of the ASTRA Toolbox. - - -The ASTRA Toolbox is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -The ASTRA Toolbox is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with the ASTRA Toolbox. If not, see . - ------------------------------------------------------------------------ -$Id$ -*/ - -#include "astra/ConvexHullAlgorithm.h" - -#include - -#include "astra/AstraObjectManager.h" -#include "astra/DataProjectorPolicies.h" - -using namespace std; - -namespace astra { - -#include "astra/Projector2DImpl.inl" - -// type of the algorithm, needed to register with CAlgorithmFactory -std::string CConvexHullAlgorithm::type = "ConvexHull"; - -//---------------------------------------------------------------------------------------- -// Constructor -CConvexHullAlgorithm::CConvexHullAlgorithm() -{ - _clear(); -} - -//--------------------------------------------------------------------------------------- -// Initialize - C++ -CConvexHullAlgorithm::CConvexHullAlgorithm(CProjector2D* _pProjector, - CFloat32ProjectionData2D* _pSinogram, - CFloat32VolumeData2D* _pReconstructionMask) -{ - _clear(); - initialize(_pProjector, _pSinogram, _pReconstructionMask); -} - -//---------------------------------------------------------------------------------------- -// Destructor -CConvexHullAlgorithm::~CConvexHullAlgorithm() -{ - clear(); -} - -//--------------------------------------------------------------------------------------- -// Clear - Constructors -void CConvexHullAlgorithm::_clear() -{ - m_bIsInitialized = false; - - m_pProjectionPixelWeight = NULL; - m_pReconstructionMask = NULL; - m_pSinogram = NULL; - - m_pProjector = NULL; - m_pDataProjector = NULL; -} - -//--------------------------------------------------------------------------------------- -// Clear - Public -void CConvexHullAlgorithm::clear() -{ - m_bIsInitialized = false; - - ASTRA_DELETE(m_pProjectionPixelWeight); - m_pReconstructionMask = NULL; - m_pSinogram = NULL; - - m_pProjector = NULL; - ASTRA_DELETE(m_pDataProjector); -} - -//---------------------------------------------------------------------------------------- -// Check -bool CConvexHullAlgorithm::_check() -{ - ASTRA_CONFIG_CHECK(m_pReconstructionMask, "ConvexHull", "Invalid ReconstructionMask Object"); - ASTRA_CONFIG_CHECK(m_pReconstructionMask->isInitialized(), "ConvexHull", "Invalid ReconstructionMask Object"); - ASTRA_CONFIG_CHECK(m_pProjectionPixelWeight, "ConvexHull", "Invalid ProjectionPixelWeight Object"); - ASTRA_CONFIG_CHECK(m_pProjectionPixelWeight->isInitialized(), "ConvexHull", "Invalid ProjectionPixelWeight Object"); - ASTRA_CONFIG_CHECK(m_pSinogram, "ConvexHull", "Invalid Sinogram Object"); - ASTRA_CONFIG_CHECK(m_pSinogram->isInitialized(), "ConvexHull", "Invalid Sinogram Object"); - - ASTRA_CONFIG_CHECK(m_pDataProjector, "ConvexHull", "Invalid Data Projector Policy"); - ASTRA_CONFIG_CHECK(m_pProjector, "ConvexHull", "Invalid Projector Object"); - ASTRA_CONFIG_CHECK(m_pProjector->isInitialized(), "ConvexHull", "Invalid Projector Object"); - - return true; -} - -//--------------------------------------------------------------------------------------- -// Initialize - Config -bool CConvexHullAlgorithm::initialize(const Config& _cfg) -{ - ASTRA_ASSERT(_cfg.self); - - // if already initialized, clear first - if (m_bIsInitialized) { - clear(); - } - - // projector - XMLNode* node = _cfg.self->getSingleNode("ProjectorId"); - ASTRA_CONFIG_CHECK(node, "ConvexHull", "No ProjectorId tag specified."); - int id = boost::lexical_cast(node->getContent()); - m_pProjector = CProjector2DManager::getSingleton().get(id); - ASTRA_DELETE(node); - - // sinogram data - node = _cfg.self->getSingleNode("ProjectionDataId"); - ASTRA_CONFIG_CHECK(node, "ConvexHull", "No ProjectionDataId tag specified."); - id = boost::lexical_cast(node->getContent()); - m_pSinogram = dynamic_cast(CData2DManager::getSingleton().get(id)); - ASTRA_DELETE(node); - - // reconstruction mask - node = _cfg.self->getSingleNode("ConvexHullDataId"); - ASTRA_CONFIG_CHECK(node, "ConvexHull", "No ReconstructionDataId tag specified."); - id = boost::lexical_cast(node->getContent()); - m_pReconstructionMask = dynamic_cast(CData2DManager::getSingleton().get(id)); - ASTRA_DELETE(node); - - // init data objects and data projectors - _init(); - - // success - m_bIsInitialized = _check(); - return m_bIsInitialized; -} - -//--------------------------------------------------------------------------------------- -// Initialize - C++ -bool CConvexHullAlgorithm::initialize(CProjector2D* _pProjector, - CFloat32ProjectionData2D* _pSinogram, - CFloat32VolumeData2D* _pReconstructionMask) -{ - // if already initialized, clear first - if (m_bIsInitialized) { - clear(); - } - - // required classes - m_pProjector = _pProjector; - m_pSinogram = _pSinogram; - m_pReconstructionMask = _pReconstructionMask; - - // init data objects and data projectors - _init(); - - // success - m_bIsInitialized = _check(); - return m_bIsInitialized; -} - -//--------------------------------------------------------------------------------------- -// Initialize Data Projectors - private -void CConvexHullAlgorithm::_init() -{ - // create data objects - m_pProjectionPixelWeight = new CFloat32VolumeData2D(m_pProjector->getVolumeGeometry()); - m_pProjectionPixelWeight->setData(0); - - // forward projection data projector - m_pDataProjector = dispatchDataProjector( - m_pProjector, - //SinogramMaskPolicy(m_pSinogramMask), // sinogram mask - TotalPixelWeightBySinogramPolicy(m_pSinogram, m_pProjectionPixelWeight) // pixel weight * sinogram - ); -} - -//--------------------------------------------------------------------------------------- -// Information - All -map CConvexHullAlgorithm::getInformation() -{ - map res; - return mergeMap(CAlgorithm::getInformation(), res); -}; - -//--------------------------------------------------------------------------------------- -// Information - Specific -boost::any CConvexHullAlgorithm::getInformation(std::string _sIdentifier) -{ - return CAlgorithm::getInformation(_sIdentifier); -}; - -//---------------------------------------------------------------------------------------- -// Iterate -void CConvexHullAlgorithm::run(int _iNrIterations) -{ - // check initialized - ASTRA_ASSERT(m_bIsInitialized); - - m_pReconstructionMask->setData(1.0f); - - // loop angles - for (int iProjection = 0; iProjection < m_pProjector->getProjectionGeometry()->getProjectionAngleCount(); ++iProjection) { - - m_pProjectionPixelWeight->setData(0.0f); - - // project - m_pDataProjector->projectSingleProjection(iProjection); - - // loop values and set to zero - for (int iPixel = 0; iPixel < m_pReconstructionMask->getSize(); ++iPixel) { - if (m_pProjectionPixelWeight->getData()[iPixel] == 0) { - m_pReconstructionMask->getData()[iPixel] = 0; - } - } - - } - -} -//---------------------------------------------------------------------------------------- - -} // namespace astra diff --git a/src/CudaDataOperationAlgorithm.cpp b/src/CudaDataOperationAlgorithm.cpp index aeb3f7a..f8bbd0b 100644 --- a/src/CudaDataOperationAlgorithm.cpp +++ b/src/CudaDataOperationAlgorithm.cpp @@ -30,7 +30,6 @@ $Id$ #include "astra/CudaDataOperationAlgorithm.h" -#include "../cuda/2d/dataop.h" #include "../cuda/2d/algo.h" #include "../cuda/2d/darthelper.h" #include "../cuda/2d/arith.h" -- cgit v1.2.3 From d7746d6d0c9172a6176d7467e68f96315d34b7b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20H=C3=A4ggstr=C3=B6m?= Date: Fri, 31 Oct 2014 14:00:38 +0100 Subject: Silence bogus warning: Warning: CudaSirtAlgorithm3D: unused configuration options: SinogramMaskId --- src/ReconstructionAlgorithm3D.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ReconstructionAlgorithm3D.cpp b/src/ReconstructionAlgorithm3D.cpp index d50431c..2a9a301 100644 --- a/src/ReconstructionAlgorithm3D.cpp +++ b/src/ReconstructionAlgorithm3D.cpp @@ -145,6 +145,7 @@ bool CReconstructionAlgorithm3D::initialize(const Config& _cfg) id = boost::lexical_cast(_cfg.self->getOption("SinogramMaskId")); m_pSinogramMask = dynamic_cast(CData3DManager::getSingleton().get(id)); } + CC.markOptionParsed("SinogramMaskId"); // Constraints - NEW if (_cfg.self->hasOption("MinConstraint")) { -- cgit v1.2.3 From d6d92ae3cdecf2f01806eb26f521ede479d37b7e Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 23 Jan 2015 16:51:24 +0100 Subject: Store result of nvcc tests in config.log --- build/linux/acinclude.m4 | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/build/linux/acinclude.m4 b/build/linux/acinclude.m4 index 5022e5b..4ff9e4b 100644 --- a/build/linux/acinclude.m4 +++ b/build/linux/acinclude.m4 @@ -49,6 +49,22 @@ done rm -f conftest.cc conftest.o ]) + +dnl ASTRA_RUN_STOREOUTPUT(command, output) +AC_DEFUN([ASTRA_RUN_STOREOUTPUT],[{ + AS_ECHO(["$as_me:${as_lineno-$LINENO}: $1"]) >&AS_MESSAGE_LOG_FD + ( $1 ) >$2 2>&1 + ac_status=$? + cat $2 >&AS_MESSAGE_LOG_FD + AS_ECHO(["$as_me:${as_lineno-$LINENO}: \$? = $ac_status"]) >&AS_MESSAGE_LOG_FD + test $ac_status = 0; + }]) + +dnl ASTRA_RUN(command) +AC_DEFUN([ASTRA_RUN],[ASTRA_RUN_STOREOUTPUT($1,/dev/null)]) + + + dnl ASTRA_CHECK_NVCC(variable-to-set,cppflags-to-set) AC_DEFUN([ASTRA_CHECK_NVCC],[ cat >conftest.cu <<_ACEOF @@ -59,17 +75,22 @@ int main() { } _ACEOF $1="yes" -$NVCC -c -o conftest.o conftest.cu $$2 >conftest.nvcc.out 2>&1 || { +ASTRA_RUN_STOREOUTPUT([$NVCC -c -o conftest.o conftest.cu $$2],conftest.nvcc.out) || { $1="no" # Check if hack for gcc 4.4 helps if grep -q __builtin_stdarg_start conftest.nvcc.out; then NVCC_OPT="-Xcompiler -D__builtin_stdarg_start=__builtin_va_start" - $NVCC -c -o conftest.o conftest.cu $$2 $NVCC_OPT >/dev/null 2>&1 && { + + ASTRA_RUN([$NVCC -c -o conftest.o conftest.cu $$2 $NVCC_OPT]) && { $1="yes" $2="$$2 $NVCC_OPT" } fi } +if test x$$1 = xno; then + AS_ECHO(["$as_me: failed program was:"]) >&AS_MESSAGE_LOG_FD + sed 's/^/| /' conftest.cu >&AS_MESSAGE_LOG_FD +fi rm -f conftest.cu conftest.o conftest.nvcc.out ]) -- cgit v1.2.3 From b983e30eda584300fbdc664f45f8a322e4e10088 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Tue, 20 Jan 2015 14:06:48 +0100 Subject: Make astra_clear clear projector3d too --- matlab/tools/astra_clear.m | 1 + 1 file changed, 1 insertion(+) diff --git a/matlab/tools/astra_clear.m b/matlab/tools/astra_clear.m index e558161..93a88ad 100644 --- a/matlab/tools/astra_clear.m +++ b/matlab/tools/astra_clear.m @@ -17,4 +17,5 @@ astra_mex_data2d('clear'); astra_mex_data3d('clear'); astra_mex_algorithm('clear'); astra_mex_projector('clear'); +astra_mex_projector3d('clear'); astra_mex_matrix('clear'); -- cgit v1.2.3 From b00590d8c27baa09c1922b70b976ee9ed708d346 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Tue, 20 Jan 2015 14:08:47 +0100 Subject: Sync DART version --- matlab/algorithms/DART/DARTalgorithm.m | 196 +++++---- matlab/algorithms/DART/IterativeTomography.m | 455 --------------------- matlab/algorithms/DART/IterativeTomography3D.m | 433 -------------------- matlab/algorithms/DART/Kernels.m | 15 +- matlab/algorithms/DART/MaskingDefault.m | 17 +- matlab/algorithms/DART/MaskingGPU.m | 15 +- matlab/algorithms/DART/OutputDefault.m | 15 +- matlab/algorithms/DART/SegmentationDefault.m | 15 +- matlab/algorithms/DART/SmoothingDefault.m | 17 +- matlab/algorithms/DART/SmoothingGPU.m | 15 +- matlab/algorithms/DART/StatisticsDefault.m | 21 +- matlab/algorithms/DART/TomographyDefault.m | 73 ---- matlab/algorithms/DART/TomographyDefault3D.m | 73 ---- matlab/algorithms/DART/examples/example1.m | 88 ++-- matlab/algorithms/DART/examples/example2.m | 87 ++-- matlab/algorithms/DART/examples/example3.m | 78 ++-- matlab/algorithms/DART/tools/DARToptimizer.m | 118 ++++++ .../algorithms/DART/tools/DARToptimizerBoneStudy.m | 118 ++++++ matlab/algorithms/DART/tools/ProjDiffOptimFunc.m | 29 ++ .../DART/tools/dart_create_base_phantom.m | 17 + matlab/algorithms/DART/tools/dart_scheduler.m | 53 +++ matlab/algorithms/DART/tools/rNMPOptimFunc.m | 35 ++ 22 files changed, 680 insertions(+), 1303 deletions(-) delete mode 100644 matlab/algorithms/DART/IterativeTomography.m delete mode 100644 matlab/algorithms/DART/IterativeTomography3D.m delete mode 100644 matlab/algorithms/DART/TomographyDefault.m delete mode 100644 matlab/algorithms/DART/TomographyDefault3D.m create mode 100644 matlab/algorithms/DART/tools/DARToptimizer.m create mode 100644 matlab/algorithms/DART/tools/DARToptimizerBoneStudy.m create mode 100644 matlab/algorithms/DART/tools/ProjDiffOptimFunc.m create mode 100644 matlab/algorithms/DART/tools/dart_create_base_phantom.m create mode 100644 matlab/algorithms/DART/tools/dart_scheduler.m create mode 100644 matlab/algorithms/DART/tools/rNMPOptimFunc.m diff --git a/matlab/algorithms/DART/DARTalgorithm.m b/matlab/algorithms/DART/DARTalgorithm.m index b7e63b5..85a3ca0 100644 --- a/matlab/algorithms/DART/DARTalgorithm.m +++ b/matlab/algorithms/DART/DARTalgorithm.m @@ -1,13 +1,12 @@ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox % -% Copyright: iMinds-Vision Lab, University of Antwerp +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -% -% Author of this DART Algorithm: Wim van Aarle - +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- classdef DARTalgorithm < matlab.mixin.Copyable @@ -20,7 +19,7 @@ classdef DARTalgorithm < matlab.mixin.Copyable %---------------------------------------------------------------------- properties (GetAccess=public, SetAccess=public) - tomography = TomographyDefault(); % POLICY: Tomography object. + tomography = IterativeTomography(); % POLICY: Tomography object. segmentation = SegmentationDefault(); % POLICY: Segmentation object. smoothing = SmoothingDefault(); % POLICY: Smoothing object. masking = MaskingDefault(); % POLICY: Masking object. @@ -29,10 +28,11 @@ classdef DARTalgorithm < matlab.mixin.Copyable base = struct(); % DATA(set): base structure, should contain: 'sinogram', 'proj_geom', 'phantom' (optional). - memory = 'yes'; % SETTING: reduce memory usage? (disables some features) - - testdata = struct(); - + memory = 'no'; % SETTING: reduce memory usage? (disables some features) + + implementation = 'linear'; % SETTING: which type of projector is used ('linear', 'nonlinear') + t = 5; % SETTING: # ARMiterations, each DART iteration. + t0 = 100; % SETTING: # ARM iterations at DART initialization. end %---------------------------------------------------------------------- properties (GetAccess=public, SetAccess=private) @@ -57,15 +57,25 @@ classdef DARTalgorithm < matlab.mixin.Copyable methods %------------------------------------------------------------------ - function this = DARTalgorithm(base) + function this = DARTalgorithm(varargin) % Constructor - % >> D = DARTalgorithm(base); base is a matlab struct (or the path towards one) - % that should contain 'sinogram', 'proj_geom'. - - if ischar(base) - this.base = load(base); + % >> D = DARTalgorithm(base); [base is a matlab struct that + % should contain 'sinogram' and + % 'proj_geom'] + % >> D = DARTalgorithm('base_path'); [path to base struct file] + % >> D = DARTalgorithm(sinogram, proj_geom) + % + narginchk(1, 2) + if nargin == 1 && ischar(varargin{1}) + this.base = load(varargin{1}); + elseif nargin == 1 && isstruct(varargin{1}) + this.base = varargin{1}; + elseif nargin == 2 + this.base = struct(); + this.base.sinogram = varargin{1}; + this.base.proj_geom = varargin{2}; else - this.base = base; + error('invalid arguments') end end @@ -74,7 +84,6 @@ classdef DARTalgorithm < matlab.mixin.Copyable function D = deepcopy(this) % Create a deep copy of this object. % >> D2 = D.deepcopy(); - D = copy(this); props = properties(this); for i = 1:length(props) @@ -82,7 +91,6 @@ classdef DARTalgorithm < matlab.mixin.Copyable D.(props{i}) = copy(this.(props{i})); end end - end %------------------------------------------------------------------ @@ -91,14 +99,18 @@ classdef DARTalgorithm < matlab.mixin.Copyable % >> D.initialize(); % Initialize tomography part - this.tomography.initialize(this); + if ~this.tomography.initialized + this.tomography.sinogram = this.base.sinogram; + this.tomography.proj_geom = this.base.proj_geom; + this.tomography.initialize(); + end % Create an Initial Reconstruction if isfield(this.base, 'V0') this.V0 = this.base.V0; else this.output.pre_initial_iteration(this); - this.V0 = this.tomography.createInitialReconstruction(this, this.base.sinogram); + this.V0 = this.tomography.reconstruct2(this.base.sinogram, [], this.t0); this.output.post_initial_iteration(this); end this.V = this.V0; @@ -113,85 +125,98 @@ classdef DARTalgorithm < matlab.mixin.Copyable % iterate function this = iterate(this, iters) % Perform several iterations of the DART algorithm. - % >> D.iterate(iterations); - + % >> D.iterate(iterations); + if strcmp(this.implementation,'linear') + this.iterate_linear(iters); + elseif strcmp(this.implementation,'nonlinear') + this.iterate_nonlinear(iters); + end + end + + + %------------------------------------------------------------------ + % iterate - linear projector implementation + function this = iterate_linear(this, iters) + this.start_tic = tic; for iteration = 1:iters + this.iterationcount = this.iterationcount + 1; + + % initial output + this.output.pre_iteration(this); + + % update adaptive parameters + this.update_adaptiveparameter(this.iterationcount); + + % segmentation + this.segmentation.estimate_grey_levels(this, this.V); + this.S = this.segmentation.apply(this, this.V); + + % select update and fixed pixels + this.Mask = this.masking.apply(this, this.S); + this.V = (this.V .* this.Mask) + (this.S .* (1 - this.Mask)); + F = this.V; + F(this.Mask == 1) = 0; + + % compute residual projection difference + this.R = this.base.sinogram - this.tomography.project(F); + % ART update part + this.V = this.tomography.reconstruct2_mask(this.R, this.V, this.Mask, this.t); + + % blur + this.V = this.smoothing.apply(this, this.V); + + %calculate statistics + this.stats = this.statistics.apply(this); + + % output + this.output.post_iteration(this); + end + + end + + %------------------------------------------------------------------ + % iterate - nonlinear projector implementation + function this = iterate_nonlinear(this, iters) + + this.start_tic = tic; + + for iteration = 1:iters this.iterationcount = this.iterationcount + 1; - %---------------------------------------------------------- - % Initial Output + % Output this.output.pre_iteration(this); - %---------------------------------------------------------- - % Update Adaptive Parameters - for i = 1:numel(this.adaptparam_name) - - for j = 1:numel(this.adaptparam_iters{i}) - if this.iterationcount == this.adaptparam_iters{i}(j) - new_value = this.adaptparam_values{i}(j); - eval(['this.' this.adaptparam_name{i} ' = ' num2str(new_value) ';']); - disp(['value ' this.adaptparam_name{i} ' changed to ' num2str(new_value) ]); - end - end - - end + % update adaptive parameters + this.update_adaptiveparameter(this.iterationcount) - %---------------------------------------------------------- % Segmentation this.segmentation.estimate_grey_levels(this, this.V); this.S = this.segmentation.apply(this, this.V); - %---------------------------------------------------------- % Select Update and Fixed Pixels this.Mask = this.masking.apply(this, this.S); - this.V = (this.V .* this.Mask) + (this.S .* (1 - this.Mask)); - %this.V(this.Mask == 0) = this.S(this.Mask == 0); - - F = this.V; - F(this.Mask == 1) = 0; - %---------------------------------------------------------- - % Create Residual Projection Difference - %this.testdata.F{iteration} = F; - this.R = this.base.sinogram - this.tomography.createForwardProjection(this, F); - %this.testdata.R{iteration} = this.R; + % ART update part + this.V = this.tomography.reconstruct2_mask(this.base.sinogram, this.V, this.Mask, this.t); - %---------------------------------------------------------- - % ART Loose Part - %this.testdata.V1{iteration} = this.V; - %this.testdata.Mask{iteration} = this.Mask; - - %X = zeros(size(this.V)); - %Y = this.tomography.createReconstruction(this, this.R, X, this.Mask); - %this.V(this.Mask) = Y(this.Mask); - this.V = this.tomography.createReconstruction(this, this.R, this.V, this.Mask); - - %this.testdata.V2{iteration} = this.V; - - %---------------------------------------------------------- - % Blur + % blur this.V = this.smoothing.apply(this, this.V); - %this.testdata.V3{iteration} = this.V; - %---------------------------------------------------------- - % Calculate Statistics + % calculate statistics this.stats = this.statistics.apply(this); - %---------------------------------------------------------- - % Output + % output this.output.post_iteration(this); - end % end iteration loop - - %test = this.testdata; - %save('testdata.mat','test'); + end + + end + - end - %------------------------------------------------------------------ % get data function data = getdata(this, string) @@ -208,8 +233,21 @@ classdef DARTalgorithm < matlab.mixin.Copyable this.adaptparam_name{end+1} = name; this.adaptparam_values{end+1} = values; this.adaptparam_iters{end+1} = iterations; - end + end + %------------------------------------------------------------------ + % update adaptive parameter + function this = update_adaptiveparameter(this, iteration) + for i = 1:numel(this.adaptparam_name) + for j = 1:numel(this.adaptparam_iters{i}) + if iteration == this.adaptparam_iters{i}(j) + new_value = this.adaptparam_values{i}(j); + eval(['this.' this.adaptparam_name{i} ' = ' num2str(new_value) ';']); + end + end + end + end + %------------------------------------------------------------------ function settings = getsettings(this) % Returns a structure containing all settings of this object. diff --git a/matlab/algorithms/DART/IterativeTomography.m b/matlab/algorithms/DART/IterativeTomography.m deleted file mode 100644 index b30640e..0000000 --- a/matlab/algorithms/DART/IterativeTomography.m +++ /dev/null @@ -1,455 +0,0 @@ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp -% License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -% -% Author of this DART Algorithm: Wim van Aarle - - -classdef IterativeTomography < matlab.mixin.Copyable - - % Algorithm class for 2D Iterative Tomography. - - %---------------------------------------------------------------------- - properties (SetAccess=public, GetAccess=public) - superresolution = 1; % SETTING: Volume upsampling factor. - proj_type = 'linear'; % SETTING: Projector type, only when gpu='no'. - method = 'SIRT_CUDA'; % SETTING: Iterative method (see ASTRA toolbox documentation). - gpu = 'yes'; % SETTING: Use gpu? {'yes', 'no'} - gpu_core = 0; % SETTING: Which gpu core to use? Only when gpu='yes'. - inner_circle = 'yes'; % SETTING: Do roi only? {'yes', 'no'} - image_size = []; % SETTING: Overwrite default reconstruction size. Only if no vol_geom is specified. - use_minc = 'no'; % SETTING: Use minimum constraint. {'no', 'yes'} - end - %---------------------------------------------------------------------- - properties (SetAccess=public, GetAccess=public) - sinogram = []; % DATA: Projection data. - proj_geom = []; % DATA: Projection geometry. - V = []; % DATA: Volume data. Also used to set initial estimate (optional). - vol_geom = []; % DATA: Volume geometry. - end - %---------------------------------------------------------------------- - properties (SetAccess=private, GetAccess=public) - initialized = 0; % Is this object initialized? - end - %---------------------------------------------------------------------- - properties (SetAccess=protected, GetAccess=protected) - proj_geom_sr = []; % PROTECTED: geometry of sinogram (with super-resolution) - proj_id = []; % PROTECTED: astra id of projector (when gpu='no') - proj_id_sr = []; % PROTECTED: astra id of super-resolution projector (when gpu='no') - cfg_base = struct(); % PROTECTED: base configuration structure for the reconstruction algorithm. - end - %---------------------------------------------------------------------- - - methods (Access=public) - - %------------------------------------------------------------------ - function this = IterativeTomography(varargin) - % Constructor - % >> tomography = IterativeTomography(); - % >> tomography = IterativeTomography(base); base struct should contain fields 'sinogram' and 'proj_geom'. - % >> tomography = IterativeTomography(base_filename); mat-file should contain 'sinogram' and 'proj_geom'. - % >> tomography = IterativeTomography(proj_geom, vol_geom); - % >> tomography = IterativeTomography(sinogram, proj_geom); - - % Input: IterativeTomography(base) - if nargin == 1 - if ischar(varargin{1}) - this.sinogram = load(varargin{1},'sinogram'); - this.proj_geom = load(varargin{1},'proj_geom'); - else - this.sinogram = varargin{1}.sinogram; - this.proj_geom = varargin{1}.proj_geom; - end - end - % Input: IterativeTomography(proj_geom, vol_geom) - if nargin == 2 && isstruct(varargin{1}) && isstruct(varargin{2}) - this.proj_geom = varargin{1}; - this.vol_geom = varargin{2}; - % Input: IterativeTomography(sinogram, proj_geom) - elseif nargin == 2 - this.sinogram = varargin{1}; - this.proj_geom = varargin{2}; - end - - end - - %------------------------------------------------------------------ - function delete(this) - % Destructor - % >> clear tomography; - if strcmp(this.gpu,'no') && numel(this.proj_id) > 0 - astra_mex_projector('delete', this.proj_id, this.proj_id_sr); - end - end - - %------------------------------------------------------------------ - function settings = getsettings(this) - % Returns a structure containing all settings of this object. - % >> settings = tomography.getsettings(); - settings.superresolution = this.superresolution; - settings.proj_type = this.proj_type; - settings.method = this.method; - settings.gpu = this.gpu; - settings.gpu_core = this.gpu_core; - settings.inner_circle = this.inner_circle; - settings.image_size = this.image_size; - settings.use_minc = this.use_minc; - end - - %------------------------------------------------------------------ - function ok = initialize(this) - % Initialize this object. Returns 1 if succesful. - % >> tomography.initialize(); - - % create projection geometry with super-resolution - this.proj_geom_sr = astra_geom_superresolution(this.proj_geom, this.superresolution); - - % if no volume geometry is specified by the user: create volume geometry - if numel(this.vol_geom) == 0 - if numel(this.image_size) < 2 - this.image_size(1) = this.proj_geom.DetectorCount; - this.image_size(2) = this.proj_geom.DetectorCount; - end - this.vol_geom = astra_create_vol_geom(this.image_size(1) * this.superresolution, this.image_size(2) * this.superresolution, ... - -this.image_size(1)/2, this.image_size(1)/2, -this.image_size(2)/2, this.image_size(2)/2); - else - this.image_size(1) = this.vol_geom.GridRowCount; - this.image_size(2) = this.vol_geom.GridColCount; - end - - % create projector - if strcmp(this.gpu, 'no') - this.proj_id = astra_create_projector(this.proj_type, this.proj_geom, this.vol_geom); - this.proj_id_sr = astra_create_projector(this.proj_type, this.proj_geom_sr, this.vol_geom); - end - - % create reconstruction configuration - this.cfg_base = astra_struct(upper(this.method)); - if strcmp(this.gpu,'no') - this.cfg_base.ProjectorId = this.proj_id; - this.cfg_base.ProjectionGeometry = this.proj_geom; - this.cfg_base.ReconstructionGeometry = this.vol_geom; - this.cfg_base.option.ProjectionOrder = 'random'; - end - this.cfg_base.option.DetectorSuperSampling = this.superresolution; - %this.cfg_base.option.DetectorSuperSampling = 8; - if strcmp(this.gpu,'yes') - this.cfg_base.option.GPUindex = this.gpu_core; - end - this.cfg_base.option.UseMinConstraint = this.use_minc; - - this.initialized = 1; - ok = this.initialized; - end - - %------------------------------------------------------------------ - function P = project(this, volume) - % Compute forward projection. - % Stores sinogram in tomography.sinogram if it is still empty. - % >> P = tomography.project(); projects 'tomography.V'. - % >> P = tomography.project(volume); projects 'volume'. - - if ~this.initialized - this.initialize(); - end - - if nargin == 1 % tomography.project(); - P = this.project_c(this.V); - - elseif nargin == 2 % tomography.project(volume); - P = this.project_c(volume); - end - - % store - if numel(this.sinogram) == 0 - this.sinogram = P; - end - end - - %------------------------------------------------------------------ - function V = reconstruct(this, iterations) - % Compute reconstruction. - % Uses tomography.sinogram - % Initial solution (if available) should be stored in tomography.V - % >> V = tomography.reconstruct(iterations); - - if ~this.initialized - this.initialize(); - end - - this.V = this.reconstruct_c(this.sinogram, this.V, [], iterations); - if strcmp(this.inner_circle,'yes') - this.V = this.selectROI(this.V); - end - V = this.V; - end - - %------------------------------------------------------------------ - function I = reconstructMask(this, mask, iterations) - % Compute reconstruction with mask. - % Uses tomography.sinogram - % Initial solution (if available) should be stored in tomography.V - % >> V = tomography.reconstructMask(mask, iterations); - - if ~this.initialized - this.initialize(); - end - - if strcmp(this.inner_circle,'yes') - mask = this.selectROI(mask); - end - I = this.reconstruct_c(this.sinogram, this.V, mask, iterations); - end - %------------------------------------------------------------------ - - end - - %---------------------------------------------------------------------- - methods (Access = protected) - - %------------------------------------------------------------------ - % Protected function: create FP - function sinogram = project_c(this, volume) - - if this.initialized == 0 - error('IterativeTomography not initialized'); - end - - % data is stored in astra memory - if numel(volume) == 1 - - if strcmp(this.gpu, 'yes') - sinogram_tmp = astra_create_sino_cuda(volume, this.proj_geom_sr, this.vol_geom, this.gpu_core); - else - sinogram_tmp = astra_create_sino(volume, this.proj_id); - end - - % sinogram downsampling - if this.superresolution > 1 - sinogram_data = astra_mex_data2d('get', sinogram_tmp); - astra_mex_data2d('delete', sinogram_tmp); - sinogram_data = downsample_sinogram(sinogram_data, this.superresolution); - %if strcmp(this.proj_geom.type,'fanflat_vec') || strcmp(this.proj_geom.type,'fanflat') - % sinogram = sinogram / this.superresolution; - %end - sinogram = astra_mex_data2d('create','sino', this.proj_geom, sinogram_data); - else - sinogram = sinogram_tmp; - end - - % data is stored in matlab memory - else - - % 2D and 3D slice by slice - sinogram_tmp = zeros([astra_geom_size(this.proj_geom_sr), size(volume,3)]); - sinogram_tmp2 = zeros([astra_geom_size(this.proj_geom), size(volume,3)]); - for slice = 1:size(volume,3) - - if strcmp(this.gpu, 'yes') - [tmp_id, sinogram_tmp2(:,:,slice)] = astra_create_sino_sampling(volume(:,:,slice), this.proj_geom, this.vol_geom, this.gpu_core, this.superresolution); - astra_mex_data2d('delete', tmp_id); - else - [tmp_id, tmp] = astra_create_sino(volume(:,:,slice), this.proj_id_sr); - sinogram_tmp2(:,:,slice) = downsample_sinogram(tmp, this.superresolution) * (this.superresolution^2); - astra_mex_data2d('delete', tmp_id); - end - - end - - % sinogram downsampling - if strcmp(this.gpu, 'yes') - %sinogram = downsample_sinogram(sinogram_tmp, this.superresolution); - sinogram2 = sinogram_tmp2; - if strcmp(this.proj_geom.type,'fanflat_vec') || strcmp(this.proj_geom.type,'fanflat') - sinogram2 = sinogram2 / this.superresolution; - elseif strcmp(this.proj_geom.type,'parallel') - sinogram2 = sinogram2 / (this.superresolution * this.superresolution); - end - sinogram = sinogram2; - else - sinogram = sinogram_tmp2; - end - - end - - end - - %------------------------------------------------------------------ - % Protected function: reconstruct - function V = reconstruct_c(this, sinogram, V0, mask, iterations) - - if this.initialized == 0 - error('IterativeTomography not initialized'); - end - - % data is stored in astra memory - if numel(sinogram) == 1 - V = this.reconstruct_c_astra(sinogram, V0, mask, iterations); - - % data is stored in matlab memory - else - V = this.reconstruct_c_matlab(sinogram, V0, mask, iterations); - end - - end - - %------------------------------------------------------------------ - % Protected function: reconstruct (data in matlab) - function V = reconstruct_c_matlab(this, sinogram, V0, mask, iterations) - - if this.initialized == 0 - error('IterativeTomography not initialized'); - end - - % parse method - method2 = upper(this.method); - if strcmp(method2, 'SART') || strcmp(method2, 'SART_CUDA') - iterations = iterations * size(sinogram,1); - elseif strcmp(method2, 'ART') - iterations = iterations * numel(sinogram); - end - - % create data objects - V = zeros(this.vol_geom.GridRowCount, this.vol_geom.GridColCount, size(sinogram,3)); - reconstruction_id = astra_mex_data2d('create', '-vol', this.vol_geom); - sinogram_id = astra_mex_data2d('create', '-sino', this.proj_geom); - if numel(mask) > 0 - mask_id = astra_mex_data2d('create', '-vol', this.vol_geom); - end - - % algorithm configuration - cfg = this.cfg_base; - cfg.ProjectionDataId = sinogram_id; - cfg.ReconstructionDataId = reconstruction_id; - if numel(mask) > 0 - cfg.option.ReconstructionMaskId = mask_id; - end - alg_id = astra_mex_algorithm('create', cfg); - - % loop slices - for slice = 1:size(sinogram,3) - - % fetch slice of initial reconstruction - if numel(V0) > 0 - astra_mex_data2d('store', reconstruction_id, V0(:,:,slice)); - else - astra_mex_data2d('store', reconstruction_id, 0); - end - - % fetch slice of sinogram - astra_mex_data2d('store', sinogram_id, sinogram(:,:,slice)); - - % fecth slice of mask - if numel(mask) > 0 - astra_mex_data2d('store', mask_id, mask(:,:,slice)); - end - - % iterate - astra_mex_algorithm('iterate', alg_id, iterations); - - % fetch data - V(:,:,slice) = astra_mex_data2d('get', reconstruction_id); - - end - - % correct attenuation factors for super-resolution - if this.superresolution > 1 && strcmp(this.gpu,'yes') - if strcmp(this.proj_geom.type,'fanflat_vec') || strcmp(this.proj_geom.type,'fanflat') - if numel(mask) > 0 - V(mask > 0) = V(mask > 0) ./ this.superresolution; - else - V = V ./ this.superresolution; - end - end - end - - % garbage collection - astra_mex_algorithm('delete', alg_id); - astra_mex_data2d('delete', sinogram_id, reconstruction_id); - if numel(mask) > 0 - astra_mex_data2d('delete', mask_id); - end - - end - - %------------------------------------------------------------------ - % Protected function: reconstruct (data in astra) - function V = reconstruct_c_astra(this, sinogram, V0, mask, iterations) - - if this.initialized == 0 - error('IterativeTomography not initialized'); - end - - if numel(V0) > 1 || numel(mask) > 1 || numel(sinogram) > 1 - error('Not all required data is stored in the astra memory'); - end - - if numel(V0) == 0 - V0 = astra_mex_data2d('create', '-vol', this.vol_geom, 0); - end - - % parse method - method2 = upper(this.method); - if strcmp(method2, 'SART') || strcmp(method2, 'SART_CUDA') - iterations = iterations * astra_geom_size(this.proj_geom, 1); - elseif strcmp(method2, 'ART') - s = astra_geom_size(this.proj_geom); - iterations = iterations * s(1) * s(2); - end - - % algorithm configuration - cfg = this.cfg_base; - cfg.ProjectionDataId = sinogram; - cfg.ReconstructionDataId = V0; - if numel(mask) > 0 - cfg.option.ReconstructionMaskId = mask; - end - alg_id = astra_mex_algorithm('create', cfg); - - % iterate - astra_mex_algorithm('iterate', alg_id, iterations); - - % fetch data - V = V0; - - % correct attenuation factors for super-resolution - if this.superresolution > 1 - if strcmp(this.proj_geom.type,'fanflat_vec') || strcmp(this.proj_geom.type,'fanflat') - if numel(mask) > 0 - astra_data_op_masked('$1./s1', [V V], [this.superresolution this.superresolution], mask, this.gpu_core); - else - astra_data_op('$1./s1', [V V], [this.superresolution this.superresolution], this.gpu_core); - end - end - end - - % garbage collection - astra_mex_algorithm('delete', alg_id); - - end - - %------------------------------------------------------------------ - function V_out = selectROI(~, V_in) - - if numel(V_in) == 1 - cfg = astra_struct('RoiSelect_CUDA'); - cfg.DataId = V_in; - alg_id = astra_mex_algorithm('create',cfg); - astra_mex_algorithm('run', alg_id); - astra_mex_algorithm('delete', alg_id); - V_out = V_in; - else - V_out = ROIselectfull(V_in, min([size(V_in,1), size(V_in,2)])); - end - - end - %------------------------------------------------------------------ - - end - -end - diff --git a/matlab/algorithms/DART/IterativeTomography3D.m b/matlab/algorithms/DART/IterativeTomography3D.m deleted file mode 100644 index 3f89457..0000000 --- a/matlab/algorithms/DART/IterativeTomography3D.m +++ /dev/null @@ -1,433 +0,0 @@ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp -% License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -% -% Author of this DART Algorithm: Wim van Aarle - - -classdef IterativeTomography3D < matlab.mixin.Copyable - - % Algorithm class for 3D Iterative Tomography. - - %---------------------------------------------------------------------- - properties (SetAccess=public, GetAccess=public) - superresolution = 1; % SETTING: Volume upsampling factor. - proj_type = 'linear'; % SETTING: Projector type, only when gpu='no'. - method = 'SIRT3D_CUDA'; % SETTING: Iterative method (see ASTRA toolbox documentation). - gpu = 'yes'; % SETTING: Use gpu? {'yes', 'no'} - gpu_core = 0; % SETTING: Which gpu core to use? Only when gpu='yes'. - inner_circle = 'yes'; % SETTING: Do roi only? {'yes', 'no'} - image_size = []; % SETTING: Overwrite default reconstruction size. Only if no vol_geom is specified. - use_minc = 'no'; % SETTING: Use minimum constraint. {'no', 'yes'} - maxc = +Inf; % SETTING: Maximum constraint. +Inf means off. - end - %---------------------------------------------------------------------- - properties (SetAccess=public, GetAccess=public) - sinogram = []; % DATA: Projection data. - proj_geom = []; % DATA: Projection geometry. - V = []; % DATA: Volume data. Also used to set initial estimate (optional). - vol_geom = []; % DATA: Volume geometry. - end - %---------------------------------------------------------------------- - properties (SetAccess=private, GetAccess=public) - initialized = 0; % Is this object initialized? - end - %---------------------------------------------------------------------- - properties (SetAccess=protected, GetAccess=protected) - proj_geom_sr = []; % PROTECTED: geometry of sinogram (with super-resolution) - proj_id = []; % PROTECTED: astra id of projector (when gpu='no') - proj_id_sr = []; % PROTECTED: astra id of super-resolution projector (when gpu='no') - cfg_base = struct(); % PROTECTED: base configuration structure for the reconstruction algorithm. - end - %---------------------------------------------------------------------- - - methods (Access=public) - - %------------------------------------------------------------------ - function this = IterativeTomography(varargin) - % Constructor - % >> tomography = IterativeTomography(); - % >> tomography = IterativeTomography(base); base struct should contain fields 'sinogram' and 'proj_geom'. - % >> tomography = IterativeTomography(base_filename); mat-file should contain 'sinogram' and 'proj_geom'. - % >> tomography = IterativeTomography(proj_geom, vol_geom); - % >> tomography = IterativeTomography(sinogram, proj_geom); - - % Input: IterativeTomography(base) - if nargin == 1 - if ischar(varargin{1}) - this.sinogram = load(varargin{1},'sinogram'); - this.proj_geom = load(varargin{1},'proj_geom'); - else - this.sinogram = varargin{1}.sinogram; - this.proj_geom = varargin{1}.proj_geom; - end - end - % Input: IterativeTomography(proj_geom, vol_geom) - if nargin == 2 && isstruct(varargin{1}) && isstruct(varargin{2}) - this.proj_geom = varargin{1}; - this.vol_geom = varargin{2}; - % Input: IterativeTomography(sinogram, proj_geom) - elseif nargin == 2 - this.sinogram = varargin{1}; - this.proj_geom = varargin{2}; - end - - end - - %------------------------------------------------------------------ - function delete(this) - % Destructor - % >> clear tomography; - if strcmp(this.gpu,'no') && numel(this.proj_id) > 0 - astra_mex_projector('delete', this.proj_id, this.proj_id_sr); - end - end - - %------------------------------------------------------------------ - function settings = getsettings(this) - % Returns a structure containing all settings of this object. - % >> settings = tomography.getsettings(); - settings.superresolution = this.superresolution; - settings.proj_type = this.proj_type; - settings.method = this.method; - settings.gpu = this.gpu; - settings.gpu_core = this.gpu_core; - settings.inner_circle = this.inner_circle; - settings.image_size = this.image_size; - settings.use_minc = this.use_minc; - settings.maxc = this.maxc; - end - - %------------------------------------------------------------------ - function ok = initialize(this) - % Initialize this object. Returns 1 if succesful. - % >> tomography.initialize(); - -% % create projection geometry with super-resolution -% this.proj_geom_sr = astra_geom_superresolution(this.proj_geom, this.superresolution); - - % if no volume geometry is specified by the user: create volume geometry - if numel(this.vol_geom) == 0 - if numel(this.image_size) < 2 - this.image_size(1) = this.proj_geom.DetectorRowCount; - this.image_size(2) = this.proj_geom.DetectorColCount; - end - this.vol_geom = astra_create_vol_geom(this.proj_geom.DetectorColCount, this.proj_geom.DetectorColCount, this.proj_geom.DetectorRowCount); - else - this.image_size(1) = this.vol_geom.GridRowCount; - this.image_size(2) = this.vol_geom.GridColCount; - end - - % create projector - if strcmp(this.gpu, 'no') - this.proj_id = astra_create_projector(this.proj_type, this.proj_geom, this.vol_geom); - this.proj_id_sr = astra_create_projector(this.proj_type, this.proj_geom_sr, this.vol_geom); - end - - % create reconstruction configuration - this.cfg_base = astra_struct(upper(this.method)); - if strcmp(this.gpu,'no') - this.cfg_base.ProjectorId = this.proj_id; - this.cfg_base.ProjectionGeometry = this.proj_geom; - this.cfg_base.ReconstructionGeometry = this.vol_geom; - this.cfg_base.option.ProjectionOrder = 'random'; - end - this.cfg_base.option.DetectorSuperSampling = this.superresolution; - %this.cfg_base.option.DetectorSuperSampling = 8; - if strcmp(this.gpu,'yes') - this.cfg_base.option.GPUindex = this.gpu_core; - end - this.cfg_base.option.UseMinConstraint = this.use_minc; - if ~isinf(this.maxc) - this.cfg_base.option.UseMaxConstraint = 'yes'; - this.cfg_base.option.MaxConstraintValue = this.maxc; - end - - this.initialized = 1; - ok = this.initialized; - end - - %------------------------------------------------------------------ - function P = project(this, volume) - % Compute forward projection. - % Stores sinogram in tomography.sinogram if it is still empty. - % >> P = tomography.project(); projects 'tomography.V'. - % >> P = tomography.project(volume); projects 'volume'. - - if ~this.initialized - this.initialize(); - end - - if nargin == 1 % tomography.project(); - P = this.project_c(this.V); - - elseif nargin == 2 % tomography.project(volume); - P = this.project_c(volume); - end - - % store - if numel(this.sinogram) == 0 - this.sinogram = P; - end - end - - %------------------------------------------------------------------ - function V = reconstruct(this, iterations) - % Compute reconstruction. - % Uses tomography.sinogram - % Initial solution (if available) should be stored in tomography.V - % >> V = tomography.reconstruct(iterations); - - if ~this.initialized - this.initialize(); - end - - this.V = this.reconstruct_c(this.sinogram, this.V, [], iterations); - if strcmp(this.inner_circle,'yes') - this.V = this.selectROI(this.V); - end - V = this.V; - end - - %------------------------------------------------------------------ - function I = reconstructMask(this, mask, iterations) - % Compute reconstruction with mask. - % Uses tomography.sinogram - % Initial solution (if available) should be stored in tomography.V - % >> V = tomography.reconstructMask(mask, iterations); - - if ~this.initialized - this.initialize(); - end - - if strcmp(this.inner_circle,'yes') - mask = this.selectROI(mask); - end - I = this.reconstruct_c(this.sinogram, this.V, mask, iterations); - end - %------------------------------------------------------------------ - - end - - %---------------------------------------------------------------------- - methods (Access = protected) - - %------------------------------------------------------------------ - % Protected function: create FP - function sinogram = project_c(this, volume) - - if this.initialized == 0 - error('IterativeTomography not initialized'); - end - - % data is stored in astra memory - if numel(volume) == 1 - - if strcmp(this.gpu, 'yes') - sinogram_tmp = astra_create_sino_cuda(volume, this.proj_geom_sr, this.vol_geom, this.gpu_core); - else - sinogram_tmp = astra_create_sino(volume, this.proj_id); - end - - % sinogram downsampling - if this.superresolution > 1 - sinogram_data = astra_mex_data2d('get', sinogram_tmp); - astra_mex_data2d('delete', sinogram_tmp); - sinogram_data = downsample_sinogram(sinogram_data, this.superresolution); - %if strcmp(this.proj_geom.type,'fanflat_vec') || strcmp(this.proj_geom.type,'fanflat') - % sinogram = sinogram / this.superresolution; - %end - sinogram = astra_mex_data2d('create','sino', this.proj_geom, sinogram_data); - else - sinogram = sinogram_tmp; - end - - % data is stored in matlab memory - else - - [tmp_id, sinogram] = astra_create_sino3d_cuda(volume, this.proj_geom, this.vol_geom); - astra_mex_data3d('delete', tmp_id); - - end - - end - - %------------------------------------------------------------------ - % Protected function: reconstruct - function V = reconstruct_c(this, sinogram, V0, mask, iterations) - - if this.initialized == 0 - error('IterativeTomography not initialized'); - end - - % data is stored in astra memory - if numel(sinogram) == 1 - V = this.reconstruct_c_astra(sinogram, V0, mask, iterations); - - % data is stored in matlab memory - else - V = this.reconstruct_c_matlab(sinogram, V0, mask, iterations); - end - - end - - %------------------------------------------------------------------ - % Protected function: reconstruct (data in matlab) - function V = reconstruct_c_matlab(this, sinogram, V0, mask, iterations) - - if this.initialized == 0 - error('IterativeTomography not initialized'); - end - - % parse method - method2 = upper(this.method); - if strcmp(method2, 'SART') || strcmp(method2, 'SART_CUDA') - iterations = iterations * size(sinogram,1); - elseif strcmp(method2, 'ART') - iterations = iterations * numel(sinogram); - end - - % create data objects -% V = zeros(this.vol_geom.GridRowCount, this.vol_geom.GridColCount, size(sinogram,3)); - reconstruction_id = astra_mex_data3d('create', '-vol', this.vol_geom); - sinogram_id = astra_mex_data3d('create', '-proj3d', this.proj_geom); - if numel(mask) > 0 - mask_id = astra_mex_data3d('create', '-vol', this.vol_geom); - end - - % algorithm configuration - cfg = this.cfg_base; - cfg.ProjectionDataId = sinogram_id; - cfg.ReconstructionDataId = reconstruction_id; - if numel(mask) > 0 - cfg.option.ReconstructionMaskId = mask_id; - end - alg_id = astra_mex_algorithm('create', cfg); - -% % loop slices -% for slice = 1:size(sinogram,3) - - % fetch slice of initial reconstruction - if numel(V0) > 0 - astra_mex_data3d('store', reconstruction_id, V0); - else - astra_mex_data3d('store', reconstruction_id, 0); - end - - % fetch slice of sinogram - astra_mex_data3d('store', sinogram_id, sinogram); - - % fecth slice of mask - if numel(mask) > 0 - astra_mex_data3d('store', mask_id, mask); - end - - % iterate - astra_mex_algorithm('iterate', alg_id, iterations); - - % fetch data - V = astra_mex_data3d('get', reconstruction_id); - -% end - - % correct attenuation factors for super-resolution - if this.superresolution > 1 && strcmp(this.gpu,'yes') - if strcmp(this.proj_geom.type,'fanflat_vec') || strcmp(this.proj_geom.type,'fanflat') - if numel(mask) > 0 - V(mask > 0) = V(mask > 0) ./ this.superresolution; - else - V = V ./ this.superresolution; - end - end - end - - % garbage collection - astra_mex_algorithm('delete', alg_id); - astra_mex_data3d('delete', sinogram_id, reconstruction_id); - if numel(mask) > 0 - astra_mex_data3d('delete', mask_id); - end - - end - - %------------------------------------------------------------------ - % Protected function: reconstruct (data in astra) - function V = reconstruct_c_astra(this, sinogram, V0, mask, iterations) - - if this.initialized == 0 - error('IterativeTomography not initialized'); - end - - if numel(V0) > 1 || numel(mask) > 1 || numel(sinogram) > 1 - error('Not all required data is stored in the astra memory'); - end - - if numel(V0) == 0 - V0 = astra_mex_data2d('create', '-vol', this.vol_geom, 0); - end - - % parse method - method2 = upper(this.method); - if strcmp(method2, 'SART') || strcmp(method2, 'SART_CUDA') - iterations = iterations * astra_geom_size(this.proj_geom, 1); - elseif strcmp(method2, 'ART') - s = astra_geom_size(this.proj_geom); - iterations = iterations * s(1) * s(2); - end - - % algorithm configuration - cfg = this.cfg_base; - cfg.ProjectionDataId = sinogram; - cfg.ReconstructionDataId = V0; - if numel(mask) > 0 - cfg.option.ReconstructionMaskId = mask; - end - alg_id = astra_mex_algorithm('create', cfg); - - % iterate - astra_mex_algorithm('iterate', alg_id, iterations); - - % fetch data - V = V0; - - % correct attenuation factors for super-resolution - if this.superresolution > 1 - if strcmp(this.proj_geom.type,'fanflat_vec') || strcmp(this.proj_geom.type,'fanflat') - if numel(mask) > 0 - astra_data_op_masked('$1./s1', [V V], [this.superresolution this.superresolution], mask, this.gpu_core); - else - astra_data_op('$1./s1', [V V], [this.superresolution this.superresolution], this.gpu_core); - end - end - end - - % garbage collection - astra_mex_algorithm('delete', alg_id); - - end - - %------------------------------------------------------------------ - function V_out = selectROI(~, V_in) - - if numel(V_in) == 1 - cfg = astra_struct('RoiSelect_CUDA'); - cfg.DataId = V_in; - alg_id = astra_mex_algorithm('create',cfg); - astra_mex_algorithm('run', alg_id); - astra_mex_algorithm('delete', alg_id); - V_out = V_in; - else - V_out = ROIselectfull(V_in, min([size(V_in,1), size(V_in,2)])); - end - - end - %------------------------------------------------------------------ - - end - -end - diff --git a/matlab/algorithms/DART/Kernels.m b/matlab/algorithms/DART/Kernels.m index b5e3134..558f611 100644 --- a/matlab/algorithms/DART/Kernels.m +++ b/matlab/algorithms/DART/Kernels.m @@ -1,13 +1,12 @@ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox % -% Copyright: iMinds-Vision Lab, University of Antwerp +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -% -% Author of this DART Algorithm: Wim van Aarle - +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- classdef Kernels %KERNELS Summary of this class goes here diff --git a/matlab/algorithms/DART/MaskingDefault.m b/matlab/algorithms/DART/MaskingDefault.m index 6bd25a5..f91a6f5 100644 --- a/matlab/algorithms/DART/MaskingDefault.m +++ b/matlab/algorithms/DART/MaskingDefault.m @@ -1,13 +1,12 @@ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox % -% Copyright: iMinds-Vision Lab, University of Antwerp +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -% -% Author of this DART Algorithm: Wim van Aarle - +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- classdef MaskingDefault < matlab.mixin.Copyable @@ -179,7 +178,7 @@ classdef MaskingDefault < matlab.mixin.Copyable %------------------------------------------------------------------ function Mask = apply_3D_gpu(this, S) - vol_geom = astra_create_vol_geom(size(S)); + vol_geom = astra_create_vol_geom(size(S,2), size(S,1), size(S,3)); data_id = astra_mex_data3d('create', '-vol', vol_geom, S); cfg = astra_struct('DARTMASK3D_CUDA'); diff --git a/matlab/algorithms/DART/MaskingGPU.m b/matlab/algorithms/DART/MaskingGPU.m index c4ef2b7..7d31aa8 100644 --- a/matlab/algorithms/DART/MaskingGPU.m +++ b/matlab/algorithms/DART/MaskingGPU.m @@ -1,13 +1,12 @@ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox % -% Copyright: iMinds-Vision Lab, University of Antwerp +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -% -% Author of this DART Algorithm: Wim van Aarle - +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- classdef MaskingGPU < matlab.mixin.Copyable diff --git a/matlab/algorithms/DART/OutputDefault.m b/matlab/algorithms/DART/OutputDefault.m index a34a430..33e908b 100644 --- a/matlab/algorithms/DART/OutputDefault.m +++ b/matlab/algorithms/DART/OutputDefault.m @@ -1,13 +1,12 @@ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox % -% Copyright: iMinds-Vision Lab, University of Antwerp +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -% -% Author of this DART Algorithm: Wim van Aarle - +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- classdef OutputDefault < matlab.mixin.Copyable diff --git a/matlab/algorithms/DART/SegmentationDefault.m b/matlab/algorithms/DART/SegmentationDefault.m index c1d7d99..98265c0 100644 --- a/matlab/algorithms/DART/SegmentationDefault.m +++ b/matlab/algorithms/DART/SegmentationDefault.m @@ -1,13 +1,12 @@ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox % -% Copyright: iMinds-Vision Lab, University of Antwerp +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -% -% Author of this DART Algorithm: Wim van Aarle - +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- classdef SegmentationDefault < matlab.mixin.Copyable diff --git a/matlab/algorithms/DART/SmoothingDefault.m b/matlab/algorithms/DART/SmoothingDefault.m index 58a8baa..1974fa1 100644 --- a/matlab/algorithms/DART/SmoothingDefault.m +++ b/matlab/algorithms/DART/SmoothingDefault.m @@ -1,13 +1,12 @@ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox % -% Copyright: iMinds-Vision Lab, University of Antwerp +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -% -% Author of this DART Algorithm: Wim van Aarle - +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- classdef SmoothingDefault < matlab.mixin.Copyable @@ -153,7 +152,7 @@ classdef SmoothingDefault < matlab.mixin.Copyable %------------------------------------------------------------------ function V_out = apply_3D_gpu(this, V_in) - vol_geom = astra_create_vol_geom(size(V_in)); + vol_geom = astra_create_vol_geom(size(V_in,2),size(V_in,1),size(V_in,3)); data_id = astra_mex_data3d('create', '-vol', vol_geom, V_in); cfg = astra_struct('DARTSMOOTHING3D_CUDA'); diff --git a/matlab/algorithms/DART/SmoothingGPU.m b/matlab/algorithms/DART/SmoothingGPU.m index 857da37..1249e19 100644 --- a/matlab/algorithms/DART/SmoothingGPU.m +++ b/matlab/algorithms/DART/SmoothingGPU.m @@ -1,13 +1,12 @@ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox % -% Copyright: iMinds-Vision Lab, University of Antwerp +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -% -% Author of this DART Algorithm: Wim van Aarle - +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- classdef SmoothingGPU < matlab.mixin.Copyable diff --git a/matlab/algorithms/DART/StatisticsDefault.m b/matlab/algorithms/DART/StatisticsDefault.m index 7822c5f..9d33256 100644 --- a/matlab/algorithms/DART/StatisticsDefault.m +++ b/matlab/algorithms/DART/StatisticsDefault.m @@ -1,22 +1,21 @@ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox % -% Copyright: iMinds-Vision Lab, University of Antwerp +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam % License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -% -% Author of this DART Algorithm: Wim van Aarle - +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- classdef StatisticsDefault < matlab.mixin.Copyable % Default policy class for statistics for DART. properties (Access=public) - pixel_error = 'yes'; % SETTING: Store pixel error? {'yes','no'} - proj_diff = 'yes'; % SETTING: Store projection difference? {'yes','no'} - timing = 'yes'; % SETTING: Store timings? {'yes','no'} + pixel_error = 'no'; % SETTING: Store pixel error? {'yes','no'} + proj_diff = 'no'; % SETTING: Store projection difference? {'yes','no'} + timing = 'no'; % SETTING: Store timings? {'yes','no'} end diff --git a/matlab/algorithms/DART/TomographyDefault.m b/matlab/algorithms/DART/TomographyDefault.m deleted file mode 100644 index 4db3905..0000000 --- a/matlab/algorithms/DART/TomographyDefault.m +++ /dev/null @@ -1,73 +0,0 @@ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp -% License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -% -% Author of this DART Algorithm: Wim van Aarle - - -classdef TomographyDefault < IterativeTomography - - % Policy class for tomography for DART. - - %---------------------------------------------------------------------- - properties (Access=public) - t = 5; % SETTING: # ARMiterations, each DART iteration. - t0 = 100; % SETTING: # ARM iterations at DART initialization. - end - %---------------------------------------------------------------------- - - methods - - %------------------------------------------------------------------ - function settings = getsettings(this) - % Returns a structure containing all settings of this object. - % >> settings = DART.tomography.getsettings(); -% settings = getsettings@IterativeTomography(); - settings.t = this.t; - settings.t0 = this.t0; - end - - %------------------------------------------------------------------ - function initialize(this, DART) - % Initializes this object. - % >> DART.tomography.initialize(); - this.proj_geom = DART.base.proj_geom; - this.initialize@IterativeTomography(); - end - - %------------------------------------------------------------------ - function P = createForwardProjection(this, ~, volume) - % Compute forward projection. - % >> DART.tomography.createForwardProjection(DART, volume); - P = this.project_c(volume); - end - - %------------------------------------------------------------------ - function I = createReconstruction(this, ~, sinogram, V0, mask) - % Compute reconstruction (with mask). - % >> DART.tomography.createReconstruction(DART, sinogram, V0, mask); - if strcmp(this.inner_circle,'yes') - mask = ROIselectfull(mask, size(mask,1)); - end - I = this.reconstruct_c(sinogram, V0, mask, this.t); - end - - %------------------------------------------------------------------ - function I = createInitialReconstruction(this, ~, sinogram) - % Compute reconstruction (initial). - % >> DART.tomography.createInitialReconstruction(DART, sinogram); - I = this.reconstruct_c(sinogram, [], [], this.t0); - if strcmp(this.inner_circle,'yes') - I = ROIselectfull(I, size(I,1)); - end - end - %------------------------------------------------------------------ - - end - -end - diff --git a/matlab/algorithms/DART/TomographyDefault3D.m b/matlab/algorithms/DART/TomographyDefault3D.m deleted file mode 100644 index 2be1b17..0000000 --- a/matlab/algorithms/DART/TomographyDefault3D.m +++ /dev/null @@ -1,73 +0,0 @@ -% This file is part of the -% All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA-Toolbox") -% -% Copyright: iMinds-Vision Lab, University of Antwerp -% License: Open Source under GPLv3 -% Contact: mailto:astra@ua.ac.be -% Website: http://astra.ua.ac.be -% -% Author of this DART Algorithm: Wim van Aarle - - -classdef TomographyDefault3D < IterativeTomography3D - - % Policy class for 3D tomography for DART. - - %---------------------------------------------------------------------- - properties (Access=public) - t = 5; % SETTING: # ARMiterations, each DART iteration. - t0 = 100; % SETTING: # ARM iterations at DART initialization. - end - %---------------------------------------------------------------------- - - methods - - %------------------------------------------------------------------ - function settings = getsettings(this) - % Returns a structure containing all settings of this object. - % >> settings = DART.tomography.getsettings(); -% settings = getsettings@IterativeTomography(); - settings.t = this.t; - settings.t0 = this.t0; - end - - %------------------------------------------------------------------ - function initialize(this, DART) - % Initializes this object. - % >> DART.tomography.initialize(); - this.proj_geom = DART.base.proj_geom; - this.initialize@IterativeTomography3D(); - end - - %------------------------------------------------------------------ - function P = createForwardProjection(this, ~, volume) - % Compute forward projection. - % >> DART.tomography.createForwardProjection(DART, volume); - P = this.project_c(volume); - end - - %------------------------------------------------------------------ - function I = createReconstruction(this, ~, sinogram, V0, mask) - % Compute reconstruction (with mask). - % >> DART.tomography.createReconstruction(DART, sinogram, V0, mask); - if strcmp(this.inner_circle,'yes') - mask = ROIselectfull(mask, size(mask,1)); - end - I = this.reconstruct_c(sinogram, V0, mask, this.t); - end - - %------------------------------------------------------------------ - function I = createInitialReconstruction(this, ~, sinogram) - % Compute reconstruction (initial). - % >> DART.tomography.createInitialReconstruction(DART, sinogram); - I = this.reconstruct_c(sinogram, [], [], this.t0); - if strcmp(this.inner_circle,'yes') - I = ROIselectfull(I, size(I,1)); - end - end - %------------------------------------------------------------------ - - end - -end - diff --git a/matlab/algorithms/DART/examples/example1.m b/matlab/algorithms/DART/examples/example1.m index daa3ce8..9a836f8 100644 --- a/matlab/algorithms/DART/examples/example1.m +++ b/matlab/algorithms/DART/examples/example1.m @@ -1,62 +1,67 @@ +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam +% License: Open Source under GPLv3 +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- + clear all; -addpath('..'); +addpath('../'); -% -% Example 1: parallel beam, three slices. +%% +% Example 1: 2D parallel beam, cuda % % Configuration -proj_count = 20; -slice_count = 3; +proj_count = 20; dart_iterations = 20; -filename = 'cylinders.png'; -outdir = './'; -prefix = 'example1'; -rho = [0, 1]; -tau = 0.5; -gpu_core = 0; +filename = 'cylinders.png'; +outdir = './'; +prefix = 'example1'; +rho = [0, 255]; +tau = 128; +gpu_core = 0; -% Load phantom. -I = double(imread(filename)) / 255; +% Load phantom +I = imreadgs(filename); -% Create projection and volume geometries. +% Create projection and volume geometries det_count = size(I, 1); -angles = linspace(0, pi - pi / proj_count, proj_count); -proj_geom = astra_create_proj_geom('parallel3d', 1, 1, slice_count, det_count, angles); +angles = linspace2(0, pi, proj_count); +proj_geom = astra_create_proj_geom('parallel', 1, det_count, angles); vol_geom = astra_create_vol_geom(det_count, det_count, 1); % Create sinogram. -[sinogram_id, sinogram] = astra_create_sino3d_cuda(I, proj_geom, vol_geom); -astra_mex_data3d('delete', sinogram_id); +[sinogram_id, sinogram] = astra_create_sino_cuda(I, proj_geom, vol_geom); +astra_mex_data2d('delete', sinogram_id); -% +%% % DART % -base.sinogram = sinogram; -base.proj_geom = proj_geom; +%base.sinogram = sinogram; +%base.proj_geom = proj_geom; -D = DARTalgorithm(base); +D = DARTalgorithm(sinogram, proj_geom); +D.t0 = 100; +D.t = 10; -D.tomography = TomographyDefault3D(); -D.tomography.t0 = 100; -D.tomography.t = 10; -D.tomography.method = 'SIRT3D_CUDA'; -D.tomography.gpu_core = gpu_core; -D.tomography.use_minc = 'yes'; -% D.tomography.maxc = 0.003; % Not a sensible value, just for demonstration. +D.tomography.method = 'SIRT_CUDA'; +D.tomography.gpu_core = gpu_core; +D.tomography.use_minc = 'yes'; -D.segmentation.rho = rho; -D.segmentation.tau = tau; +D.segmentation.rho = rho; +D.segmentation.tau = tau; -D.smoothing.b = 0.1; -D.smoothing.full3d = 'yes'; -D.smoothing.gpu_core = gpu_core; +D.smoothing.b = 0.1; +D.smoothing.gpu_core = gpu_core; -D.masking.random = 0.1; -D.masking.conn = 6; -D.masking.gpu_core = gpu_core; +D.masking.random = 0.1; +D.masking.gpu_core = gpu_core; D.output.directory = outdir; D.output.pre = [prefix '_']; @@ -69,11 +74,10 @@ D.statistics.proj_diff = 'no'; D.initialize(); -disp([D.output.directory D.output.pre]); - D.iterate(dart_iterations); +%% % Convert middle slice of final iteration to png. -load([outdir '/' prefix '_results_' num2str(dart_iterations) '.mat']); -imwritesc(D.S(:, :, round(slice_count / 2)), [outdir '/' prefix '_slice_2_S.png']); -imwritesc(D.V(:, :, round(slice_count / 2)), [outdir '/' prefix '_slice_2_V.png']); +% +imwritesc(D.S, [outdir '/' prefix '_S.png']); +imwritesc(D.V, [outdir '/' prefix '_V.png']); diff --git a/matlab/algorithms/DART/examples/example2.m b/matlab/algorithms/DART/examples/example2.m index 8ee8cba..7fe6988 100644 --- a/matlab/algorithms/DART/examples/example2.m +++ b/matlab/algorithms/DART/examples/example2.m @@ -1,52 +1,56 @@ +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam +% License: Open Source under GPLv3 +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- + clear all; -addpath('..'); +addpath('../'); -% -% Example 2: cone beam, full cube. +%% +% Example Z: 3D parallel beam, cuda % % Configuration -det_count = 128; -proj_count = 45; -slice_count = det_count; +proj_count = 20; dart_iterations = 20; -outdir = './'; -prefix = 'example2'; -rho = [0 0.5 1]; -tau = [0.25 0.75]; -gpu_core = 0; - -% Create phantom. -% I = phantom3d([1 0.9 0.9 0.9 0 0 0 0 0 0; -0.5 0.8 0.8 0.8 0 0 0 0 0 0; -0.5 0.3 0.3 0.3 0 0 0 0 0 0], det_count); -% save('phantom3d', 'I'); -load('phantom3d'); % Loads I. - -% Create projection and volume geometries. -angles = linspace(0, pi - pi / proj_count, proj_count); -proj_geom = astra_create_proj_geom('cone', 1, 1, slice_count, det_count, angles, 500, 0); -vol_geom = astra_create_vol_geom(det_count, det_count, slice_count); - -% Create sinogram. +outdir = './'; +prefix = 'example2'; +rho = [0, 0.5, 1]; +tau = [0.25, 0.75]; +gpu_core = 0; + +% Load phantom +load('phantom3d'); + +% Create projection and volume geometries +det_count = size(I, 1); +slice_count = size(I,3); +angles = linspace2(0, pi, proj_count); +proj_geom = astra_create_proj_geom('parallel3d', 1, 1, slice_count, det_count, angles); +vol_geom = astra_create_vol_geom(size(I)); + +% Create sinogram [sinogram_id, sinogram] = astra_create_sino3d_cuda(I, proj_geom, vol_geom); astra_mex_data3d('delete', sinogram_id); -% +%% % DART % -base.sinogram = sinogram; -base.proj_geom = proj_geom; +D = DARTalgorithm(sinogram, proj_geom); +D.t0 = 100; +D.t = 10; -D = DARTalgorithm(base); - -D.tomography = TomographyDefault3D(); -D.tomography.t0 = 100; -D.tomography.t = 10; -D.tomography.method = 'SIRT3D_CUDA'; -D.tomography.gpu_core = gpu_core; -D.tomography.use_minc = 'yes'; -% D.tomography.maxc = 0.003; % Not a sensible value, just for demonstration. +D.tomography = IterativeTomography3D(); +D.tomography.method = 'SIRT3D_CUDA'; +D.tomography.gpu_core = gpu_core; +D.tomography.use_minc = 'yes'; D.segmentation.rho = rho; D.segmentation.tau = tau; @@ -56,7 +60,7 @@ D.smoothing.full3d = 'yes'; D.smoothing.gpu_core = gpu_core; D.masking.random = 0.1; -D.masking.conn = 6; +D.masking.conn = 4; D.masking.gpu_core = gpu_core; D.output.directory = outdir; @@ -70,11 +74,10 @@ D.statistics.proj_diff = 'no'; D.initialize(); -disp([D.output.directory D.output.pre]); - D.iterate(dart_iterations); -% Convert middle slice of final iteration to png. -load([outdir '/' prefix '_results_' num2str(dart_iterations) '.mat']); -imwritesc(D.S(:, :, round(slice_count / 2)), [outdir '/' prefix '_slice_2_S.png']); -imwritesc(D.V(:, :, round(slice_count / 2)), [outdir '/' prefix '_slice_2_V.png']); +%% +% Convert output of final iteration to png. +% +imwritesc(D.S(:,:,64), [outdir '/' prefix '_S_slice_64.png']); +imwritesc(D.V(:,:,64), [outdir '/' prefix '_V_slice_64.png']); diff --git a/matlab/algorithms/DART/examples/example3.m b/matlab/algorithms/DART/examples/example3.m index 1c04f86..895630b 100644 --- a/matlab/algorithms/DART/examples/example3.m +++ b/matlab/algorithms/DART/examples/example3.m @@ -1,51 +1,56 @@ +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam +% License: Open Source under GPLv3 +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- + clear all; -addpath('..'); +addpath('../'); -% -% Example 3: parallel beam, 2D +%% +% Example 3: 3D cone beam, cuda % % Configuration -proj_count = 20; +proj_count = 20; dart_iterations = 20; -filename = 'cylinders.png'; -outdir = './'; -prefix = 'example3'; -rho = [0, 1]; -tau = 0.5; -gpu_core = 0; +outdir = './'; +prefix = 'example3'; +rho = [0, 0.5, 1]; +tau = [0.25, 0.75]; +gpu_core = 0; -% Load phantom. -I = double(imread(filename)) / 255; +% Load phantom +load('phantom3d'); -% Create projection and volume geometries. +% Create projection and volume geometries det_count = size(I, 1); -angles = linspace(0, pi - pi / proj_count, proj_count); -proj_geom = astra_create_proj_geom('parallel', 1, det_count, angles); -vol_geom = astra_create_vol_geom(det_count, det_count); +slice_count = size(I,3); +angles = linspace2(0, pi, proj_count); +proj_geom = astra_create_proj_geom('cone', 1, 1, slice_count, det_count, angles, 500, 0); +vol_geom = astra_create_vol_geom(size(I)); -% Create sinogram. -[sinogram_id, sinogram] = astra_create_sino_cuda(I, proj_geom, vol_geom); -astra_mex_data2d('delete', sinogram_id); +% Create sinogram +[sinogram_id, sinogram] = astra_create_sino3d_cuda(I, proj_geom, vol_geom); +astra_mex_data3d('delete', sinogram_id); -% +%% % DART % -base.sinogram = sinogram; -base.proj_geom = proj_geom; +D = DARTalgorithm(sinogram, proj_geom); +D.t0 = 100; +D.t = 10; -D = DARTalgorithm(base); - -%D.tomography = TomographyDefault3D(); -D.tomography.t0 = 100; -D.tomography.t = 10; -D.tomography.method = 'SIRT_CUDA'; -D.tomography.proj_type = 'strip'; -D.tomography.gpu_core = gpu_core; -D.tomography.use_minc = 'yes'; -% D.tomography.maxc = 0.003; % Not a sensible value, just for demonstration. +D.tomography = IterativeTomography3D(); +D.tomography.method = 'SIRT3D_CUDA'; +D.tomography.gpu_core = gpu_core; +D.tomography.use_minc = 'yes'; D.segmentation.rho = rho; D.segmentation.tau = tau; @@ -69,11 +74,10 @@ D.statistics.proj_diff = 'no'; D.initialize(); -disp([D.output.directory D.output.pre]); - D.iterate(dart_iterations); +%% % Convert output of final iteration to png. -load([outdir '/' prefix '_results_' num2str(dart_iterations) '.mat']); -imwritesc(D.S, [outdir '/' prefix '_S.png']); -imwritesc(D.V, [outdir '/' prefix '_V.png']); +% +imwritesc(D.S(:,:,64), [outdir '/' prefix '_S_slice_64.png']); +imwritesc(D.V(:,:,64), [outdir '/' prefix '_V_slice_64.png']); diff --git a/matlab/algorithms/DART/tools/DARToptimizer.m b/matlab/algorithms/DART/tools/DARToptimizer.m new file mode 100644 index 0000000..7aeabbe --- /dev/null +++ b/matlab/algorithms/DART/tools/DARToptimizer.m @@ -0,0 +1,118 @@ +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam +% License: Open Source under GPLv3 +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- + +classdef DARToptimizer < handle + + %---------------------------------------------------------------------- + properties (SetAccess=public,GetAccess=public) + + % optimization options + max_evals = 100; % SETTING: Maximum number of function evaluations during optimization. + tolerance = 0.1; % SETTING: Minimum tolerance to achieve. + display = 'off'; % SETTING: Optimization output. {'off','on','iter'} + verbose = 'yes'; % SETTING: verbose? {'yes','no} + + metric = ProjDiffOptimFunc(); % SETTING: Optimization object. Default: ProjDiffOptimFunc. + + % DART options + DART_iterations = 20; % SETTING: number of DART iterations in each evaluation. + + D_base = []; + + end + + %---------------------------------------------------------------------- + properties (SetAccess=private,GetAccess=public) + + stats = Statistics(); + + end + + %---------------------------------------------------------------------- + methods (Access=public) + + %------------------------------------------------------------------ + % Constructor + function this = DARToptimizer(D_base) + + this.D_base = D_base; + + % statistics + this.stats = Statistics(); + this.stats.register('params'); + this.stats.register('values'); + this.stats.register('score'); + end + + %------------------------------------------------------------------ + function opt_values = run(this, params, initial_values) + + if nargin < 3 + for i = 1:numel(params) + initial_values(i) = eval(['this.D_base.' params{i} ';']); + end + end + + % fminsearch + options = optimset('display', this.display, 'MaxFunEvals', this.max_evals, 'TolX', this.tolerance); + opt_values = fminsearch(@this.optim_func, initial_values, options, params); + + % save to D_base + for i = 1:numel(params) + eval(sprintf('this.D_base.%s = %d;',params{i}, opt_values(i))); + end + + end + %------------------------------------------------------------------ + + end + + %---------------------------------------------------------------------- + methods (Access=protected) + + %------------------------------------------------------------------ + function score = optim_func(this, values, params) + + % copy DART + D = this.D_base.deepcopy(); + + % set parameters + for i = 1:numel(params) + eval(sprintf('D.%s = %d;',params{i}, values(i))); + D.output.pre = [D.output.pre num2str(values(i)) '_']; + end + + % evaluate + if D.initialized == 0 + D.initialize(); + end + rng('default'); + D.iterate(this.DART_iterations); + + % compute score + score = this.metric.calculate(D, this); + + % statistics + this.stats.add('params',params); + this.stats.add('values',values); + this.stats.add('score',score); + + % output + if strcmp(this.verbose,'yes') + disp([num2str(values) ': ' num2str(score)]); + end + + end + %------------------------------------------------------------------ + + end + +end + diff --git a/matlab/algorithms/DART/tools/DARToptimizerBoneStudy.m b/matlab/algorithms/DART/tools/DARToptimizerBoneStudy.m new file mode 100644 index 0000000..5bcf6e9 --- /dev/null +++ b/matlab/algorithms/DART/tools/DARToptimizerBoneStudy.m @@ -0,0 +1,118 @@ +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam +% License: Open Source under GPLv3 +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- + +classdef DARToptimizerBoneStudy < handle + + %---------------------------------------------------------------------- + properties (SetAccess=public,GetAccess=public) + + % optimization options + max_evals = 100; + tolerance = 0.1; + display = 'off'; + + % DART options + DART_iterations = 50; + + D_base = []; + + end + + %---------------------------------------------------------------------- + properties (SetAccess=private,GetAccess=public) + + stats = struct(); + + end + + %---------------------------------------------------------------------- + methods (Access=public) + + %------------------------------------------------------------------ + % Constructor + function this = DARToptimizerBoneStudy(D_base) + + this.D_base = D_base; + + this.stats.params = {}; + this.stats.values = []; + this.stats.rmse = []; + this.stats.f_250 = []; + this.stats.f_100 = []; + this.stats.w_250 = []; + this.stats.w_125 = []; + + end + + %------------------------------------------------------------------ + function opt_values = run(this, params, initial_values) + + if nargin < 3 + for i = 1:numel(params) + initial_values(i) = eval(['this.D_base.' params{i} ';']); + end + end + + % fminsearch + options = optimset('display', this.display, 'MaxFunEvals', this.max_evals, 'TolX', this.tolerance); + opt_values = fminsearch(@optim_func, initial_values, options, this.D_base, params, this); + + % save to D_base + for i = 1:numel(params) + eval(sprintf('this.D_base.%s = %d;',params{i}, opt_values(i))); + end + + end + %------------------------------------------------------------------ + end + +end + +%-------------------------------------------------------------------------- +function rmse = optim_func(values, D_base, params, Optim) + + % copy DART + D = D_base.deepcopy(); + + % set parameters + for i = 1:numel(params) + eval(sprintf('D.%s = %d;',params{i}, values(i))); + D.output.pre = [D.output.pre num2str(values(i)) '_']; + end + + % evaluate + if D.initialized == 0 + D.initialize(); + end + rng('default'); + D.iterate(Optim.DART_iterations); + + % compute rmse + ROI = load('roi.mat'); + [rmse, f_250, f_100, w_250, w_125] = compute_rmse(D.S, ROI); + %projection = D.tomography.createForwardProjection(D, D.S); + %proj_diff = sum((projection(:) - D.base.sinogram(:)).^2); + + % save + Optim.stats.params{end+1} = params; + Optim.stats.values(end+1,:) = values; + Optim.stats.rmse(end+1) = rmse; + Optim.stats.f_250(end+1) = f_250; + Optim.stats.f_100(end+1) = f_100; + Optim.stats.w_250(end+1) = w_250; + Optim.stats.w_125(end+1) = w_125; + + disp([num2str(values) ': ' num2str(rmse)]); + +end + + + + diff --git a/matlab/algorithms/DART/tools/ProjDiffOptimFunc.m b/matlab/algorithms/DART/tools/ProjDiffOptimFunc.m new file mode 100644 index 0000000..64f3091 --- /dev/null +++ b/matlab/algorithms/DART/tools/ProjDiffOptimFunc.m @@ -0,0 +1,29 @@ +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam +% License: Open Source under GPLv3 +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- + +classdef ProjDiffOptimFunc < handle + + %---------------------------------------------------------------------- + properties (SetAccess=private, GetAccess=public) + + end + + %---------------------------------------------------------------------- + methods (Access=public) + + function proj_diff = calculate(~, D, ~) + projection = D.tomography.createForwardProjection(D, D.S); + proj_diff = sum((projection(:) - D.base.sinogram(:)).^2); + end + + end + %---------------------------------------------------------------------- + +end diff --git a/matlab/algorithms/DART/tools/dart_create_base_phantom.m b/matlab/algorithms/DART/tools/dart_create_base_phantom.m new file mode 100644 index 0000000..4c7061e --- /dev/null +++ b/matlab/algorithms/DART/tools/dart_create_base_phantom.m @@ -0,0 +1,17 @@ +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam +% License: Open Source under GPLv3 +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- + +function base = dart_create_base_phantom(Im, angle_count, angle_range, gpu_core) + +base.phantom = imreadgs(Im); +base.proj_geom = astra_create_proj_geom('parallel', 1, size(base.phantom,1), linspace2(angle_range(1),angle_range(2),angle_count)); +base.vol_geom = astra_create_vol_geom(size(base.phantom,1),size(base.phantom,2)); +[sino_id, base.sinogram] = astra_create_sino_cuda(base.phantom, base.proj_geom, base.vol_geom, gpu_core); +astra_mex_data2d('delete',sino_id); diff --git a/matlab/algorithms/DART/tools/dart_scheduler.m b/matlab/algorithms/DART/tools/dart_scheduler.m new file mode 100644 index 0000000..007fcaa --- /dev/null +++ b/matlab/algorithms/DART/tools/dart_scheduler.m @@ -0,0 +1,53 @@ +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam +% License: Open Source under GPLv3 +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- + +function dart_scheduler(D_tmpl, iterations, settings) + + +for base_index = 1:numel(settings.base_loop) + + % create new DART object + D = DART(settings.base_loop{base_index}); + + dart_scheduler1D(D, iterations, settings.parameter1); + + % copy from templates + D.tomography = D_tmpl.tomography; + D.smoothing = D_tmpl.smoothing; + D.segmentation = D_tmpl.segmentation; + D.masking = D_tmpl.masking; + D.statistics = D_tmpl.statistics; + D.output = D_tmpl.output; + + % set output options + D.output = OutputScheduler(); + D.output.directory = output_folder{base_index}; + + % run DART + D = D.initialize(); + D = D.iterate(iterations); + +end + +end + +function dart_scheduler1d(D, iterations, parameter_loop1) + +end + + + + + + + + + + diff --git a/matlab/algorithms/DART/tools/rNMPOptimFunc.m b/matlab/algorithms/DART/tools/rNMPOptimFunc.m new file mode 100644 index 0000000..7649d7f --- /dev/null +++ b/matlab/algorithms/DART/tools/rNMPOptimFunc.m @@ -0,0 +1,35 @@ +%-------------------------------------------------------------------------- +% This file is part of the ASTRA Toolbox +% +% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp +% 2014, CWI, Amsterdam +% License: Open Source under GPLv3 +% Contact: astra@uantwerpen.be +% Website: http://sf.net/projects/astra-toolbox +%-------------------------------------------------------------------------- + +classdef rNMPOptimFunc < handle + + %---------------------------------------------------------------------- + properties (SetAccess=private, GetAccess=public) + + end + + %---------------------------------------------------------------------- + methods (Access=public) + + function rnmp = calculate(~, D, ~) + if isfield(D.stats,'rnmp'); + rnmp = D.stats.rnmp; + else + rnmp = compute_rnmp(D.base.phantom, D.S); + end + end + + end + %---------------------------------------------------------------------- + + +end + + -- cgit v1.2.3 From 37fde19dfe60bb8e0b0d96119cc005f756172a3e Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Mon, 26 Jan 2015 11:36:11 +0100 Subject: Update copyright to -2015 --- NEWS.txt | 4 ++-- README.txt | 4 ++-- build/linux/configure.ac | 4 ++-- cuda/2d/algo.cu | 4 ++-- cuda/2d/algo.h | 4 ++-- cuda/2d/arith.cu | 4 ++-- cuda/2d/arith.h | 4 ++-- cuda/2d/astra.cu | 4 ++-- cuda/2d/astra.h | 4 ++-- cuda/2d/cgls.cu | 4 ++-- cuda/2d/cgls.h | 4 ++-- cuda/2d/darthelper.cu | 4 ++-- cuda/2d/darthelper.h | 4 ++-- cuda/2d/dims.h | 4 ++-- cuda/2d/em.cu | 4 ++-- cuda/2d/em.h | 4 ++-- cuda/2d/fan_bp.cu | 4 ++-- cuda/2d/fan_bp.h | 4 ++-- cuda/2d/fan_fp.cu | 4 ++-- cuda/2d/fan_fp.h | 4 ++-- cuda/2d/fbp_filters.h | 4 ++-- cuda/2d/fft.cu | 4 ++-- cuda/2d/fft.h | 4 ++-- cuda/2d/par_bp.cu | 4 ++-- cuda/2d/par_bp.h | 4 ++-- cuda/2d/par_fp.cu | 4 ++-- cuda/2d/par_fp.h | 4 ++-- cuda/2d/sart.cu | 4 ++-- cuda/2d/sart.h | 4 ++-- cuda/2d/sirt.cu | 4 ++-- cuda/2d/sirt.h | 4 ++-- cuda/2d/util.cu | 4 ++-- cuda/2d/util.h | 4 ++-- cuda/3d/algo3d.cu | 4 ++-- cuda/3d/algo3d.h | 4 ++-- cuda/3d/arith3d.cu | 4 ++-- cuda/3d/arith3d.h | 4 ++-- cuda/3d/astra3d.cu | 4 ++-- cuda/3d/astra3d.h | 4 ++-- cuda/3d/cgls3d.cu | 4 ++-- cuda/3d/cgls3d.h | 4 ++-- cuda/3d/cone_bp.cu | 4 ++-- cuda/3d/cone_bp.h | 4 ++-- cuda/3d/cone_fp.cu | 4 ++-- cuda/3d/cone_fp.h | 4 ++-- cuda/3d/darthelper3d.cu | 4 ++-- cuda/3d/darthelper3d.h | 4 ++-- cuda/3d/dims3d.h | 4 ++-- cuda/3d/fdk.cu | 4 ++-- cuda/3d/fdk.h | 4 ++-- cuda/3d/par3d_bp.cu | 4 ++-- cuda/3d/par3d_bp.h | 4 ++-- cuda/3d/par3d_fp.cu | 4 ++-- cuda/3d/par3d_fp.h | 4 ++-- cuda/3d/sirt3d.cu | 4 ++-- cuda/3d/sirt3d.h | 4 ++-- cuda/3d/util3d.cu | 4 ++-- cuda/3d/util3d.h | 4 ++-- include/astra/Algorithm.h | 4 ++-- include/astra/AlgorithmTypelist.h | 4 ++-- include/astra/ArtAlgorithm.h | 4 ++-- include/astra/AstraObjectFactory.h | 4 ++-- include/astra/AstraObjectManager.h | 4 ++-- include/astra/AsyncAlgorithm.h | 4 ++-- include/astra/BackProjectionAlgorithm.h | 4 ++-- include/astra/CglsAlgorithm.h | 4 ++-- include/astra/ConeProjectionGeometry3D.h | 4 ++-- include/astra/ConeVecProjectionGeometry3D.h | 4 ++-- include/astra/Config.h | 4 ++-- include/astra/CudaBackProjectionAlgorithm.h | 4 ++-- include/astra/CudaBackProjectionAlgorithm3D.h | 4 ++-- include/astra/CudaCglsAlgorithm.h | 4 ++-- include/astra/CudaCglsAlgorithm3D.h | 4 ++-- include/astra/CudaDartMaskAlgorithm.h | 4 ++-- include/astra/CudaDartMaskAlgorithm3D.h | 4 ++-- include/astra/CudaDartSmoothingAlgorithm.h | 4 ++-- include/astra/CudaDartSmoothingAlgorithm3D.h | 4 ++-- include/astra/CudaDataOperationAlgorithm.h | 4 ++-- include/astra/CudaEMAlgorithm.h | 4 ++-- include/astra/CudaFDKAlgorithm3D.h | 4 ++-- include/astra/CudaFilteredBackProjectionAlgorithm.h | 4 ++-- include/astra/CudaForwardProjectionAlgorithm.h | 4 ++-- include/astra/CudaForwardProjectionAlgorithm3D.h | 4 ++-- include/astra/CudaProjector2D.h | 4 ++-- include/astra/CudaProjector3D.h | 4 ++-- include/astra/CudaReconstructionAlgorithm2D.h | 4 ++-- include/astra/CudaRoiSelectAlgorithm.h | 4 ++-- include/astra/CudaSartAlgorithm.h | 4 ++-- include/astra/CudaSirtAlgorithm.h | 4 ++-- include/astra/CudaSirtAlgorithm3D.h | 4 ++-- include/astra/DataProjector.h | 4 ++-- include/astra/DataProjectorPolicies.h | 4 ++-- include/astra/DataProjectorPolicies.inl | 4 ++-- include/astra/FanFlatBeamLineKernelProjector2D.h | 4 ++-- include/astra/FanFlatBeamLineKernelProjector2D.inl | 4 ++-- include/astra/FanFlatBeamStripKernelProjector2D.h | 4 ++-- include/astra/FanFlatBeamStripKernelProjector2D.inl | 4 ++-- include/astra/FanFlatProjectionGeometry2D.h | 4 ++-- include/astra/FanFlatVecProjectionGeometry2D.h | 4 ++-- include/astra/FilteredBackProjectionAlgorithm.h | 4 ++-- include/astra/Float32Data.h | 4 ++-- include/astra/Float32Data2D.h | 4 ++-- include/astra/Float32Data3D.h | 4 ++-- include/astra/Float32Data3DMemory.h | 4 ++-- include/astra/Float32ProjectionData2D.h | 4 ++-- include/astra/Float32ProjectionData3D.h | 4 ++-- include/astra/Float32ProjectionData3DMemory.h | 4 ++-- include/astra/Float32VolumeData2D.h | 4 ++-- include/astra/Float32VolumeData3D.h | 4 ++-- include/astra/Float32VolumeData3DMemory.h | 4 ++-- include/astra/ForwardProjectionAlgorithm.h | 4 ++-- include/astra/Fourier.h | 4 ++-- include/astra/Globals.h | 4 ++-- include/astra/Logger.h | 4 ++-- include/astra/ParallelBeamBlobKernelProjector2D.h | 4 ++-- include/astra/ParallelBeamBlobKernelProjector2D.inl | 4 ++-- include/astra/ParallelBeamLineKernelProjector2D.h | 4 ++-- include/astra/ParallelBeamLineKernelProjector2D.inl | 4 ++-- include/astra/ParallelBeamLinearKernelProjector2D.h | 4 ++-- include/astra/ParallelBeamLinearKernelProjector2D.inl | 4 ++-- include/astra/ParallelBeamStripKernelProjector2D.h | 4 ++-- include/astra/ParallelBeamStripKernelProjector2D.inl | 4 ++-- include/astra/ParallelProjectionGeometry2D.h | 4 ++-- include/astra/ParallelProjectionGeometry3D.h | 4 ++-- include/astra/ParallelVecProjectionGeometry3D.h | 4 ++-- include/astra/PlatformDepSystemCode.h | 4 ++-- include/astra/ProjectionGeometry2D.h | 4 ++-- include/astra/ProjectionGeometry3D.h | 4 ++-- include/astra/Projector2D.h | 4 ++-- include/astra/Projector2DImpl.inl | 4 ++-- include/astra/Projector3D.h | 4 ++-- include/astra/ProjectorTypelist.h | 4 ++-- include/astra/ReconstructionAlgorithm2D.h | 4 ++-- include/astra/ReconstructionAlgorithm3D.h | 4 ++-- include/astra/SartAlgorithm.h | 4 ++-- include/astra/Singleton.h | 4 ++-- include/astra/SirtAlgorithm.h | 4 ++-- include/astra/SparseMatrix.h | 4 ++-- include/astra/SparseMatrixProjectionGeometry2D.h | 4 ++-- include/astra/SparseMatrixProjector2D.h | 4 ++-- include/astra/SparseMatrixProjector2D.inl | 4 ++-- include/astra/TypeList.h | 4 ++-- include/astra/Utilities.h | 4 ++-- include/astra/Vector3D.h | 4 ++-- include/astra/VolumeGeometry2D.h | 4 ++-- include/astra/VolumeGeometry3D.h | 4 ++-- include/astra/XMLDocument.h | 4 ++-- include/astra/XMLNode.h | 4 ++-- include/astra/swrap.h | 4 ++-- matlab/algorithms/DART/DARTalgorithm.m | 4 ++-- matlab/algorithms/DART/Kernels.m | 4 ++-- matlab/algorithms/DART/MaskingDefault.m | 4 ++-- matlab/algorithms/DART/MaskingGPU.m | 4 ++-- matlab/algorithms/DART/OutputDefault.m | 4 ++-- matlab/algorithms/DART/SegmentationDefault.m | 4 ++-- matlab/algorithms/DART/SmoothingDefault.m | 4 ++-- matlab/algorithms/DART/SmoothingGPU.m | 4 ++-- matlab/algorithms/DART/StatisticsDefault.m | 4 ++-- matlab/mex/astra_mex.cpp | 4 ++-- matlab/mex/astra_mex_algorithm_c.cpp | 4 ++-- matlab/mex/astra_mex_c.cpp | 4 ++-- matlab/mex/astra_mex_data2d_c.cpp | 4 ++-- matlab/mex/astra_mex_data3d_c.cpp | 4 ++-- matlab/mex/astra_mex_matrix_c.cpp | 4 ++-- matlab/mex/astra_mex_projector3d_c.cpp | 4 ++-- matlab/mex/astra_mex_projector_c.cpp | 4 ++-- matlab/mex/mexHelpFunctions.cpp | 4 ++-- matlab/tools/astra_add_noise_to_sino.m | 4 ++-- matlab/tools/astra_clear.m | 4 ++-- matlab/tools/astra_create_backprojection.m | 4 ++-- matlab/tools/astra_create_backprojection3d_cuda.m | 4 ++-- matlab/tools/astra_create_backprojection_cuda.m | 4 ++-- matlab/tools/astra_create_proj_geom.m | 4 ++-- matlab/tools/astra_create_projector.m | 4 ++-- matlab/tools/astra_create_reconstruction.m | 4 ++-- matlab/tools/astra_create_reconstruction_cuda.m | 4 ++-- matlab/tools/astra_create_sino.m | 4 ++-- matlab/tools/astra_create_sino3d_cuda.m | 4 ++-- matlab/tools/astra_create_sino_cuda.m | 4 ++-- matlab/tools/astra_create_sino_gpu.m | 4 ++-- matlab/tools/astra_create_sino_sampling.m | 4 ++-- matlab/tools/astra_create_vol_geom.m | 4 ++-- matlab/tools/astra_downsample_sinogram.m | 4 ++-- matlab/tools/astra_mex.m | 4 ++-- matlab/tools/astra_mex_algorithm.m | 4 ++-- matlab/tools/astra_mex_data2d.m | 4 ++-- matlab/tools/astra_mex_data3d.m | 4 ++-- matlab/tools/astra_mex_matrix.m | 4 ++-- matlab/tools/astra_mex_projector.m | 4 ++-- matlab/tools/astra_mex_projector3d.m | 4 ++-- matlab/tools/astra_projector_handle.m | 4 ++-- matlab/tools/astra_set_directory.m | 4 ++-- matlab/tools/astra_set_gpu_index.m | 4 ++-- matlab/tools/astra_struct.m | 4 ++-- matlab/tools/createOrderART.m | 4 ++-- matlab/tools/imreadgs.m | 4 ++-- matlab/tools/imresize3D.m | 4 ++-- matlab/tools/imscale.m | 4 ++-- matlab/tools/imwritesc.m | 4 ++-- matlab/tools/kaiserBessel.m | 4 ++-- matlab/tools/linspace2.m | 4 ++-- matlab/tools/overlayImage.m | 4 ++-- matlab/tools/rebin_fan2par.m | 4 ++-- matlab/tools/sliceExtractor.m | 4 ++-- samples/s001_sinogram_par2d.m | 4 ++-- samples/s002_data2d.m | 4 ++-- samples/s003_gpu_reconstruction.m | 4 ++-- samples/s004_cpu_reconstruction.m | 4 ++-- samples/s005_3d_geometry.m | 4 ++-- samples/s006_3d_data.m | 4 ++-- samples/s007_3d_reconstruction.m | 4 ++-- samples/s008_gpu_selection.m | 4 ++-- samples/s009_projection_matrix.m | 4 ++-- samples/s010_supersampling.m | 4 ++-- samples/s011_object_info.m | 4 ++-- samples/s012_masks.m | 4 ++-- samples/s013_constraints.m | 4 ++-- samples/s014_FBP.m | 4 ++-- samples/s015_fp_bp.m | 4 ++-- samples/s016_plots.m | 4 ++-- src/Algorithm.cpp | 4 ++-- src/ArtAlgorithm.cpp | 4 ++-- src/AstraObjectFactory.cpp | 4 ++-- src/AstraObjectManager.cpp | 4 ++-- src/AsyncAlgorithm.cpp | 4 ++-- src/BackProjectionAlgorithm.cpp | 4 ++-- src/CglsAlgorithm.cpp | 4 ++-- src/ConeProjectionGeometry3D.cpp | 4 ++-- src/ConeVecProjectionGeometry3D.cpp | 4 ++-- src/Config.cpp | 4 ++-- src/CudaBackProjectionAlgorithm.cpp | 4 ++-- src/CudaBackProjectionAlgorithm3D.cpp | 4 ++-- src/CudaCglsAlgorithm.cpp | 4 ++-- src/CudaCglsAlgorithm3D.cpp | 4 ++-- src/CudaDartMaskAlgorithm.cpp | 4 ++-- src/CudaDartMaskAlgorithm3D.cpp | 4 ++-- src/CudaDartSmoothingAlgorithm.cpp | 4 ++-- src/CudaDartSmoothingAlgorithm3D.cpp | 4 ++-- src/CudaDataOperationAlgorithm.cpp | 4 ++-- src/CudaEMAlgorithm.cpp | 4 ++-- src/CudaFDKAlgorithm3D.cpp | 4 ++-- src/CudaFilteredBackProjectionAlgorithm.cpp | 4 ++-- src/CudaForwardProjectionAlgorithm.cpp | 4 ++-- src/CudaForwardProjectionAlgorithm3D.cpp | 4 ++-- src/CudaProjector2D.cpp | 4 ++-- src/CudaProjector3D.cpp | 4 ++-- src/CudaReconstructionAlgorithm2D.cpp | 4 ++-- src/CudaRoiSelectAlgorithm.cpp | 4 ++-- src/CudaSartAlgorithm.cpp | 4 ++-- src/CudaSirtAlgorithm.cpp | 4 ++-- src/CudaSirtAlgorithm3D.cpp | 4 ++-- src/DataProjector.cpp | 4 ++-- src/DataProjectorPolicies.cpp | 4 ++-- src/FanFlatBeamLineKernelProjector2D.cpp | 4 ++-- src/FanFlatBeamStripKernelProjector2D.cpp | 4 ++-- src/FanFlatProjectionGeometry2D.cpp | 4 ++-- src/FanFlatVecProjectionGeometry2D.cpp | 4 ++-- src/FilteredBackProjectionAlgorithm.cpp | 4 ++-- src/Float32Data.cpp | 4 ++-- src/Float32Data2D.cpp | 4 ++-- src/Float32Data3D.cpp | 4 ++-- src/Float32Data3DMemory.cpp | 4 ++-- src/Float32ProjectionData2D.cpp | 4 ++-- src/Float32ProjectionData3D.cpp | 4 ++-- src/Float32ProjectionData3DMemory.cpp | 4 ++-- src/Float32VolumeData2D.cpp | 4 ++-- src/Float32VolumeData3D.cpp | 4 ++-- src/Float32VolumeData3DMemory.cpp | 4 ++-- src/ForwardProjectionAlgorithm.cpp | 4 ++-- src/Fourier.cpp | 4 ++-- src/Globals.cpp | 4 ++-- src/Logger.cpp | 4 ++-- src/ParallelBeamBlobKernelProjector2D.cpp | 4 ++-- src/ParallelBeamLineKernelProjector2D.cpp | 4 ++-- src/ParallelBeamLinearKernelProjector2D.cpp | 4 ++-- src/ParallelBeamStripKernelProjector2D.cpp | 4 ++-- src/ParallelProjectionGeometry2D.cpp | 4 ++-- src/ParallelProjectionGeometry3D.cpp | 4 ++-- src/ParallelVecProjectionGeometry3D.cpp | 4 ++-- src/PlatformDepSystemCode.cpp | 4 ++-- src/ProjectionGeometry2D.cpp | 4 ++-- src/ProjectionGeometry3D.cpp | 4 ++-- src/Projector2D.cpp | 4 ++-- src/Projector3D.cpp | 4 ++-- src/ReconstructionAlgorithm2D.cpp | 4 ++-- src/ReconstructionAlgorithm3D.cpp | 4 ++-- src/ReconstructionAlgorithmMultiSlice2D.cpp | 4 ++-- src/SartAlgorithm.cpp | 4 ++-- src/SirtAlgorithm.cpp | 4 ++-- src/SparseMatrix.cpp | 4 ++-- src/SparseMatrixProjectionGeometry2D.cpp | 4 ++-- src/SparseMatrixProjector2D.cpp | 4 ++-- src/Utilities.cpp | 4 ++-- src/Vector3D.cpp | 4 ++-- src/VolumeGeometry2D.cpp | 4 ++-- src/VolumeGeometry3D.cpp | 4 ++-- src/XMLDocument.cpp | 4 ++-- src/XMLNode.cpp | 4 ++-- src/swrap.cpp | 4 ++-- 299 files changed, 598 insertions(+), 598 deletions(-) diff --git a/NEWS.txt b/NEWS.txt index c96098b..314417d 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -1,8 +1,8 @@ ----------------------------------------------------------------------- This file is part of the ASTRA Toolbox -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam http://visielab.uantwerpen.be/ and http://www.cwi.nl/ License: Open Source under GPLv3 Contact: astra@uantwerpen.be diff --git a/README.txt b/README.txt index 6ae1852..2877594 100644 --- a/README.txt +++ b/README.txt @@ -1,8 +1,8 @@ ----------------------------------------------------------------------- This file is part of the ASTRA Toolbox -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam http://visielab.uantwerpen.be/ and http://www.cwi.nl/ License: Open Source under GPLv3 Contact: astra@uantwerpen.be diff --git a/build/linux/configure.ac b/build/linux/configure.ac index 11a8ff2..faebce2 100644 --- a/build/linux/configure.ac +++ b/build/linux/configure.ac @@ -1,6 +1,6 @@ dnl ----------------------------------------------------------------------- -dnl Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -dnl 2014, CWI, Amsterdam +dnl Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +dnl 2014-2015, CWI, Amsterdam dnl dnl Contact: astra@uantwerpen.be dnl Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/algo.cu b/cuda/2d/algo.cu index f40b642..144fabd 100644 --- a/cuda/2d/algo.cu +++ b/cuda/2d/algo.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/algo.h b/cuda/2d/algo.h index 954bb88..a75905e 100644 --- a/cuda/2d/algo.h +++ b/cuda/2d/algo.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/arith.cu b/cuda/2d/arith.cu index 0f84e52..110ed51 100644 --- a/cuda/2d/arith.cu +++ b/cuda/2d/arith.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/arith.h b/cuda/2d/arith.h index 31ecc17..2c648a1 100644 --- a/cuda/2d/arith.h +++ b/cuda/2d/arith.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/astra.cu b/cuda/2d/astra.cu index 2dd819d..d7ddc26 100644 --- a/cuda/2d/astra.cu +++ b/cuda/2d/astra.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/astra.h b/cuda/2d/astra.h index 728449b..474f99a 100644 --- a/cuda/2d/astra.h +++ b/cuda/2d/astra.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/cgls.cu b/cuda/2d/cgls.cu index 40e2f93..9ead563 100644 --- a/cuda/2d/cgls.cu +++ b/cuda/2d/cgls.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/cgls.h b/cuda/2d/cgls.h index fa4118f..c55dd42 100644 --- a/cuda/2d/cgls.h +++ b/cuda/2d/cgls.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/darthelper.cu b/cuda/2d/darthelper.cu index a40a2f1..28ca557 100644 --- a/cuda/2d/darthelper.cu +++ b/cuda/2d/darthelper.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/darthelper.h b/cuda/2d/darthelper.h index 336372e..acd14e3 100644 --- a/cuda/2d/darthelper.h +++ b/cuda/2d/darthelper.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/dims.h b/cuda/2d/dims.h index 961f38c..37bfa66 100644 --- a/cuda/2d/dims.h +++ b/cuda/2d/dims.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/em.cu b/cuda/2d/em.cu index a8fd689..00127c0 100644 --- a/cuda/2d/em.cu +++ b/cuda/2d/em.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/em.h b/cuda/2d/em.h index b3149cc..9b62fa5 100644 --- a/cuda/2d/em.h +++ b/cuda/2d/em.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/fan_bp.cu b/cuda/2d/fan_bp.cu index e71d676..74e8b12 100644 --- a/cuda/2d/fan_bp.cu +++ b/cuda/2d/fan_bp.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/fan_bp.h b/cuda/2d/fan_bp.h index f94d2ca..e4e69b0 100644 --- a/cuda/2d/fan_bp.h +++ b/cuda/2d/fan_bp.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/fan_fp.cu b/cuda/2d/fan_fp.cu index 036006d..7c9d8cc 100644 --- a/cuda/2d/fan_fp.cu +++ b/cuda/2d/fan_fp.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/fan_fp.h b/cuda/2d/fan_fp.h index 11e9281..3962ee3 100644 --- a/cuda/2d/fan_fp.h +++ b/cuda/2d/fan_fp.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/fbp_filters.h b/cuda/2d/fbp_filters.h index befd270..b206a5d 100644 --- a/cuda/2d/fbp_filters.h +++ b/cuda/2d/fbp_filters.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/fft.cu b/cuda/2d/fft.cu index f0cc103..d105e29 100644 --- a/cuda/2d/fft.cu +++ b/cuda/2d/fft.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/fft.h b/cuda/2d/fft.h index 4811761..e985fc6 100644 --- a/cuda/2d/fft.h +++ b/cuda/2d/fft.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/par_bp.cu b/cuda/2d/par_bp.cu index f9147c8..635200f 100644 --- a/cuda/2d/par_bp.cu +++ b/cuda/2d/par_bp.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/par_bp.h b/cuda/2d/par_bp.h index 68b61b5..eaeafd8 100644 --- a/cuda/2d/par_bp.h +++ b/cuda/2d/par_bp.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/par_fp.cu b/cuda/2d/par_fp.cu index 390c3bb..d0ca7ff 100644 --- a/cuda/2d/par_fp.cu +++ b/cuda/2d/par_fp.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/par_fp.h b/cuda/2d/par_fp.h index 9352be0..010d064 100644 --- a/cuda/2d/par_fp.h +++ b/cuda/2d/par_fp.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/sart.cu b/cuda/2d/sart.cu index 6c03933..29670c3 100644 --- a/cuda/2d/sart.cu +++ b/cuda/2d/sart.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/sart.h b/cuda/2d/sart.h index cda38de..6574a6f 100644 --- a/cuda/2d/sart.h +++ b/cuda/2d/sart.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/sirt.cu b/cuda/2d/sirt.cu index 8dcd553..a6194a5 100644 --- a/cuda/2d/sirt.cu +++ b/cuda/2d/sirt.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/sirt.h b/cuda/2d/sirt.h index 0edddab..21094a1 100644 --- a/cuda/2d/sirt.h +++ b/cuda/2d/sirt.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/util.cu b/cuda/2d/util.cu index f4e6094..81e368f 100644 --- a/cuda/2d/util.cu +++ b/cuda/2d/util.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/2d/util.h b/cuda/2d/util.h index d73445e..ff438c3 100644 --- a/cuda/2d/util.h +++ b/cuda/2d/util.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/algo3d.cu b/cuda/3d/algo3d.cu index 1372495..7f61280 100644 --- a/cuda/3d/algo3d.cu +++ b/cuda/3d/algo3d.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/algo3d.h b/cuda/3d/algo3d.h index cbb42e5..f4c6a87 100644 --- a/cuda/3d/algo3d.h +++ b/cuda/3d/algo3d.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/arith3d.cu b/cuda/3d/arith3d.cu index 659a8d3..471b5cd 100644 --- a/cuda/3d/arith3d.cu +++ b/cuda/3d/arith3d.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/arith3d.h b/cuda/3d/arith3d.h index b0cd42d..85d3d3b 100644 --- a/cuda/3d/arith3d.h +++ b/cuda/3d/arith3d.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/astra3d.cu b/cuda/3d/astra3d.cu index e28c42f..0b9c70b 100644 --- a/cuda/3d/astra3d.cu +++ b/cuda/3d/astra3d.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/astra3d.h b/cuda/3d/astra3d.h index 50cdecf..f91fe26 100644 --- a/cuda/3d/astra3d.h +++ b/cuda/3d/astra3d.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/cgls3d.cu b/cuda/3d/cgls3d.cu index fd0e1ca..5071a9b 100644 --- a/cuda/3d/cgls3d.cu +++ b/cuda/3d/cgls3d.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/cgls3d.h b/cuda/3d/cgls3d.h index 4545cee..bfb4af8 100644 --- a/cuda/3d/cgls3d.h +++ b/cuda/3d/cgls3d.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/cone_bp.cu b/cuda/3d/cone_bp.cu index 6bc3374..18ee4b7 100644 --- a/cuda/3d/cone_bp.cu +++ b/cuda/3d/cone_bp.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/cone_bp.h b/cuda/3d/cone_bp.h index 8a4d250..cba6d9f 100644 --- a/cuda/3d/cone_bp.h +++ b/cuda/3d/cone_bp.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/cone_fp.cu b/cuda/3d/cone_fp.cu index 88cf08e..bda71ba 100644 --- a/cuda/3d/cone_fp.cu +++ b/cuda/3d/cone_fp.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/cone_fp.h b/cuda/3d/cone_fp.h index 4734ca9..969a6d8 100644 --- a/cuda/3d/cone_fp.h +++ b/cuda/3d/cone_fp.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/darthelper3d.cu b/cuda/3d/darthelper3d.cu index 9a8857a..d9bd636 100644 --- a/cuda/3d/darthelper3d.cu +++ b/cuda/3d/darthelper3d.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/darthelper3d.h b/cuda/3d/darthelper3d.h index 0b6fb79..fdf43b9 100644 --- a/cuda/3d/darthelper3d.h +++ b/cuda/3d/darthelper3d.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/dims3d.h b/cuda/3d/dims3d.h index 6adc454..de2a0d0 100644 --- a/cuda/3d/dims3d.h +++ b/cuda/3d/dims3d.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/fdk.cu b/cuda/3d/fdk.cu index 0b2c6c0..0e13be1 100644 --- a/cuda/3d/fdk.cu +++ b/cuda/3d/fdk.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/fdk.h b/cuda/3d/fdk.h index 021f16b..de7fe53 100644 --- a/cuda/3d/fdk.h +++ b/cuda/3d/fdk.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/par3d_bp.cu b/cuda/3d/par3d_bp.cu index 1247c4c..8b9dac1 100644 --- a/cuda/3d/par3d_bp.cu +++ b/cuda/3d/par3d_bp.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/par3d_bp.h b/cuda/3d/par3d_bp.h index 34bd04b..ece37d1 100644 --- a/cuda/3d/par3d_bp.h +++ b/cuda/3d/par3d_bp.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/par3d_fp.cu b/cuda/3d/par3d_fp.cu index c235e15..8d44540 100644 --- a/cuda/3d/par3d_fp.cu +++ b/cuda/3d/par3d_fp.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/par3d_fp.h b/cuda/3d/par3d_fp.h index 0c41fcd..41f204f 100644 --- a/cuda/3d/par3d_fp.h +++ b/cuda/3d/par3d_fp.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/sirt3d.cu b/cuda/3d/sirt3d.cu index d143d38..389ee6b 100644 --- a/cuda/3d/sirt3d.cu +++ b/cuda/3d/sirt3d.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/sirt3d.h b/cuda/3d/sirt3d.h index 9e61162..bb3864a 100644 --- a/cuda/3d/sirt3d.h +++ b/cuda/3d/sirt3d.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/util3d.cu b/cuda/3d/util3d.cu index cb43144..d85a928 100644 --- a/cuda/3d/util3d.cu +++ b/cuda/3d/util3d.cu @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/cuda/3d/util3d.h b/cuda/3d/util3d.h index 018cf6c..fa0a03f 100644 --- a/cuda/3d/util3d.h +++ b/cuda/3d/util3d.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/Algorithm.h b/include/astra/Algorithm.h index 334dc01..049417c 100644 --- a/include/astra/Algorithm.h +++ b/include/astra/Algorithm.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/AlgorithmTypelist.h b/include/astra/AlgorithmTypelist.h index 349fc93..8886a07 100644 --- a/include/astra/AlgorithmTypelist.h +++ b/include/astra/AlgorithmTypelist.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/ArtAlgorithm.h b/include/astra/ArtAlgorithm.h index ff9f8ad..d232b95 100644 --- a/include/astra/ArtAlgorithm.h +++ b/include/astra/ArtAlgorithm.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/AstraObjectFactory.h b/include/astra/AstraObjectFactory.h index bd050dd..ba4ec11 100644 --- a/include/astra/AstraObjectFactory.h +++ b/include/astra/AstraObjectFactory.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/AstraObjectManager.h b/include/astra/AstraObjectManager.h index ab4f39c..895f955 100644 --- a/include/astra/AstraObjectManager.h +++ b/include/astra/AstraObjectManager.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/AsyncAlgorithm.h b/include/astra/AsyncAlgorithm.h index 9e72682..2d5d31e 100644 --- a/include/astra/AsyncAlgorithm.h +++ b/include/astra/AsyncAlgorithm.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/BackProjectionAlgorithm.h b/include/astra/BackProjectionAlgorithm.h index 608a133..6c55fd5 100644 --- a/include/astra/BackProjectionAlgorithm.h +++ b/include/astra/BackProjectionAlgorithm.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/CglsAlgorithm.h b/include/astra/CglsAlgorithm.h index 2c59c56..411f1f9 100644 --- a/include/astra/CglsAlgorithm.h +++ b/include/astra/CglsAlgorithm.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/ConeProjectionGeometry3D.h b/include/astra/ConeProjectionGeometry3D.h index 5f6c6b8..9ef5fc0 100644 --- a/include/astra/ConeProjectionGeometry3D.h +++ b/include/astra/ConeProjectionGeometry3D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/ConeVecProjectionGeometry3D.h b/include/astra/ConeVecProjectionGeometry3D.h index b829d0e..75ffa12 100644 --- a/include/astra/ConeVecProjectionGeometry3D.h +++ b/include/astra/ConeVecProjectionGeometry3D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/Config.h b/include/astra/Config.h index 65b47a2..647462b 100644 --- a/include/astra/Config.h +++ b/include/astra/Config.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/CudaBackProjectionAlgorithm.h b/include/astra/CudaBackProjectionAlgorithm.h index 0b11b1e..84899b0 100644 --- a/include/astra/CudaBackProjectionAlgorithm.h +++ b/include/astra/CudaBackProjectionAlgorithm.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/CudaBackProjectionAlgorithm3D.h b/include/astra/CudaBackProjectionAlgorithm3D.h index 1f73c6b..2d98218 100644 --- a/include/astra/CudaBackProjectionAlgorithm3D.h +++ b/include/astra/CudaBackProjectionAlgorithm3D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/CudaCglsAlgorithm.h b/include/astra/CudaCglsAlgorithm.h index b5af2db..c51093c 100644 --- a/include/astra/CudaCglsAlgorithm.h +++ b/include/astra/CudaCglsAlgorithm.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/CudaCglsAlgorithm3D.h b/include/astra/CudaCglsAlgorithm3D.h index 9968eda..77c41c1 100644 --- a/include/astra/CudaCglsAlgorithm3D.h +++ b/include/astra/CudaCglsAlgorithm3D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/CudaDartMaskAlgorithm.h b/include/astra/CudaDartMaskAlgorithm.h index ae6ecba..b3a5c99 100644 --- a/include/astra/CudaDartMaskAlgorithm.h +++ b/include/astra/CudaDartMaskAlgorithm.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/CudaDartMaskAlgorithm3D.h b/include/astra/CudaDartMaskAlgorithm3D.h index 8024574..6a71bf3 100644 --- a/include/astra/CudaDartMaskAlgorithm3D.h +++ b/include/astra/CudaDartMaskAlgorithm3D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/CudaDartSmoothingAlgorithm.h b/include/astra/CudaDartSmoothingAlgorithm.h index 2bc8965..1beac56 100644 --- a/include/astra/CudaDartSmoothingAlgorithm.h +++ b/include/astra/CudaDartSmoothingAlgorithm.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/CudaDartSmoothingAlgorithm3D.h b/include/astra/CudaDartSmoothingAlgorithm3D.h index d8d5c25..ad69c5a 100644 --- a/include/astra/CudaDartSmoothingAlgorithm3D.h +++ b/include/astra/CudaDartSmoothingAlgorithm3D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/CudaDataOperationAlgorithm.h b/include/astra/CudaDataOperationAlgorithm.h index 28ec653..31f0ff5 100644 --- a/include/astra/CudaDataOperationAlgorithm.h +++ b/include/astra/CudaDataOperationAlgorithm.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/CudaEMAlgorithm.h b/include/astra/CudaEMAlgorithm.h index 61c9802..97eb7ca 100644 --- a/include/astra/CudaEMAlgorithm.h +++ b/include/astra/CudaEMAlgorithm.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/CudaFDKAlgorithm3D.h b/include/astra/CudaFDKAlgorithm3D.h index 458161e..1b025f1 100644 --- a/include/astra/CudaFDKAlgorithm3D.h +++ b/include/astra/CudaFDKAlgorithm3D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/CudaFilteredBackProjectionAlgorithm.h b/include/astra/CudaFilteredBackProjectionAlgorithm.h index 9928a33..33445b6 100644 --- a/include/astra/CudaFilteredBackProjectionAlgorithm.h +++ b/include/astra/CudaFilteredBackProjectionAlgorithm.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/CudaForwardProjectionAlgorithm.h b/include/astra/CudaForwardProjectionAlgorithm.h index 8b29359..d172a7a 100644 --- a/include/astra/CudaForwardProjectionAlgorithm.h +++ b/include/astra/CudaForwardProjectionAlgorithm.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/CudaForwardProjectionAlgorithm3D.h b/include/astra/CudaForwardProjectionAlgorithm3D.h index 985147b..bdd1356 100644 --- a/include/astra/CudaForwardProjectionAlgorithm3D.h +++ b/include/astra/CudaForwardProjectionAlgorithm3D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/CudaProjector2D.h b/include/astra/CudaProjector2D.h index 6837c21..a571851 100644 --- a/include/astra/CudaProjector2D.h +++ b/include/astra/CudaProjector2D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/CudaProjector3D.h b/include/astra/CudaProjector3D.h index 82d5a5f..a181531 100644 --- a/include/astra/CudaProjector3D.h +++ b/include/astra/CudaProjector3D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/CudaReconstructionAlgorithm2D.h b/include/astra/CudaReconstructionAlgorithm2D.h index f2b3580..e19bb8f 100644 --- a/include/astra/CudaReconstructionAlgorithm2D.h +++ b/include/astra/CudaReconstructionAlgorithm2D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/CudaRoiSelectAlgorithm.h b/include/astra/CudaRoiSelectAlgorithm.h index 3ba17e7..8d25fb8 100644 --- a/include/astra/CudaRoiSelectAlgorithm.h +++ b/include/astra/CudaRoiSelectAlgorithm.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/CudaSartAlgorithm.h b/include/astra/CudaSartAlgorithm.h index b7320d7..b370bd0 100644 --- a/include/astra/CudaSartAlgorithm.h +++ b/include/astra/CudaSartAlgorithm.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/CudaSirtAlgorithm.h b/include/astra/CudaSirtAlgorithm.h index cbb97fb..607889a 100644 --- a/include/astra/CudaSirtAlgorithm.h +++ b/include/astra/CudaSirtAlgorithm.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/CudaSirtAlgorithm3D.h b/include/astra/CudaSirtAlgorithm3D.h index bff4058..fda4635 100644 --- a/include/astra/CudaSirtAlgorithm3D.h +++ b/include/astra/CudaSirtAlgorithm3D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/DataProjector.h b/include/astra/DataProjector.h index a9b5fd1..e486075 100644 --- a/include/astra/DataProjector.h +++ b/include/astra/DataProjector.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/DataProjectorPolicies.h b/include/astra/DataProjectorPolicies.h index 2572d6f..c258f5c 100644 --- a/include/astra/DataProjectorPolicies.h +++ b/include/astra/DataProjectorPolicies.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/DataProjectorPolicies.inl b/include/astra/DataProjectorPolicies.inl index 98d3252..0c0eddd 100644 --- a/include/astra/DataProjectorPolicies.inl +++ b/include/astra/DataProjectorPolicies.inl @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/FanFlatBeamLineKernelProjector2D.h b/include/astra/FanFlatBeamLineKernelProjector2D.h index 76852bd..f1a80ed 100644 --- a/include/astra/FanFlatBeamLineKernelProjector2D.h +++ b/include/astra/FanFlatBeamLineKernelProjector2D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/FanFlatBeamLineKernelProjector2D.inl b/include/astra/FanFlatBeamLineKernelProjector2D.inl index 8d490be..2f87659 100644 --- a/include/astra/FanFlatBeamLineKernelProjector2D.inl +++ b/include/astra/FanFlatBeamLineKernelProjector2D.inl @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/FanFlatBeamStripKernelProjector2D.h b/include/astra/FanFlatBeamStripKernelProjector2D.h index 475b030..08e29e7 100644 --- a/include/astra/FanFlatBeamStripKernelProjector2D.h +++ b/include/astra/FanFlatBeamStripKernelProjector2D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/FanFlatBeamStripKernelProjector2D.inl b/include/astra/FanFlatBeamStripKernelProjector2D.inl index 6d3fd67..38cf003 100644 --- a/include/astra/FanFlatBeamStripKernelProjector2D.inl +++ b/include/astra/FanFlatBeamStripKernelProjector2D.inl @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/FanFlatProjectionGeometry2D.h b/include/astra/FanFlatProjectionGeometry2D.h index b581c28..8f22c35 100644 --- a/include/astra/FanFlatProjectionGeometry2D.h +++ b/include/astra/FanFlatProjectionGeometry2D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/FanFlatVecProjectionGeometry2D.h b/include/astra/FanFlatVecProjectionGeometry2D.h index 33e15e3..85c994f 100644 --- a/include/astra/FanFlatVecProjectionGeometry2D.h +++ b/include/astra/FanFlatVecProjectionGeometry2D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/FilteredBackProjectionAlgorithm.h b/include/astra/FilteredBackProjectionAlgorithm.h index 6495d7d..0ae0f25 100644 --- a/include/astra/FilteredBackProjectionAlgorithm.h +++ b/include/astra/FilteredBackProjectionAlgorithm.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/Float32Data.h b/include/astra/Float32Data.h index ffd9b08..6d36ff8 100644 --- a/include/astra/Float32Data.h +++ b/include/astra/Float32Data.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/Float32Data2D.h b/include/astra/Float32Data2D.h index 53ec23f..57cb82b 100644 --- a/include/astra/Float32Data2D.h +++ b/include/astra/Float32Data2D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/Float32Data3D.h b/include/astra/Float32Data3D.h index 502e62d..a5add3a 100644 --- a/include/astra/Float32Data3D.h +++ b/include/astra/Float32Data3D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/Float32Data3DMemory.h b/include/astra/Float32Data3DMemory.h index 6c21fed..ab2c82e 100644 --- a/include/astra/Float32Data3DMemory.h +++ b/include/astra/Float32Data3DMemory.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/Float32ProjectionData2D.h b/include/astra/Float32ProjectionData2D.h index 7728bee..7461491 100644 --- a/include/astra/Float32ProjectionData2D.h +++ b/include/astra/Float32ProjectionData2D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/Float32ProjectionData3D.h b/include/astra/Float32ProjectionData3D.h index 9bbd423..79b762e 100644 --- a/include/astra/Float32ProjectionData3D.h +++ b/include/astra/Float32ProjectionData3D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/Float32ProjectionData3DMemory.h b/include/astra/Float32ProjectionData3DMemory.h index d104b53..f7882b7 100644 --- a/include/astra/Float32ProjectionData3DMemory.h +++ b/include/astra/Float32ProjectionData3DMemory.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/Float32VolumeData2D.h b/include/astra/Float32VolumeData2D.h index 2a39599..4f44a8c 100644 --- a/include/astra/Float32VolumeData2D.h +++ b/include/astra/Float32VolumeData2D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/Float32VolumeData3D.h b/include/astra/Float32VolumeData3D.h index 5f717c3..d8f0ae9 100644 --- a/include/astra/Float32VolumeData3D.h +++ b/include/astra/Float32VolumeData3D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/Float32VolumeData3DMemory.h b/include/astra/Float32VolumeData3DMemory.h index 6b195ee..619d83b 100644 --- a/include/astra/Float32VolumeData3DMemory.h +++ b/include/astra/Float32VolumeData3DMemory.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/ForwardProjectionAlgorithm.h b/include/astra/ForwardProjectionAlgorithm.h index 3354f16..4188010 100644 --- a/include/astra/ForwardProjectionAlgorithm.h +++ b/include/astra/ForwardProjectionAlgorithm.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/Fourier.h b/include/astra/Fourier.h index 2060b51..b515dc6 100644 --- a/include/astra/Fourier.h +++ b/include/astra/Fourier.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/Globals.h b/include/astra/Globals.h index 480638f..e83813c 100644 --- a/include/astra/Globals.h +++ b/include/astra/Globals.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/Logger.h b/include/astra/Logger.h index 9145bcd..34fd364 100644 --- a/include/astra/Logger.h +++ b/include/astra/Logger.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/ParallelBeamBlobKernelProjector2D.h b/include/astra/ParallelBeamBlobKernelProjector2D.h index bfce99c..ecf71ef 100644 --- a/include/astra/ParallelBeamBlobKernelProjector2D.h +++ b/include/astra/ParallelBeamBlobKernelProjector2D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/ParallelBeamBlobKernelProjector2D.inl b/include/astra/ParallelBeamBlobKernelProjector2D.inl index 24684aa..467e066 100644 --- a/include/astra/ParallelBeamBlobKernelProjector2D.inl +++ b/include/astra/ParallelBeamBlobKernelProjector2D.inl @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/ParallelBeamLineKernelProjector2D.h b/include/astra/ParallelBeamLineKernelProjector2D.h index 2c0b920..24f43d5 100644 --- a/include/astra/ParallelBeamLineKernelProjector2D.h +++ b/include/astra/ParallelBeamLineKernelProjector2D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/ParallelBeamLineKernelProjector2D.inl b/include/astra/ParallelBeamLineKernelProjector2D.inl index 3cf3958..199d69e 100644 --- a/include/astra/ParallelBeamLineKernelProjector2D.inl +++ b/include/astra/ParallelBeamLineKernelProjector2D.inl @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/ParallelBeamLinearKernelProjector2D.h b/include/astra/ParallelBeamLinearKernelProjector2D.h index 7d9023a..855093a 100644 --- a/include/astra/ParallelBeamLinearKernelProjector2D.h +++ b/include/astra/ParallelBeamLinearKernelProjector2D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/ParallelBeamLinearKernelProjector2D.inl b/include/astra/ParallelBeamLinearKernelProjector2D.inl index df1a475..67e0d58 100644 --- a/include/astra/ParallelBeamLinearKernelProjector2D.inl +++ b/include/astra/ParallelBeamLinearKernelProjector2D.inl @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/ParallelBeamStripKernelProjector2D.h b/include/astra/ParallelBeamStripKernelProjector2D.h index f1954d5..624bd3c 100644 --- a/include/astra/ParallelBeamStripKernelProjector2D.h +++ b/include/astra/ParallelBeamStripKernelProjector2D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/ParallelBeamStripKernelProjector2D.inl b/include/astra/ParallelBeamStripKernelProjector2D.inl index 2e5a023..7d73888 100644 --- a/include/astra/ParallelBeamStripKernelProjector2D.inl +++ b/include/astra/ParallelBeamStripKernelProjector2D.inl @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/ParallelProjectionGeometry2D.h b/include/astra/ParallelProjectionGeometry2D.h index f41e7fd..ed9d228 100644 --- a/include/astra/ParallelProjectionGeometry2D.h +++ b/include/astra/ParallelProjectionGeometry2D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/ParallelProjectionGeometry3D.h b/include/astra/ParallelProjectionGeometry3D.h index 2a46981..9d61daa 100644 --- a/include/astra/ParallelProjectionGeometry3D.h +++ b/include/astra/ParallelProjectionGeometry3D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/ParallelVecProjectionGeometry3D.h b/include/astra/ParallelVecProjectionGeometry3D.h index 981f1f9..12365a1 100644 --- a/include/astra/ParallelVecProjectionGeometry3D.h +++ b/include/astra/ParallelVecProjectionGeometry3D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/PlatformDepSystemCode.h b/include/astra/PlatformDepSystemCode.h index 57ad0db..580c393 100644 --- a/include/astra/PlatformDepSystemCode.h +++ b/include/astra/PlatformDepSystemCode.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/ProjectionGeometry2D.h b/include/astra/ProjectionGeometry2D.h index 58351f8..303ca0a 100644 --- a/include/astra/ProjectionGeometry2D.h +++ b/include/astra/ProjectionGeometry2D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/ProjectionGeometry3D.h b/include/astra/ProjectionGeometry3D.h index 15dab87..6bc9368 100644 --- a/include/astra/ProjectionGeometry3D.h +++ b/include/astra/ProjectionGeometry3D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/Projector2D.h b/include/astra/Projector2D.h index 73d8862..a1ea0ce 100644 --- a/include/astra/Projector2D.h +++ b/include/astra/Projector2D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/Projector2DImpl.inl b/include/astra/Projector2DImpl.inl index 0bb39ee..75b12d0 100644 --- a/include/astra/Projector2DImpl.inl +++ b/include/astra/Projector2DImpl.inl @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/Projector3D.h b/include/astra/Projector3D.h index 6dcf08f..e1f0646 100644 --- a/include/astra/Projector3D.h +++ b/include/astra/Projector3D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/ProjectorTypelist.h b/include/astra/ProjectorTypelist.h index d448445..4ab7e98 100644 --- a/include/astra/ProjectorTypelist.h +++ b/include/astra/ProjectorTypelist.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/ReconstructionAlgorithm2D.h b/include/astra/ReconstructionAlgorithm2D.h index 2ac3811..60584e0 100644 --- a/include/astra/ReconstructionAlgorithm2D.h +++ b/include/astra/ReconstructionAlgorithm2D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/ReconstructionAlgorithm3D.h b/include/astra/ReconstructionAlgorithm3D.h index 6ed0f73..42b2ab4 100644 --- a/include/astra/ReconstructionAlgorithm3D.h +++ b/include/astra/ReconstructionAlgorithm3D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/SartAlgorithm.h b/include/astra/SartAlgorithm.h index 5ca52e3..eb4c61e 100644 --- a/include/astra/SartAlgorithm.h +++ b/include/astra/SartAlgorithm.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/Singleton.h b/include/astra/Singleton.h index e5c5db5..a256187 100644 --- a/include/astra/Singleton.h +++ b/include/astra/Singleton.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/SirtAlgorithm.h b/include/astra/SirtAlgorithm.h index 9cba671..05b3fa9 100644 --- a/include/astra/SirtAlgorithm.h +++ b/include/astra/SirtAlgorithm.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/SparseMatrix.h b/include/astra/SparseMatrix.h index 767f654..585981c 100644 --- a/include/astra/SparseMatrix.h +++ b/include/astra/SparseMatrix.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/SparseMatrixProjectionGeometry2D.h b/include/astra/SparseMatrixProjectionGeometry2D.h index 4bc8034..36964be 100644 --- a/include/astra/SparseMatrixProjectionGeometry2D.h +++ b/include/astra/SparseMatrixProjectionGeometry2D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/SparseMatrixProjector2D.h b/include/astra/SparseMatrixProjector2D.h index c0e3af6..839fd2a 100644 --- a/include/astra/SparseMatrixProjector2D.h +++ b/include/astra/SparseMatrixProjector2D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/SparseMatrixProjector2D.inl b/include/astra/SparseMatrixProjector2D.inl index b190110..8246e42 100644 --- a/include/astra/SparseMatrixProjector2D.inl +++ b/include/astra/SparseMatrixProjector2D.inl @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/TypeList.h b/include/astra/TypeList.h index 65487e4..442bb25 100644 --- a/include/astra/TypeList.h +++ b/include/astra/TypeList.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/Utilities.h b/include/astra/Utilities.h index 94adea9..68471d0 100644 --- a/include/astra/Utilities.h +++ b/include/astra/Utilities.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/Vector3D.h b/include/astra/Vector3D.h index 66b47b4..2dfc31d 100644 --- a/include/astra/Vector3D.h +++ b/include/astra/Vector3D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/VolumeGeometry2D.h b/include/astra/VolumeGeometry2D.h index a709b2a..fa0528d 100644 --- a/include/astra/VolumeGeometry2D.h +++ b/include/astra/VolumeGeometry2D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/VolumeGeometry3D.h b/include/astra/VolumeGeometry3D.h index eba0a92..d5c8fff 100644 --- a/include/astra/VolumeGeometry3D.h +++ b/include/astra/VolumeGeometry3D.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/XMLDocument.h b/include/astra/XMLDocument.h index 2c188f0..c6f1b9a 100644 --- a/include/astra/XMLDocument.h +++ b/include/astra/XMLDocument.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/XMLNode.h b/include/astra/XMLNode.h index 38dd2db..eceffe1 100644 --- a/include/astra/XMLNode.h +++ b/include/astra/XMLNode.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/include/astra/swrap.h b/include/astra/swrap.h index e011617..612d1b6 100644 --- a/include/astra/swrap.h +++ b/include/astra/swrap.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/algorithms/DART/DARTalgorithm.m b/matlab/algorithms/DART/DARTalgorithm.m index 85a3ca0..f8c2ce7 100644 --- a/matlab/algorithms/DART/DARTalgorithm.m +++ b/matlab/algorithms/DART/DARTalgorithm.m @@ -1,8 +1,8 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/algorithms/DART/Kernels.m b/matlab/algorithms/DART/Kernels.m index 558f611..f91bf33 100644 --- a/matlab/algorithms/DART/Kernels.m +++ b/matlab/algorithms/DART/Kernels.m @@ -1,8 +1,8 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/algorithms/DART/MaskingDefault.m b/matlab/algorithms/DART/MaskingDefault.m index f91a6f5..1ecbacb 100644 --- a/matlab/algorithms/DART/MaskingDefault.m +++ b/matlab/algorithms/DART/MaskingDefault.m @@ -1,8 +1,8 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/algorithms/DART/MaskingGPU.m b/matlab/algorithms/DART/MaskingGPU.m index 7d31aa8..dfbbd54 100644 --- a/matlab/algorithms/DART/MaskingGPU.m +++ b/matlab/algorithms/DART/MaskingGPU.m @@ -1,8 +1,8 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/algorithms/DART/OutputDefault.m b/matlab/algorithms/DART/OutputDefault.m index 33e908b..968261d 100644 --- a/matlab/algorithms/DART/OutputDefault.m +++ b/matlab/algorithms/DART/OutputDefault.m @@ -1,8 +1,8 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/algorithms/DART/SegmentationDefault.m b/matlab/algorithms/DART/SegmentationDefault.m index 98265c0..3b42740 100644 --- a/matlab/algorithms/DART/SegmentationDefault.m +++ b/matlab/algorithms/DART/SegmentationDefault.m @@ -1,8 +1,8 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/algorithms/DART/SmoothingDefault.m b/matlab/algorithms/DART/SmoothingDefault.m index 1974fa1..f89526e 100644 --- a/matlab/algorithms/DART/SmoothingDefault.m +++ b/matlab/algorithms/DART/SmoothingDefault.m @@ -1,8 +1,8 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/algorithms/DART/SmoothingGPU.m b/matlab/algorithms/DART/SmoothingGPU.m index 1249e19..5a8fa48 100644 --- a/matlab/algorithms/DART/SmoothingGPU.m +++ b/matlab/algorithms/DART/SmoothingGPU.m @@ -1,8 +1,8 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/algorithms/DART/StatisticsDefault.m b/matlab/algorithms/DART/StatisticsDefault.m index 9d33256..31ead14 100644 --- a/matlab/algorithms/DART/StatisticsDefault.m +++ b/matlab/algorithms/DART/StatisticsDefault.m @@ -1,8 +1,8 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/mex/astra_mex.cpp b/matlab/mex/astra_mex.cpp index 7478c48..0eb5662 100644 --- a/matlab/mex/astra_mex.cpp +++ b/matlab/mex/astra_mex.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/mex/astra_mex_algorithm_c.cpp b/matlab/mex/astra_mex_algorithm_c.cpp index 1c0ab79..f719a6b 100644 --- a/matlab/mex/astra_mex_algorithm_c.cpp +++ b/matlab/mex/astra_mex_algorithm_c.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/mex/astra_mex_c.cpp b/matlab/mex/astra_mex_c.cpp index b9bd18e..2989b7a 100644 --- a/matlab/mex/astra_mex_c.cpp +++ b/matlab/mex/astra_mex_c.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/mex/astra_mex_data2d_c.cpp b/matlab/mex/astra_mex_data2d_c.cpp index c5e271a..b219179 100644 --- a/matlab/mex/astra_mex_data2d_c.cpp +++ b/matlab/mex/astra_mex_data2d_c.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/mex/astra_mex_data3d_c.cpp b/matlab/mex/astra_mex_data3d_c.cpp index a1ff42c..db81519 100644 --- a/matlab/mex/astra_mex_data3d_c.cpp +++ b/matlab/mex/astra_mex_data3d_c.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/mex/astra_mex_matrix_c.cpp b/matlab/mex/astra_mex_matrix_c.cpp index 1285eb2..016566a 100644 --- a/matlab/mex/astra_mex_matrix_c.cpp +++ b/matlab/mex/astra_mex_matrix_c.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/mex/astra_mex_projector3d_c.cpp b/matlab/mex/astra_mex_projector3d_c.cpp index 7dc2f9a..25980f9 100644 --- a/matlab/mex/astra_mex_projector3d_c.cpp +++ b/matlab/mex/astra_mex_projector3d_c.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/mex/astra_mex_projector_c.cpp b/matlab/mex/astra_mex_projector_c.cpp index 9dfd2d0..de73f07 100644 --- a/matlab/mex/astra_mex_projector_c.cpp +++ b/matlab/mex/astra_mex_projector_c.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/mex/mexHelpFunctions.cpp b/matlab/mex/mexHelpFunctions.cpp index eacb209..e919dd9 100644 --- a/matlab/mex/mexHelpFunctions.cpp +++ b/matlab/mex/mexHelpFunctions.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_add_noise_to_sino.m b/matlab/tools/astra_add_noise_to_sino.m index 6ced65b..6ad9b50 100644 --- a/matlab/tools/astra_add_noise_to_sino.m +++ b/matlab/tools/astra_add_noise_to_sino.m @@ -15,8 +15,8 @@ function sinogram_out = astra_add_noise_to_sino(sinogram_in,I0) %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_clear.m b/matlab/tools/astra_clear.m index 93a88ad..0dd180b 100644 --- a/matlab/tools/astra_clear.m +++ b/matlab/tools/astra_clear.m @@ -5,8 +5,8 @@ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_create_backprojection.m b/matlab/tools/astra_create_backprojection.m index a6d6e1c..dff51c6 100644 --- a/matlab/tools/astra_create_backprojection.m +++ b/matlab/tools/astra_create_backprojection.m @@ -13,8 +13,8 @@ function [vol_id, vol] = astra_create_backprojection(data, proj_id) %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_create_backprojection3d_cuda.m b/matlab/tools/astra_create_backprojection3d_cuda.m index 3b1663d..88b4b4a 100644 --- a/matlab/tools/astra_create_backprojection3d_cuda.m +++ b/matlab/tools/astra_create_backprojection3d_cuda.m @@ -15,8 +15,8 @@ function [vol_id, vol] = astra_create_backprojection3d_cuda(data, proj_geom, vol %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_create_backprojection_cuda.m b/matlab/tools/astra_create_backprojection_cuda.m index 4c39f13..7f8a6a6 100644 --- a/matlab/tools/astra_create_backprojection_cuda.m +++ b/matlab/tools/astra_create_backprojection_cuda.m @@ -14,8 +14,8 @@ function backProj = astra_create_backprojection_cuda(sinogramData, proj_geom, vo %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % - % Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - % 2014, CWI, Amsterdam + % Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + % 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_create_proj_geom.m b/matlab/tools/astra_create_proj_geom.m index a389573..862e410 100644 --- a/matlab/tools/astra_create_proj_geom.m +++ b/matlab/tools/astra_create_proj_geom.m @@ -87,8 +87,8 @@ function proj_geom = astra_create_proj_geom(type, varargin) %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_create_projector.m b/matlab/tools/astra_create_projector.m index e930450..da9c083 100644 --- a/matlab/tools/astra_create_projector.m +++ b/matlab/tools/astra_create_projector.m @@ -14,8 +14,8 @@ function proj_id = astra_create_projector(type, proj_geom, vol_geom) %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_create_reconstruction.m b/matlab/tools/astra_create_reconstruction.m index 1e25fc9..76dba94 100644 --- a/matlab/tools/astra_create_reconstruction.m +++ b/matlab/tools/astra_create_reconstruction.m @@ -21,8 +21,8 @@ function [recon_id, recon] = astra_create_reconstruction(rec_type, proj_id, sino %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_create_reconstruction_cuda.m b/matlab/tools/astra_create_reconstruction_cuda.m index ffd3ede..7d9e1dd 100644 --- a/matlab/tools/astra_create_reconstruction_cuda.m +++ b/matlab/tools/astra_create_reconstruction_cuda.m @@ -22,8 +22,8 @@ function [recon_id, recon] = astra_create_reconstruction_cuda(rec_type, proj_geo %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_create_sino.m b/matlab/tools/astra_create_sino.m index a51f0e4..d27e452 100644 --- a/matlab/tools/astra_create_sino.m +++ b/matlab/tools/astra_create_sino.m @@ -13,8 +13,8 @@ function [sino_id, sino] = astra_create_sino(data, proj_id) %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_create_sino3d_cuda.m b/matlab/tools/astra_create_sino3d_cuda.m index 54ca58d..3a90084 100644 --- a/matlab/tools/astra_create_sino3d_cuda.m +++ b/matlab/tools/astra_create_sino3d_cuda.m @@ -15,8 +15,8 @@ function [sino_id, sino] = astra_create_sino3d_cuda(data, proj_geom, vol_geom) %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_create_sino_cuda.m b/matlab/tools/astra_create_sino_cuda.m index a2e7f53..64ebe54 100644 --- a/matlab/tools/astra_create_sino_cuda.m +++ b/matlab/tools/astra_create_sino_cuda.m @@ -16,8 +16,8 @@ function [sino_id, sino] = astra_create_sino_cuda(data, proj_geom, vol_geom, gpu %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_create_sino_gpu.m b/matlab/tools/astra_create_sino_gpu.m index 75a47f7..80be857 100644 --- a/matlab/tools/astra_create_sino_gpu.m +++ b/matlab/tools/astra_create_sino_gpu.m @@ -16,8 +16,8 @@ function [sino_id, sino] = astra_create_sino_gpu(data, proj_geom, vol_geom, gpu_ %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_create_sino_sampling.m b/matlab/tools/astra_create_sino_sampling.m index 0b33994..fad9e85 100644 --- a/matlab/tools/astra_create_sino_sampling.m +++ b/matlab/tools/astra_create_sino_sampling.m @@ -16,8 +16,8 @@ function [sino_id, sino] = astra_create_sino_sampling(data, proj_geom, vol_geom, %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_create_vol_geom.m b/matlab/tools/astra_create_vol_geom.m index 0de5168..ea975e6 100644 --- a/matlab/tools/astra_create_vol_geom.m +++ b/matlab/tools/astra_create_vol_geom.m @@ -25,8 +25,8 @@ function vol_geom = astra_create_vol_geom(varargin) %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_downsample_sinogram.m b/matlab/tools/astra_downsample_sinogram.m index 805fcc2..1232a93 100644 --- a/matlab/tools/astra_downsample_sinogram.m +++ b/matlab/tools/astra_downsample_sinogram.m @@ -15,8 +15,8 @@ function [sinogram_new, proj_geom_new] = astra_downsample_sinogram(sinogram, pro %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_mex.m b/matlab/tools/astra_mex.m index c1f8bf8..9d6b2c7 100644 --- a/matlab/tools/astra_mex.m +++ b/matlab/tools/astra_mex.m @@ -6,8 +6,8 @@ function [varargout] = astra_mex(varargin) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_mex_algorithm.m b/matlab/tools/astra_mex_algorithm.m index 901e90c..0a42c8e 100644 --- a/matlab/tools/astra_mex_algorithm.m +++ b/matlab/tools/astra_mex_algorithm.m @@ -6,8 +6,8 @@ function [varargout] = astra_mex_algorithm(varargin) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_mex_data2d.m b/matlab/tools/astra_mex_data2d.m index 542d7c6..fbc4c6b 100644 --- a/matlab/tools/astra_mex_data2d.m +++ b/matlab/tools/astra_mex_data2d.m @@ -6,8 +6,8 @@ function [varargout] = astra_mex_data2d(varargin) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_mex_data3d.m b/matlab/tools/astra_mex_data3d.m index 66e507a..1926774 100644 --- a/matlab/tools/astra_mex_data3d.m +++ b/matlab/tools/astra_mex_data3d.m @@ -6,8 +6,8 @@ function [varargout] = astra_mex_data3d(varargin) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_mex_matrix.m b/matlab/tools/astra_mex_matrix.m index 35e266e..2bc8210 100644 --- a/matlab/tools/astra_mex_matrix.m +++ b/matlab/tools/astra_mex_matrix.m @@ -6,8 +6,8 @@ function [varargout] = astra_mex_matrix(varargin) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_mex_projector.m b/matlab/tools/astra_mex_projector.m index 08f9e54..5eaffd3 100644 --- a/matlab/tools/astra_mex_projector.m +++ b/matlab/tools/astra_mex_projector.m @@ -6,8 +6,8 @@ function [varargout] = astra_mex_projector(varargin) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_mex_projector3d.m b/matlab/tools/astra_mex_projector3d.m index f72abe2..eaec7f2 100644 --- a/matlab/tools/astra_mex_projector3d.m +++ b/matlab/tools/astra_mex_projector3d.m @@ -6,8 +6,8 @@ function [varargout] = astra_mex_projector3d(varargin) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_projector_handle.m b/matlab/tools/astra_projector_handle.m index 2d1eba2..6b56300 100644 --- a/matlab/tools/astra_projector_handle.m +++ b/matlab/tools/astra_projector_handle.m @@ -5,8 +5,8 @@ classdef astra_projector_handle < handle %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % - % Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - % 2014, CWI, Amsterdam + % Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + % 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_set_directory.m b/matlab/tools/astra_set_directory.m index 6018bad..ae21aab 100644 --- a/matlab/tools/astra_set_directory.m +++ b/matlab/tools/astra_set_directory.m @@ -11,8 +11,8 @@ function in = astra_set_directory(in) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_set_gpu_index.m b/matlab/tools/astra_set_gpu_index.m index fb2b64b..1f5bfdc 100644 --- a/matlab/tools/astra_set_gpu_index.m +++ b/matlab/tools/astra_set_gpu_index.m @@ -6,8 +6,8 @@ function astra_set_gpu_index(index) %-------------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/astra_struct.m b/matlab/tools/astra_struct.m index f7da5fe..b5bf48a 100644 --- a/matlab/tools/astra_struct.m +++ b/matlab/tools/astra_struct.m @@ -11,8 +11,8 @@ function res = astra_struct(type) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/createOrderART.m b/matlab/tools/createOrderART.m index 95d8fae..b058ba5 100644 --- a/matlab/tools/createOrderART.m +++ b/matlab/tools/createOrderART.m @@ -16,8 +16,8 @@ function rayOrder = createOrderART(proj_geom, mode) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/imreadgs.m b/matlab/tools/imreadgs.m index c9d60f9..2920008 100644 --- a/matlab/tools/imreadgs.m +++ b/matlab/tools/imreadgs.m @@ -12,8 +12,8 @@ function Im = imreadgs(filename) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/imresize3D.m b/matlab/tools/imresize3D.m index 42d50b0..af6a810 100644 --- a/matlab/tools/imresize3D.m +++ b/matlab/tools/imresize3D.m @@ -12,8 +12,8 @@ function out = imresize3D(in, s_out, method) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/imscale.m b/matlab/tools/imscale.m index ddaa457..4a40e50 100644 --- a/matlab/tools/imscale.m +++ b/matlab/tools/imscale.m @@ -11,8 +11,8 @@ function out = imscale(in) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/imwritesc.m b/matlab/tools/imwritesc.m index fa059d6..4b28a09 100644 --- a/matlab/tools/imwritesc.m +++ b/matlab/tools/imwritesc.m @@ -11,8 +11,8 @@ function imwritesc(in, filename) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/kaiserBessel.m b/matlab/tools/kaiserBessel.m index 808a5ac..14b9097 100644 --- a/matlab/tools/kaiserBessel.m +++ b/matlab/tools/kaiserBessel.m @@ -14,8 +14,8 @@ function res = kaiserBessel(m,alpha,a,r) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/linspace2.m b/matlab/tools/linspace2.m index 422f03a..027e4f4 100644 --- a/matlab/tools/linspace2.m +++ b/matlab/tools/linspace2.m @@ -13,8 +13,8 @@ function out = linspace2(a,b,c) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/overlayImage.m b/matlab/tools/overlayImage.m index b4f24ce..6b6361e 100644 --- a/matlab/tools/overlayImage.m +++ b/matlab/tools/overlayImage.m @@ -11,8 +11,8 @@ function im = overlayImage(reconstruction, ground_truth) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/rebin_fan2par.m b/matlab/tools/rebin_fan2par.m index e0c713d..f30c8d5 100644 --- a/matlab/tools/rebin_fan2par.m +++ b/matlab/tools/rebin_fan2par.m @@ -19,8 +19,8 @@ function F = rebin_fan2par(RadonData, BetaDeg, D, thetaDeg) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/matlab/tools/sliceExtractor.m b/matlab/tools/sliceExtractor.m index c612152..c73f313 100644 --- a/matlab/tools/sliceExtractor.m +++ b/matlab/tools/sliceExtractor.m @@ -13,8 +13,8 @@ function slice = sliceExtractor(data, dir, slicenr) %------------------------------------------------------------------------ % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/samples/s001_sinogram_par2d.m b/samples/s001_sinogram_par2d.m index e6d8da1..4494e7b 100644 --- a/samples/s001_sinogram_par2d.m +++ b/samples/s001_sinogram_par2d.m @@ -1,8 +1,8 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/samples/s002_data2d.m b/samples/s002_data2d.m index 4259794..a91071f 100644 --- a/samples/s002_data2d.m +++ b/samples/s002_data2d.m @@ -1,8 +1,8 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/samples/s003_gpu_reconstruction.m b/samples/s003_gpu_reconstruction.m index 41bb9b9..efb5c68 100644 --- a/samples/s003_gpu_reconstruction.m +++ b/samples/s003_gpu_reconstruction.m @@ -1,8 +1,8 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/samples/s004_cpu_reconstruction.m b/samples/s004_cpu_reconstruction.m index 24d7ad2..f25cd2b 100644 --- a/samples/s004_cpu_reconstruction.m +++ b/samples/s004_cpu_reconstruction.m @@ -1,8 +1,8 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/samples/s005_3d_geometry.m b/samples/s005_3d_geometry.m index 63cb683..4b7360b 100644 --- a/samples/s005_3d_geometry.m +++ b/samples/s005_3d_geometry.m @@ -1,8 +1,8 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/samples/s006_3d_data.m b/samples/s006_3d_data.m index 7b74460..32d88cc 100644 --- a/samples/s006_3d_data.m +++ b/samples/s006_3d_data.m @@ -1,8 +1,8 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/samples/s007_3d_reconstruction.m b/samples/s007_3d_reconstruction.m index 3ca8da8..fc9aca6 100644 --- a/samples/s007_3d_reconstruction.m +++ b/samples/s007_3d_reconstruction.m @@ -1,8 +1,8 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/samples/s008_gpu_selection.m b/samples/s008_gpu_selection.m index 4ea4ba6..a9e152d 100644 --- a/samples/s008_gpu_selection.m +++ b/samples/s008_gpu_selection.m @@ -1,8 +1,8 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/samples/s009_projection_matrix.m b/samples/s009_projection_matrix.m index a1b0036..efda0d2 100644 --- a/samples/s009_projection_matrix.m +++ b/samples/s009_projection_matrix.m @@ -1,8 +1,8 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/samples/s010_supersampling.m b/samples/s010_supersampling.m index 0275bd6..80f6f56 100644 --- a/samples/s010_supersampling.m +++ b/samples/s010_supersampling.m @@ -1,8 +1,8 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/samples/s011_object_info.m b/samples/s011_object_info.m index e68e8ba..61ecb83 100644 --- a/samples/s011_object_info.m +++ b/samples/s011_object_info.m @@ -1,8 +1,8 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/samples/s012_masks.m b/samples/s012_masks.m index 212743a..d3611a6 100644 --- a/samples/s012_masks.m +++ b/samples/s012_masks.m @@ -1,8 +1,8 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/samples/s013_constraints.m b/samples/s013_constraints.m index 988cf97..d72195c 100644 --- a/samples/s013_constraints.m +++ b/samples/s013_constraints.m @@ -1,8 +1,8 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/samples/s014_FBP.m b/samples/s014_FBP.m index 1e1a2cb..b73149c 100644 --- a/samples/s014_FBP.m +++ b/samples/s014_FBP.m @@ -1,8 +1,8 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/samples/s015_fp_bp.m b/samples/s015_fp_bp.m index 131b7e0..8cc417e 100644 --- a/samples/s015_fp_bp.m +++ b/samples/s015_fp_bp.m @@ -1,8 +1,8 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/samples/s016_plots.m b/samples/s016_plots.m index 0baa82a..1455c6d 100644 --- a/samples/s016_plots.m +++ b/samples/s016_plots.m @@ -1,8 +1,8 @@ % ----------------------------------------------------------------------- % This file is part of the ASTRA Toolbox % -% Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp -% 2014, CWI, Amsterdam +% Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp +% 2014-2015, CWI, Amsterdam % License: Open Source under GPLv3 % Contact: astra@uantwerpen.be % Website: http://sf.net/projects/astra-toolbox diff --git a/src/Algorithm.cpp b/src/Algorithm.cpp index 8997dbf..7b61b8c 100644 --- a/src/Algorithm.cpp +++ b/src/Algorithm.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/ArtAlgorithm.cpp b/src/ArtAlgorithm.cpp index 27392fe..8f058a3 100644 --- a/src/ArtAlgorithm.cpp +++ b/src/ArtAlgorithm.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/AstraObjectFactory.cpp b/src/AstraObjectFactory.cpp index bc068c2..35132d0 100644 --- a/src/AstraObjectFactory.cpp +++ b/src/AstraObjectFactory.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/AstraObjectManager.cpp b/src/AstraObjectManager.cpp index a4fdeb7..c49f273 100644 --- a/src/AstraObjectManager.cpp +++ b/src/AstraObjectManager.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/AsyncAlgorithm.cpp b/src/AsyncAlgorithm.cpp index ea02138..fcc4dcb 100644 --- a/src/AsyncAlgorithm.cpp +++ b/src/AsyncAlgorithm.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/BackProjectionAlgorithm.cpp b/src/BackProjectionAlgorithm.cpp index f2f267c..f561a90 100644 --- a/src/BackProjectionAlgorithm.cpp +++ b/src/BackProjectionAlgorithm.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/CglsAlgorithm.cpp b/src/CglsAlgorithm.cpp index 855f789..b9031e3 100644 --- a/src/CglsAlgorithm.cpp +++ b/src/CglsAlgorithm.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/ConeProjectionGeometry3D.cpp b/src/ConeProjectionGeometry3D.cpp index f6c628f..ec64701 100644 --- a/src/ConeProjectionGeometry3D.cpp +++ b/src/ConeProjectionGeometry3D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/ConeVecProjectionGeometry3D.cpp b/src/ConeVecProjectionGeometry3D.cpp index d58a5ce..512b26c 100644 --- a/src/ConeVecProjectionGeometry3D.cpp +++ b/src/ConeVecProjectionGeometry3D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/Config.cpp b/src/Config.cpp index ab505c3..3a3cb53 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/CudaBackProjectionAlgorithm.cpp b/src/CudaBackProjectionAlgorithm.cpp index 0265238..365e058 100644 --- a/src/CudaBackProjectionAlgorithm.cpp +++ b/src/CudaBackProjectionAlgorithm.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/CudaBackProjectionAlgorithm3D.cpp b/src/CudaBackProjectionAlgorithm3D.cpp index 2df7ec0..abcf096 100644 --- a/src/CudaBackProjectionAlgorithm3D.cpp +++ b/src/CudaBackProjectionAlgorithm3D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/CudaCglsAlgorithm.cpp b/src/CudaCglsAlgorithm.cpp index 3357a9d..0cedff6 100644 --- a/src/CudaCglsAlgorithm.cpp +++ b/src/CudaCglsAlgorithm.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/CudaCglsAlgorithm3D.cpp b/src/CudaCglsAlgorithm3D.cpp index f356be8..a5500d6 100644 --- a/src/CudaCglsAlgorithm3D.cpp +++ b/src/CudaCglsAlgorithm3D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/CudaDartMaskAlgorithm.cpp b/src/CudaDartMaskAlgorithm.cpp index 60e0ec2..dcdefcc 100644 --- a/src/CudaDartMaskAlgorithm.cpp +++ b/src/CudaDartMaskAlgorithm.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/CudaDartMaskAlgorithm3D.cpp b/src/CudaDartMaskAlgorithm3D.cpp index f540602..f3500b9 100644 --- a/src/CudaDartMaskAlgorithm3D.cpp +++ b/src/CudaDartMaskAlgorithm3D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/CudaDartSmoothingAlgorithm.cpp b/src/CudaDartSmoothingAlgorithm.cpp index 0f450c0..2f2103f 100644 --- a/src/CudaDartSmoothingAlgorithm.cpp +++ b/src/CudaDartSmoothingAlgorithm.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/CudaDartSmoothingAlgorithm3D.cpp b/src/CudaDartSmoothingAlgorithm3D.cpp index d4b49b1..f3cf015 100644 --- a/src/CudaDartSmoothingAlgorithm3D.cpp +++ b/src/CudaDartSmoothingAlgorithm3D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/CudaDataOperationAlgorithm.cpp b/src/CudaDataOperationAlgorithm.cpp index f8bbd0b..79a9d7f 100644 --- a/src/CudaDataOperationAlgorithm.cpp +++ b/src/CudaDataOperationAlgorithm.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/CudaEMAlgorithm.cpp b/src/CudaEMAlgorithm.cpp index 8feae52..5c71f3d 100644 --- a/src/CudaEMAlgorithm.cpp +++ b/src/CudaEMAlgorithm.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/CudaFDKAlgorithm3D.cpp b/src/CudaFDKAlgorithm3D.cpp index 8535319..7638696 100644 --- a/src/CudaFDKAlgorithm3D.cpp +++ b/src/CudaFDKAlgorithm3D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/CudaFilteredBackProjectionAlgorithm.cpp b/src/CudaFilteredBackProjectionAlgorithm.cpp index 7cc8b99..6593313 100644 --- a/src/CudaFilteredBackProjectionAlgorithm.cpp +++ b/src/CudaFilteredBackProjectionAlgorithm.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/CudaForwardProjectionAlgorithm.cpp b/src/CudaForwardProjectionAlgorithm.cpp index 5fdc220..4865887 100644 --- a/src/CudaForwardProjectionAlgorithm.cpp +++ b/src/CudaForwardProjectionAlgorithm.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/CudaForwardProjectionAlgorithm3D.cpp b/src/CudaForwardProjectionAlgorithm3D.cpp index 53e9c86..4ebecef 100644 --- a/src/CudaForwardProjectionAlgorithm3D.cpp +++ b/src/CudaForwardProjectionAlgorithm3D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/CudaProjector2D.cpp b/src/CudaProjector2D.cpp index a324c0a..056ea3b 100644 --- a/src/CudaProjector2D.cpp +++ b/src/CudaProjector2D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/CudaProjector3D.cpp b/src/CudaProjector3D.cpp index fe0e7a0..f51433d 100644 --- a/src/CudaProjector3D.cpp +++ b/src/CudaProjector3D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/CudaReconstructionAlgorithm2D.cpp b/src/CudaReconstructionAlgorithm2D.cpp index e458ca8..1d66137 100644 --- a/src/CudaReconstructionAlgorithm2D.cpp +++ b/src/CudaReconstructionAlgorithm2D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/CudaRoiSelectAlgorithm.cpp b/src/CudaRoiSelectAlgorithm.cpp index 5fc4a33..bfccb3a 100644 --- a/src/CudaRoiSelectAlgorithm.cpp +++ b/src/CudaRoiSelectAlgorithm.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/CudaSartAlgorithm.cpp b/src/CudaSartAlgorithm.cpp index 1b62b45..8e22c59 100644 --- a/src/CudaSartAlgorithm.cpp +++ b/src/CudaSartAlgorithm.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/CudaSirtAlgorithm.cpp b/src/CudaSirtAlgorithm.cpp index 47fb13c..f6eb79a 100644 --- a/src/CudaSirtAlgorithm.cpp +++ b/src/CudaSirtAlgorithm.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/CudaSirtAlgorithm3D.cpp b/src/CudaSirtAlgorithm3D.cpp index d50194c..da83c7e 100644 --- a/src/CudaSirtAlgorithm3D.cpp +++ b/src/CudaSirtAlgorithm3D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/DataProjector.cpp b/src/DataProjector.cpp index dcc8b2b..83d88a2 100644 --- a/src/DataProjector.cpp +++ b/src/DataProjector.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/DataProjectorPolicies.cpp b/src/DataProjectorPolicies.cpp index e403188..324ceeb 100644 --- a/src/DataProjectorPolicies.cpp +++ b/src/DataProjectorPolicies.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/FanFlatBeamLineKernelProjector2D.cpp b/src/FanFlatBeamLineKernelProjector2D.cpp index 6f14955..0681715 100644 --- a/src/FanFlatBeamLineKernelProjector2D.cpp +++ b/src/FanFlatBeamLineKernelProjector2D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/FanFlatBeamStripKernelProjector2D.cpp b/src/FanFlatBeamStripKernelProjector2D.cpp index a7bce84..e94d3da 100644 --- a/src/FanFlatBeamStripKernelProjector2D.cpp +++ b/src/FanFlatBeamStripKernelProjector2D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/FanFlatProjectionGeometry2D.cpp b/src/FanFlatProjectionGeometry2D.cpp index ea297e3..bfc7fa9 100644 --- a/src/FanFlatProjectionGeometry2D.cpp +++ b/src/FanFlatProjectionGeometry2D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/FanFlatVecProjectionGeometry2D.cpp b/src/FanFlatVecProjectionGeometry2D.cpp index c6805fd..77f9db7 100644 --- a/src/FanFlatVecProjectionGeometry2D.cpp +++ b/src/FanFlatVecProjectionGeometry2D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/FilteredBackProjectionAlgorithm.cpp b/src/FilteredBackProjectionAlgorithm.cpp index b99930a..50cf939 100644 --- a/src/FilteredBackProjectionAlgorithm.cpp +++ b/src/FilteredBackProjectionAlgorithm.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/Float32Data.cpp b/src/Float32Data.cpp index fc5dda9..f668a9f 100644 --- a/src/Float32Data.cpp +++ b/src/Float32Data.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/Float32Data2D.cpp b/src/Float32Data2D.cpp index ed01124..c96e5eb 100644 --- a/src/Float32Data2D.cpp +++ b/src/Float32Data2D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/Float32Data3D.cpp b/src/Float32Data3D.cpp index c581cea..9142215 100644 --- a/src/Float32Data3D.cpp +++ b/src/Float32Data3D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/Float32Data3DMemory.cpp b/src/Float32Data3DMemory.cpp index fca79ea..4e851b7 100644 --- a/src/Float32Data3DMemory.cpp +++ b/src/Float32Data3DMemory.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/Float32ProjectionData2D.cpp b/src/Float32ProjectionData2D.cpp index 0afd0ce..85e0cdd 100644 --- a/src/Float32ProjectionData2D.cpp +++ b/src/Float32ProjectionData2D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/Float32ProjectionData3D.cpp b/src/Float32ProjectionData3D.cpp index 641a206..d039c83 100644 --- a/src/Float32ProjectionData3D.cpp +++ b/src/Float32ProjectionData3D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/Float32ProjectionData3DMemory.cpp b/src/Float32ProjectionData3DMemory.cpp index 749dd0d..ee3fc83 100644 --- a/src/Float32ProjectionData3DMemory.cpp +++ b/src/Float32ProjectionData3DMemory.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/Float32VolumeData2D.cpp b/src/Float32VolumeData2D.cpp index ce21875..e11c4e4 100644 --- a/src/Float32VolumeData2D.cpp +++ b/src/Float32VolumeData2D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/Float32VolumeData3D.cpp b/src/Float32VolumeData3D.cpp index a5c2627..ce00a10 100644 --- a/src/Float32VolumeData3D.cpp +++ b/src/Float32VolumeData3D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/Float32VolumeData3DMemory.cpp b/src/Float32VolumeData3DMemory.cpp index dcb824d..af45cb9 100644 --- a/src/Float32VolumeData3DMemory.cpp +++ b/src/Float32VolumeData3DMemory.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/ForwardProjectionAlgorithm.cpp b/src/ForwardProjectionAlgorithm.cpp index abb0d86..b530491 100644 --- a/src/ForwardProjectionAlgorithm.cpp +++ b/src/ForwardProjectionAlgorithm.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/Fourier.cpp b/src/Fourier.cpp index 7d7b2f1..584b633 100644 --- a/src/Fourier.cpp +++ b/src/Fourier.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/Globals.cpp b/src/Globals.cpp index e71b4e4..813f9c9 100644 --- a/src/Globals.cpp +++ b/src/Globals.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/Logger.cpp b/src/Logger.cpp index d927e51..148e18c 100644 --- a/src/Logger.cpp +++ b/src/Logger.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/ParallelBeamBlobKernelProjector2D.cpp b/src/ParallelBeamBlobKernelProjector2D.cpp index 8f448a4..3253f88 100644 --- a/src/ParallelBeamBlobKernelProjector2D.cpp +++ b/src/ParallelBeamBlobKernelProjector2D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/ParallelBeamLineKernelProjector2D.cpp b/src/ParallelBeamLineKernelProjector2D.cpp index 8b2a8fc..5a23413 100644 --- a/src/ParallelBeamLineKernelProjector2D.cpp +++ b/src/ParallelBeamLineKernelProjector2D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/ParallelBeamLinearKernelProjector2D.cpp b/src/ParallelBeamLinearKernelProjector2D.cpp index d317e48..a710664 100644 --- a/src/ParallelBeamLinearKernelProjector2D.cpp +++ b/src/ParallelBeamLinearKernelProjector2D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/ParallelBeamStripKernelProjector2D.cpp b/src/ParallelBeamStripKernelProjector2D.cpp index 3dafa22..44c6fec 100644 --- a/src/ParallelBeamStripKernelProjector2D.cpp +++ b/src/ParallelBeamStripKernelProjector2D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/ParallelProjectionGeometry2D.cpp b/src/ParallelProjectionGeometry2D.cpp index 49cc028..8f8faa4 100644 --- a/src/ParallelProjectionGeometry2D.cpp +++ b/src/ParallelProjectionGeometry2D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/ParallelProjectionGeometry3D.cpp b/src/ParallelProjectionGeometry3D.cpp index 41c79b2..104fc6e 100644 --- a/src/ParallelProjectionGeometry3D.cpp +++ b/src/ParallelProjectionGeometry3D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/ParallelVecProjectionGeometry3D.cpp b/src/ParallelVecProjectionGeometry3D.cpp index 4e59932..c8071a6 100644 --- a/src/ParallelVecProjectionGeometry3D.cpp +++ b/src/ParallelVecProjectionGeometry3D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/PlatformDepSystemCode.cpp b/src/PlatformDepSystemCode.cpp index a9614e8..0a5d236 100644 --- a/src/PlatformDepSystemCode.cpp +++ b/src/PlatformDepSystemCode.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/ProjectionGeometry2D.cpp b/src/ProjectionGeometry2D.cpp index 2b823c1..89b5fe0 100644 --- a/src/ProjectionGeometry2D.cpp +++ b/src/ProjectionGeometry2D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/ProjectionGeometry3D.cpp b/src/ProjectionGeometry3D.cpp index e2108aa..5b77767 100644 --- a/src/ProjectionGeometry3D.cpp +++ b/src/ProjectionGeometry3D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/Projector2D.cpp b/src/Projector2D.cpp index da6c47f..32a2956 100644 --- a/src/Projector2D.cpp +++ b/src/Projector2D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/Projector3D.cpp b/src/Projector3D.cpp index 1ab5d09..0f5edb7 100644 --- a/src/Projector3D.cpp +++ b/src/Projector3D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/ReconstructionAlgorithm2D.cpp b/src/ReconstructionAlgorithm2D.cpp index 01bfc86..e089fac 100644 --- a/src/ReconstructionAlgorithm2D.cpp +++ b/src/ReconstructionAlgorithm2D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/ReconstructionAlgorithm3D.cpp b/src/ReconstructionAlgorithm3D.cpp index 2a9a301..0ce9777 100644 --- a/src/ReconstructionAlgorithm3D.cpp +++ b/src/ReconstructionAlgorithm3D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/ReconstructionAlgorithmMultiSlice2D.cpp b/src/ReconstructionAlgorithmMultiSlice2D.cpp index 17a9aaa..fe64c86 100644 --- a/src/ReconstructionAlgorithmMultiSlice2D.cpp +++ b/src/ReconstructionAlgorithmMultiSlice2D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/SartAlgorithm.cpp b/src/SartAlgorithm.cpp index 062ca5e..f7a1677 100644 --- a/src/SartAlgorithm.cpp +++ b/src/SartAlgorithm.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/SirtAlgorithm.cpp b/src/SirtAlgorithm.cpp index 101fd34..ae3b3bc 100644 --- a/src/SirtAlgorithm.cpp +++ b/src/SirtAlgorithm.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/SparseMatrix.cpp b/src/SparseMatrix.cpp index 0f2858c..ace978d 100644 --- a/src/SparseMatrix.cpp +++ b/src/SparseMatrix.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/SparseMatrixProjectionGeometry2D.cpp b/src/SparseMatrixProjectionGeometry2D.cpp index 199b215..7f14d9d 100644 --- a/src/SparseMatrixProjectionGeometry2D.cpp +++ b/src/SparseMatrixProjectionGeometry2D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/SparseMatrixProjector2D.cpp b/src/SparseMatrixProjector2D.cpp index f8754f3..bc2e974 100644 --- a/src/SparseMatrixProjector2D.cpp +++ b/src/SparseMatrixProjector2D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/Utilities.cpp b/src/Utilities.cpp index c72e8b2..3f65e9a 100644 --- a/src/Utilities.cpp +++ b/src/Utilities.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/Vector3D.cpp b/src/Vector3D.cpp index 62175da..6176d25 100644 --- a/src/Vector3D.cpp +++ b/src/Vector3D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/VolumeGeometry2D.cpp b/src/VolumeGeometry2D.cpp index 2e5fde5..19aa905 100644 --- a/src/VolumeGeometry2D.cpp +++ b/src/VolumeGeometry2D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/VolumeGeometry3D.cpp b/src/VolumeGeometry3D.cpp index 1744ab9..d7a93a9 100644 --- a/src/VolumeGeometry3D.cpp +++ b/src/VolumeGeometry3D.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/XMLDocument.cpp b/src/XMLDocument.cpp index b0e426d..b39875b 100644 --- a/src/XMLDocument.cpp +++ b/src/XMLDocument.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/XMLNode.cpp b/src/XMLNode.cpp index f5d61f6..a5b6796 100644 --- a/src/XMLNode.cpp +++ b/src/XMLNode.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox diff --git a/src/swrap.cpp b/src/swrap.cpp index c28de93..51dcdb1 100644 --- a/src/swrap.cpp +++ b/src/swrap.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox -- cgit v1.2.3 From 03584e81e716cef4f99fee5a2e37aee0451dd7f8 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 28 Nov 2014 14:36:23 +0100 Subject: Add VS2012 build files --- astra_vc11.sln | 175 ++++++ astra_vc11.vcxproj | 441 +++++++++++++++ astra_vc11.vcxproj.filters | 736 ++++++++++++++++++++++++++ matlab/mex/astra_mex_algorithm_vc11.vcxproj | 291 ++++++++++ matlab/mex/astra_mex_data2d_vc11.vcxproj | 289 ++++++++++ matlab/mex/astra_mex_data3d_vc11.vcxproj | 299 +++++++++++ matlab/mex/astra_mex_file_vc11.vcxproj | 289 ++++++++++ matlab/mex/astra_mex_matrix_vc11.vcxproj | 289 ++++++++++ matlab/mex/astra_mex_projector3d_vc11.vcxproj | 286 ++++++++++ matlab/mex/astra_mex_projector_vc11.vcxproj | 289 ++++++++++ matlab/mex/astra_mex_vc11.vcxproj | 289 ++++++++++ 11 files changed, 3673 insertions(+) create mode 100644 astra_vc11.sln create mode 100644 astra_vc11.vcxproj create mode 100644 astra_vc11.vcxproj.filters create mode 100644 matlab/mex/astra_mex_algorithm_vc11.vcxproj create mode 100644 matlab/mex/astra_mex_data2d_vc11.vcxproj create mode 100644 matlab/mex/astra_mex_data3d_vc11.vcxproj create mode 100644 matlab/mex/astra_mex_file_vc11.vcxproj create mode 100644 matlab/mex/astra_mex_matrix_vc11.vcxproj create mode 100644 matlab/mex/astra_mex_projector3d_vc11.vcxproj create mode 100644 matlab/mex/astra_mex_projector_vc11.vcxproj create mode 100644 matlab/mex/astra_mex_vc11.vcxproj diff --git a/astra_vc11.sln b/astra_vc11.sln new file mode 100644 index 0000000..784fe7a --- /dev/null +++ b/astra_vc11.sln @@ -0,0 +1,175 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_vc11", "astra_vc11.vcxproj", "{BE9F1326-527C-4284-AE2C-D1E25D539CEA}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "astra_mex", "astra_mex", "{5E99A109-374E-4102-BE9B-99BA1FA8AA30}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex", "matlab\mex\astra_mex_vc11.vcxproj", "{3FDA35E0-0D54-4663-A3E6-5ABA96F32221}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_algorithm", "matlab\mex\astra_mex_algorithm_vc11.vcxproj", "{056BF7A9-294D-487C-8CC3-BE629077CA94}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_data2d", "matlab\mex\astra_mex_data2d_vc11.vcxproj", "{E4092269-B19C-46F7-A84E-4F146CC70E44}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_data3d", "matlab\mex\astra_mex_data3d_vc11.vcxproj", "{0BEC029B-0929-4BF9-BD8B-9C9806A52065}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_matrix", "matlab\mex\astra_mex_matrix_vc11.vcxproj", "{9D041710-2119-4230-BCF2-5FBE753FDE49}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_projector", "matlab\mex\astra_mex_projector_vc11.vcxproj", "{4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_projector3d", "matlab\mex\astra_mex_projector3d_vc11.vcxproj", "{F94CCD79-AA11-42DF-AC8A-6C9D2238A883}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_CUDA|Win32 = Debug_CUDA|Win32 + Debug_CUDA|x64 = Debug_CUDA|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release_CUDA|Win32 = Release_CUDA|Win32 + Release_CUDA|x64 = Release_CUDA|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Debug_CUDA|Win32.ActiveCfg = Debug|Win32 + {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Debug_CUDA|Win32.Build.0 = Debug|Win32 + {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Debug_CUDA|x64.ActiveCfg = Debug|x64 + {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Debug_CUDA|x64.Build.0 = Debug|x64 + {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Debug|Win32.ActiveCfg = Debug|Win32 + {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Debug|Win32.Build.0 = Debug|Win32 + {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Debug|x64.ActiveCfg = Debug|x64 + {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Debug|x64.Build.0 = Debug|x64 + {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Release|Win32.ActiveCfg = Release|Win32 + {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Release|Win32.Build.0 = Release|Win32 + {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Release|x64.ActiveCfg = Release|x64 + {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Release|x64.Build.0 = Release|x64 + {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug|Win32.ActiveCfg = Debug|Win32 + {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug|Win32.Build.0 = Debug|Win32 + {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug|x64.ActiveCfg = Debug|x64 + {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug|x64.Build.0 = Debug|x64 + {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release|Win32.ActiveCfg = Release|Win32 + {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release|Win32.Build.0 = Release|Win32 + {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release|x64.ActiveCfg = Release|x64 + {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release|x64.Build.0 = Release|x64 + {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug|Win32.ActiveCfg = Debug|Win32 + {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug|Win32.Build.0 = Debug|Win32 + {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug|x64.ActiveCfg = Debug|x64 + {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug|x64.Build.0 = Debug|x64 + {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release|Win32.ActiveCfg = Release|Win32 + {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release|Win32.Build.0 = Release|Win32 + {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release|x64.ActiveCfg = Release|x64 + {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release|x64.Build.0 = Release|x64 + {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug|Win32.ActiveCfg = Debug|Win32 + {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug|Win32.Build.0 = Debug|Win32 + {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug|x64.ActiveCfg = Debug|x64 + {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug|x64.Build.0 = Debug|x64 + {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release|Win32.ActiveCfg = Release|Win32 + {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release|Win32.Build.0 = Release|Win32 + {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release|x64.ActiveCfg = Release|x64 + {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release|x64.Build.0 = Release|x64 + {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug|Win32.ActiveCfg = Debug|Win32 + {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug|Win32.Build.0 = Debug|Win32 + {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug|x64.ActiveCfg = Debug|x64 + {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug|x64.Build.0 = Debug|x64 + {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release|Win32.ActiveCfg = Release|Win32 + {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release|Win32.Build.0 = Release|Win32 + {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release|x64.ActiveCfg = Release|x64 + {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release|x64.Build.0 = Release|x64 + {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug|Win32.ActiveCfg = Debug|Win32 + {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug|Win32.Build.0 = Debug|Win32 + {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug|x64.ActiveCfg = Debug|x64 + {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug|x64.Build.0 = Debug|x64 + {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release|Win32.ActiveCfg = Release|Win32 + {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release|Win32.Build.0 = Release|Win32 + {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release|x64.ActiveCfg = Release|x64 + {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release|x64.Build.0 = Release|x64 + {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug|Win32.ActiveCfg = Debug|Win32 + {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug|Win32.Build.0 = Debug|Win32 + {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug|x64.ActiveCfg = Debug|x64 + {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug|x64.Build.0 = Debug|x64 + {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release|Win32.ActiveCfg = Release|Win32 + {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release|Win32.Build.0 = Release|Win32 + {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release|x64.ActiveCfg = Release|x64 + {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release|x64.Build.0 = Release|x64 + {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug|Win32.ActiveCfg = Debug|Win32 + {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug|Win32.Build.0 = Debug|Win32 + {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug|x64.ActiveCfg = Debug|x64 + {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug|x64.Build.0 = Debug|x64 + {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release|Win32.ActiveCfg = Release|Win32 + {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release|Win32.Build.0 = Release|Win32 + {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release|x64.ActiveCfg = Release|x64 + {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {3FDA35E0-0D54-4663-A3E6-5ABA96F32221} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} + {056BF7A9-294D-487C-8CC3-BE629077CA94} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} + {E4092269-B19C-46F7-A84E-4F146CC70E44} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} + {0BEC029B-0929-4BF9-BD8B-9C9806A52065} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} + {9D041710-2119-4230-BCF2-5FBE753FDE49} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} + {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} + {F94CCD79-AA11-42DF-AC8A-6C9D2238A883} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} + EndGlobalSection +EndGlobal diff --git a/astra_vc11.vcxproj b/astra_vc11.vcxproj new file mode 100644 index 0000000..d0a52e0 --- /dev/null +++ b/astra_vc11.vcxproj @@ -0,0 +1,441 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + {BE9F1326-527C-4284-AE2C-D1E25D539CEA} + astra_vc11 + + + + Application + true + v110 + MultiByte + + + Application + true + v110 + MultiByte + + + Application + false + v110 + true + MultiByte + + + Application + false + v110 + true + MultiByte + + + DynamicLibrary + false + v110 + true + MultiByte + + + DynamicLibrary + false + v110 + true + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + $(CUDA_INC_PATH);$(IncludePath) + $(CUDA_LIB_PATH);$(LibraryPath) + $(SolutionDir)bin\$(Platform)\Release_CUDA\ + $(OutDir)obj\ + .dll + + + $(CUDA_INC_PATH);$(IncludePath) + $(CUDA_LIB_PATH);$(LibraryPath) + $(SolutionDir)bin\$(Platform)\Release_CUDA\ + $(OutDir)\obj\ + .dll + true + AstraCuda64 + + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + compute_20,sm_20;compute_30,sm_30;compute_30,sm_35;compute_30,compute_30 + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + 64 + + + + + Level1 + MaxSpeed + true + true + true + lib\include;lib\include\cuda;include\;%(AdditionalIncludeDirectories) + true + AnySuitable + Speed + ASTRA_CUDA;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + true + true + true + bin\x64\Release_CUDA\AstraCuda64.dll + lib\x64;$(CUDA_LIB_PATH);$(NVSDKCUDA_ROOT)\common\lib;$(NVSDKCOMPUTE_ROOT)/C/common/lib;%(AdditionalLibraryDirectories) + cudart.lib;FreeImage.lib;cufft.lib;%(AdditionalDependencies) + false + + + 64 + true + compute_20,sm_20;compute_30,sm_30;compute_30,sm_35 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/astra_vc11.vcxproj.filters b/astra_vc11.vcxproj.filters new file mode 100644 index 0000000..404f34e --- /dev/null +++ b/astra_vc11.vcxproj.filters @@ -0,0 +1,736 @@ + + + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\cuda headers + + + + + Projectors\inline + + + Projectors\inline + + + Projectors\inline + + + Projectors\inline + + + Projectors\inline + + + Projectors\inline + + + Projectors\inline + + + Projectors\inline + + + + + {262b0d17-774a-4cb1-b51a-b358d2d02791} + + + {76d6d672-670b-4454-b3ab-10dc8f9b8710} + + + {77a581a9-60da-4265-97c0-80cdf97408c0} + + + {c1af0e56-5fcc-4e75-b5db-88eeb4148185} + + + {72fbe846-10ef-4c52-88df-13bd66c4cbfc} + + + {7ef37c12-c98c-4dd6-938d-12f49279eae0} + + + {a76ffd6d-3895-4365-b27e-fc9a72f2ed75} + + + {9df653ab-26c3-4bec-92a2-3dda22fda761} + + + {444c44b0-6454-483a-be26-7cb9c8ab0b98} + + + {95346487-8185-487b-a794-3e7fb5fcbd4c} + + + {1c52efc8-a77e-4c72-b9be-f6429a87e6d7} + + + {1546cb47-7e5b-42c2-b695-ef172024c14b} + + + {eddb31ba-0db7-4ab1-a490-36623aaf8901} + + + {dc27bff7-4256-4311-a131-47612a44af20} + + + {91ae2cfd-6b45-46eb-ad99-2f16e5ce4b1e} + + + {0daffd63-ba49-4a5f-8d7a-5322e0e74f22} + + + {2d60e3c8-7874-4cee-b139-991ac15e811d} + + + {bd4e1f94-2f56-4db6-b946-20c29d65a351} + + + {bbef012e-598a-456f-90d8-416bdcb4221c} + + + {4e17872e-db7d-41bc-9760-fad1c253b583} + + + {04a878ed-77b4-4525-9bc2-38ccd65282c5} + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_algorithm_vc11.vcxproj b/matlab/mex/astra_mex_algorithm_vc11.vcxproj new file mode 100644 index 0000000..bdbca46 --- /dev/null +++ b/matlab/mex/astra_mex_algorithm_vc11.vcxproj @@ -0,0 +1,291 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex_algorithm + {056BF7A9-294D-487C-8CC3-BE629077CA94} + astraMatlab + + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + .mexw64 + $(ProjectName)_c + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + true + + + Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + true + + + Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64;%(AdditionalLibraryDirectories) + mex.def + + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32;%(AdditionalLibraryDirectories) + mex.def + false + + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\lib\include\cuda;..\..\include\;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64;%(AdditionalLibraryDirectories) + mex.def + + + + + Disabled + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + EditAndContinue + + + AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32;%(AdditionalLibraryDirectories) + mex.def + true + + + + + X64 + + + Disabled + $(MATLAB_ROOT)\extern\include\;$(CUDA_INC_PATH);..\..\lib\include;..\..\lib\include\cuda;..\..\include\;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + true + EditAndContinue + + + AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64;%(AdditionalLibraryDirectories) + mex.def + true + MachineX64 + + + + + Disabled + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + true + EditAndContinue + + + Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32;%(AdditionalLibraryDirectories) + mex.def + true + + + + + X64 + + + Disabled + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + true + + + Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64;%(AdditionalLibraryDirectories) + mex.def + MachineX64 + + + + + + + true + + + + + + + true + + + + + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_data2d_vc11.vcxproj b/matlab/mex/astra_mex_data2d_vc11.vcxproj new file mode 100644 index 0000000..eb09332 --- /dev/null +++ b/matlab/mex/astra_mex_data2d_vc11.vcxproj @@ -0,0 +1,289 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex_data2d + {E4092269-B19C-46F7-A84E-4F146CC70E44} + astraMatlab + + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + true + + + Astra32.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + true + + + Astra64.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + AstraCuda32.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\lib\include\cuda;..\..\include\;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + AstraCuda64.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + Disabled + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + EditAndContinue + + + AstraCuda32D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + X64 + + + Disabled + $(CUDA_INC_PATH);$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + true + EditAndContinue + + + AstraCuda64D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + MachineX64 + + + + + Disabled + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + true + EditAndContinue + + + Astra32D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + X64 + + + Disabled + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + true + + + Astra64D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + MachineX64 + + + + + + + false + + + + + + + false + + + + + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_data3d_vc11.vcxproj b/matlab/mex/astra_mex_data3d_vc11.vcxproj new file mode 100644 index 0000000..064a4a1 --- /dev/null +++ b/matlab/mex/astra_mex_data3d_vc11.vcxproj @@ -0,0 +1,299 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex_data3d + {0BEC029B-0929-4BF9-BD8B-9C9806A52065} + astraMatlab + + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + true + StreamingSIMDExtensions2 + _WINDLL;%(PreprocessorDefinitions);__SSE2__ + + + Astra32.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + true + NotSet + _WINDLL;%(PreprocessorDefinitions);__SSE2__ + + + Astra64.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions);__SSE2__ + MultiThreadedDLL + true + StreamingSIMDExtensions2 + true + + + AstraCuda32.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions);__SSE2__ + MultiThreadedDLL + true + true + + + AstraCuda64.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + Disabled + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions);__SSE2__ + MultiThreadedDebugDLL + true + EditAndContinue + StreamingSIMDExtensions2 + + + AstraCuda32D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + X64 + + + Disabled + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions);__SSE2__ + MultiThreadedDebugDLL + true + NotSet + + + AstraCuda64D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + MachineX64 + + + + + Disabled + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + true + EditAndContinue + StreamingSIMDExtensions2 + _WINDLL;%(PreprocessorDefinitions);__SSE2__ + + + Astra32D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + X64 + + + Disabled + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + true + NotSet + _WINDLL;%(PreprocessorDefinitions);__SSE2__ + + + Astra64D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + MachineX64 + + + + + + + false + + + + + + + false + + + + + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_file_vc11.vcxproj b/matlab/mex/astra_mex_file_vc11.vcxproj new file mode 100644 index 0000000..04925fe --- /dev/null +++ b/matlab/mex/astra_mex_file_vc11.vcxproj @@ -0,0 +1,289 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex_file + {649115B5-795E-4FCB-BFFE-ED3F07288060} + astraMatlab + + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + true + + + Astra32.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + true + + + Astra64.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + AstraCuda32.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\lib\include\cuda;..\..\include\;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + AstraCuda64.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + Disabled + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + EditAndContinue + + + AstraCuda32D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + X64 + + + Disabled + $(CUDA_INC_PATH);$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + true + EditAndContinue + + + AstraCuda64D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + MachineX64 + + + + + Disabled + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + true + EditAndContinue + + + Astra32D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + X64 + + + Disabled + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + true + + + Astra64D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + MachineX64 + + + + + + + true + + + + + + + true + + + + + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_matrix_vc11.vcxproj b/matlab/mex/astra_mex_matrix_vc11.vcxproj new file mode 100644 index 0000000..12393bf --- /dev/null +++ b/matlab/mex/astra_mex_matrix_vc11.vcxproj @@ -0,0 +1,289 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex_matrix + {9D041710-2119-4230-BCF2-5FBE753FDE49} + astraMatlab + + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + true + + + Astra32.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + true + + + Astra64.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + AstraCuda32.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\lib\include\cuda;..\..\include\;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + AstraCuda64.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + Disabled + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + EditAndContinue + + + AstraCuda32D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + X64 + + + Disabled + $(CUDA_INC_PATH);$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + true + EditAndContinue + + + AstraCuda64D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + MachineX64 + + + + + Disabled + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + true + EditAndContinue + + + Astra32D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + X64 + + + Disabled + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + true + + + Astra64D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + MachineX64 + + + + + + + true + + + + + + + true + + + + + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_projector3d_vc11.vcxproj b/matlab/mex/astra_mex_projector3d_vc11.vcxproj new file mode 100644 index 0000000..7981806 --- /dev/null +++ b/matlab/mex/astra_mex_projector3d_vc11.vcxproj @@ -0,0 +1,286 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex_projector3d + {F94CCD79-AA11-42DF-AC8A-6C9D2238A883} + astraMatlab + + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + true + + + Astra32.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + true + + + Astra64.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + AstraCuda32.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\lib\include\cuda;..\..\include\;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + AstraCuda64.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + Disabled + $(MATLAB_ROOT)\extern\include\;$(CUDA_INC_PATH);..\..\lib\include;..\..\lib\include\cuda;..\..\include\;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + EditAndContinue + + + AstraCuda32D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + X64 + + + Disabled + $(MATLAB_ROOT)\extern\include\;$(CUDA_INC_PATH);..\..\lib\include;..\..\lib\include\cuda;..\..\include\;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + + + AstraCuda64D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + MachineX64 + + + + + Disabled + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + true + EditAndContinue + + + Astra32D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + X64 + + + Disabled + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + true + + + Astra64D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + MachineX64 + + + + + + + true + + + + + + + true + + + + + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_projector_vc11.vcxproj b/matlab/mex/astra_mex_projector_vc11.vcxproj new file mode 100644 index 0000000..3ab1806 --- /dev/null +++ b/matlab/mex/astra_mex_projector_vc11.vcxproj @@ -0,0 +1,289 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex_projector + {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97} + astraMatlab + + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + true + + + Astra32.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + true + + + Astra64.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + AstraCuda32.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\lib\include\cuda;..\..\include\;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + AstraCuda64.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + Disabled + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + EditAndContinue + + + AstraCuda32D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + X64 + + + Disabled + $(MATLAB_ROOT)\extern\include\;$(CUDA_INC_PATH);..\..\lib\include;..\..\lib\include\cuda;..\..\include\;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + true + EditAndContinue + + + AstraCuda64D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + MachineX64 + + + + + Disabled + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + true + EditAndContinue + + + Astra32D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + X64 + + + Disabled + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + true + + + Astra64D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + MachineX64 + + + + + + + true + + + + + + + true + + + + + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_vc11.vcxproj b/matlab/mex/astra_mex_vc11.vcxproj new file mode 100644 index 0000000..2e6857c --- /dev/null +++ b/matlab/mex/astra_mex_vc11.vcxproj @@ -0,0 +1,289 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex + {3FDA35E0-0D54-4663-A3E6-5ABA96F32221} + astraMatlab + + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + DynamicLibrary + v110 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + true + + + Astra32.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + true + + + Astra64.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + AstraCuda32.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + MaxSpeed + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\lib\include\cuda;..\..\include\;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + AstraCuda64.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + + + + + Disabled + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + EditAndContinue + + + AstraCuda32D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + X64 + + + Disabled + $(CUDA_INC_PATH);$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + ASTRA_CUDA;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + true + true + EditAndContinue + + + AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + MachineX64 + + + + + Disabled + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + true + EditAndContinue + + + Astra32D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw32 + ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + X64 + + + Disabled + $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + true + + + Astra64D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName)_c.mexw64 + ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + MachineX64 + + + + + + + true + + + + + + + true + + + + + + + \ No newline at end of file -- cgit v1.2.3 From 3fe66759b0a73f15d8c7a6e8709d6bd4ec541dd4 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 30 Jan 2015 11:29:56 +0100 Subject: Update NEWS --- NEWS.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/NEWS.txt b/NEWS.txt index 314417d..c5720ec 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -9,11 +9,13 @@ Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox ----------------------------------------------------------------------- -1.5 (2014-??-??) - * various consistency and bug fixes +1.5 (2015-01-30) * add support for fan beam FBP - * add astra_mex_data3d_c('link') command + * remove limits on number of angles in GPU code + (They are still limited by available memory, however) + * update the included version of the DART algorithm * build fixes for newer platforms + * various consistency and bug fixes 1.4 (2014-04-07) * various consistency and bug fixes -- cgit v1.2.3 From d9bbd38f1f463e87d6baaef0ccfa86bf96958889 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 30 Jan 2015 11:31:56 +0100 Subject: Update version --- build/linux/configure.ac | 2 +- include/astra/Globals.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/linux/configure.ac b/build/linux/configure.ac index faebce2..f99c4d3 100644 --- a/build/linux/configure.ac +++ b/build/linux/configure.ac @@ -24,7 +24,7 @@ dnl dnl ----------------------------------------------------------------------- dnl $Id$ -AC_INIT(astra_toolbox, 1.3.0) +AC_INIT(astra_toolbox, 1.5.0) AC_CONFIG_SRCDIR([Makefile.in]) LT_INIT([disable-static]) diff --git a/include/astra/Globals.h b/include/astra/Globals.h index e83813c..fdeaa23 100644 --- a/include/astra/Globals.h +++ b/include/astra/Globals.h @@ -61,9 +61,9 @@ $Id$ // macro's #define ASTRA_TOOLBOXVERSION_MAJOR 1 -#define ASTRA_TOOLBOXVERSION_MINOR 1 +#define ASTRA_TOOLBOXVERSION_MINOR 5 #define ASTRA_TOOLBOXVERSION ((ASTRA_TOOLBOXVERSION_MAJOR)*100 + (ASTRA_TOOLBOXVERSION_MINOR)) -#define ASTRA_TOOLBOXVERSION_STRING "1.1" +#define ASTRA_TOOLBOXVERSION_STRING "1.5" #define ASTRA_ASSERT(a) assert(a) -- cgit v1.2.3