summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS.txt2
-rw-r--r--README.md2
-rw-r--r--README.txt2
-rw-r--r--build/linux/configure.ac2
-rw-r--r--build/msvc/build_release.bat4
-rw-r--r--cuda/2d/algo.cu2
-rw-r--r--cuda/2d/algo.h2
-rw-r--r--cuda/2d/arith.cu2
-rw-r--r--cuda/2d/arith.h2
-rw-r--r--cuda/2d/astra.cu2
-rw-r--r--cuda/2d/astra.h2
-rw-r--r--cuda/2d/cgls.cu2
-rw-r--r--cuda/2d/cgls.h2
-rw-r--r--cuda/2d/darthelper.cu2
-rw-r--r--cuda/2d/darthelper.h2
-rw-r--r--cuda/2d/dims.h2
-rw-r--r--cuda/2d/em.cu2
-rw-r--r--cuda/2d/em.h2
-rw-r--r--cuda/2d/fan_bp.cu2
-rw-r--r--cuda/2d/fan_bp.h2
-rw-r--r--cuda/2d/fan_fp.cu2
-rw-r--r--cuda/2d/fan_fp.h2
-rw-r--r--cuda/2d/fbp.cu2
-rw-r--r--cuda/2d/fbp.h2
-rw-r--r--cuda/2d/fbp_filters.h2
-rw-r--r--cuda/2d/fft.cu2
-rw-r--r--cuda/2d/fft.h2
-rw-r--r--cuda/2d/par_bp.cu2
-rw-r--r--cuda/2d/par_bp.h2
-rw-r--r--cuda/2d/par_fp.cu2
-rw-r--r--cuda/2d/par_fp.h2
-rw-r--r--cuda/2d/sart.cu2
-rw-r--r--cuda/2d/sart.h2
-rw-r--r--cuda/2d/sirt.cu2
-rw-r--r--cuda/2d/sirt.h2
-rw-r--r--cuda/2d/util.cu2
-rw-r--r--cuda/2d/util.h2
-rw-r--r--cuda/3d/algo3d.cu2
-rw-r--r--cuda/3d/algo3d.h2
-rw-r--r--cuda/3d/arith3d.cu2
-rw-r--r--cuda/3d/arith3d.h2
-rw-r--r--cuda/3d/astra3d.cu2
-rw-r--r--cuda/3d/astra3d.h2
-rw-r--r--cuda/3d/cgls3d.cu2
-rw-r--r--cuda/3d/cgls3d.h2
-rw-r--r--cuda/3d/cone_bp.cu2
-rw-r--r--cuda/3d/cone_bp.h2
-rw-r--r--cuda/3d/cone_fp.cu2
-rw-r--r--cuda/3d/cone_fp.h2
-rw-r--r--cuda/3d/darthelper3d.cu2
-rw-r--r--cuda/3d/darthelper3d.h2
-rw-r--r--cuda/3d/dims3d.h2
-rw-r--r--cuda/3d/fdk.cu2
-rw-r--r--cuda/3d/fdk.h2
-rw-r--r--cuda/3d/mem3d.cu2
-rw-r--r--cuda/3d/mem3d.h2
-rw-r--r--cuda/3d/par3d_bp.cu2
-rw-r--r--cuda/3d/par3d_bp.h2
-rw-r--r--cuda/3d/par3d_fp.cu2
-rw-r--r--cuda/3d/par3d_fp.h2
-rw-r--r--cuda/3d/sirt3d.cu2
-rw-r--r--cuda/3d/sirt3d.h2
-rw-r--r--cuda/3d/util3d.cu2
-rw-r--r--cuda/3d/util3d.h2
-rw-r--r--include/astra/Algorithm.h2
-rw-r--r--include/astra/AlgorithmTypelist.h2
-rw-r--r--include/astra/ArtAlgorithm.h2
-rw-r--r--include/astra/AstraObjectFactory.h2
-rw-r--r--include/astra/AstraObjectManager.h2
-rw-r--r--include/astra/AsyncAlgorithm.h2
-rw-r--r--include/astra/BackProjectionAlgorithm.h2
-rw-r--r--include/astra/CglsAlgorithm.h2
-rw-r--r--include/astra/CompositeGeometryManager.h2
-rw-r--r--include/astra/ConeProjectionGeometry3D.h2
-rw-r--r--include/astra/ConeVecProjectionGeometry3D.h2
-rw-r--r--include/astra/Config.h2
-rw-r--r--include/astra/CudaBackProjectionAlgorithm.h2
-rw-r--r--include/astra/CudaBackProjectionAlgorithm3D.h2
-rw-r--r--include/astra/CudaCglsAlgorithm.h2
-rw-r--r--include/astra/CudaCglsAlgorithm3D.h2
-rw-r--r--include/astra/CudaDartMaskAlgorithm.h2
-rw-r--r--include/astra/CudaDartMaskAlgorithm3D.h2
-rw-r--r--include/astra/CudaDartSmoothingAlgorithm.h2
-rw-r--r--include/astra/CudaDartSmoothingAlgorithm3D.h2
-rw-r--r--include/astra/CudaDataOperationAlgorithm.h2
-rw-r--r--include/astra/CudaEMAlgorithm.h2
-rw-r--r--include/astra/CudaFDKAlgorithm3D.h2
-rw-r--r--include/astra/CudaFilteredBackProjectionAlgorithm.h2
-rw-r--r--include/astra/CudaForwardProjectionAlgorithm.h2
-rw-r--r--include/astra/CudaForwardProjectionAlgorithm3D.h2
-rw-r--r--include/astra/CudaProjector2D.h2
-rw-r--r--include/astra/CudaProjector3D.h2
-rw-r--r--include/astra/CudaReconstructionAlgorithm2D.h2
-rw-r--r--include/astra/CudaRoiSelectAlgorithm.h2
-rw-r--r--include/astra/CudaSartAlgorithm.h2
-rw-r--r--include/astra/CudaSirtAlgorithm.h2
-rw-r--r--include/astra/CudaSirtAlgorithm3D.h2
-rw-r--r--include/astra/DataProjector.h2
-rw-r--r--include/astra/DataProjectorPolicies.h2
-rw-r--r--include/astra/DataProjectorPolicies.inl2
-rw-r--r--include/astra/FanFlatBeamLineKernelProjector2D.h2
-rw-r--r--include/astra/FanFlatBeamLineKernelProjector2D.inl2
-rw-r--r--include/astra/FanFlatBeamStripKernelProjector2D.h2
-rw-r--r--include/astra/FanFlatBeamStripKernelProjector2D.inl2
-rw-r--r--include/astra/FanFlatProjectionGeometry2D.h2
-rw-r--r--include/astra/FanFlatVecProjectionGeometry2D.h2
-rw-r--r--include/astra/FilteredBackProjectionAlgorithm.h2
-rw-r--r--include/astra/Float32Data.h2
-rw-r--r--include/astra/Float32Data2D.h2
-rw-r--r--include/astra/Float32Data3D.h2
-rw-r--r--include/astra/Float32Data3DGPU.h2
-rw-r--r--include/astra/Float32Data3DMemory.h2
-rw-r--r--include/astra/Float32ProjectionData2D.h2
-rw-r--r--include/astra/Float32ProjectionData3D.h2
-rw-r--r--include/astra/Float32ProjectionData3DGPU.h2
-rw-r--r--include/astra/Float32ProjectionData3DMemory.h2
-rw-r--r--include/astra/Float32VolumeData2D.h2
-rw-r--r--include/astra/Float32VolumeData3D.h2
-rw-r--r--include/astra/Float32VolumeData3DGPU.h2
-rw-r--r--include/astra/Float32VolumeData3DMemory.h2
-rw-r--r--include/astra/ForwardProjectionAlgorithm.h2
-rw-r--r--include/astra/Fourier.h2
-rw-r--r--include/astra/GeometryUtil2D.h2
-rw-r--r--include/astra/GeometryUtil3D.h2
-rw-r--r--include/astra/Globals.h2
-rw-r--r--include/astra/Logging.h2
-rw-r--r--include/astra/ParallelBeamBlobKernelProjector2D.h2
-rw-r--r--include/astra/ParallelBeamBlobKernelProjector2D.inl2
-rw-r--r--include/astra/ParallelBeamLineKernelProjector2D.h2
-rw-r--r--include/astra/ParallelBeamLineKernelProjector2D.inl2
-rw-r--r--include/astra/ParallelBeamLinearKernelProjector2D.h2
-rw-r--r--include/astra/ParallelBeamLinearKernelProjector2D.inl2
-rw-r--r--include/astra/ParallelBeamStripKernelProjector2D.h2
-rw-r--r--include/astra/ParallelBeamStripKernelProjector2D.inl2
-rw-r--r--include/astra/ParallelProjectionGeometry2D.h2
-rw-r--r--include/astra/ParallelProjectionGeometry3D.h2
-rw-r--r--include/astra/ParallelVecProjectionGeometry2D.h2
-rw-r--r--include/astra/ParallelVecProjectionGeometry3D.h2
-rw-r--r--include/astra/PlatformDepSystemCode.h2
-rw-r--r--include/astra/PluginAlgorithm.h2
-rw-r--r--include/astra/ProjectionGeometry2D.h2
-rw-r--r--include/astra/ProjectionGeometry3D.h2
-rw-r--r--include/astra/Projector2D.h2
-rw-r--r--include/astra/Projector2DImpl.inl2
-rw-r--r--include/astra/Projector3D.h2
-rw-r--r--include/astra/ProjectorTypelist.h2
-rw-r--r--include/astra/ReconstructionAlgorithm2D.h2
-rw-r--r--include/astra/ReconstructionAlgorithm3D.h2
-rw-r--r--include/astra/SartAlgorithm.h2
-rw-r--r--include/astra/Singleton.h2
-rw-r--r--include/astra/SirtAlgorithm.h2
-rw-r--r--include/astra/SparseMatrix.h2
-rw-r--r--include/astra/SparseMatrixProjectionGeometry2D.h2
-rw-r--r--include/astra/SparseMatrixProjector2D.h2
-rw-r--r--include/astra/SparseMatrixProjector2D.inl2
-rw-r--r--include/astra/TypeList.h2
-rw-r--r--include/astra/Utilities.h2
-rw-r--r--include/astra/Vector3D.h2
-rw-r--r--include/astra/VolumeGeometry2D.h2
-rw-r--r--include/astra/VolumeGeometry3D.h2
-rw-r--r--include/astra/XMLDocument.h2
-rw-r--r--include/astra/XMLNode.h2
-rw-r--r--matlab/algorithms/DART/DARTalgorithm.m2
-rw-r--r--matlab/algorithms/DART/IterativeTomography.m2
-rw-r--r--matlab/algorithms/DART/IterativeTomography3D.m2
-rw-r--r--matlab/algorithms/DART/Kernels.m2
-rw-r--r--matlab/algorithms/DART/MaskingDefault.m2
-rw-r--r--matlab/algorithms/DART/MaskingGPU.m2
-rw-r--r--matlab/algorithms/DART/OutputDefault.m2
-rw-r--r--matlab/algorithms/DART/SegmentationDefault.m2
-rw-r--r--matlab/algorithms/DART/SmoothingDefault.m2
-rw-r--r--matlab/algorithms/DART/SmoothingGPU.m2
-rw-r--r--matlab/algorithms/DART/StatisticsDefault.m2
-rw-r--r--matlab/algorithms/DART/examples/example1.m2
-rw-r--r--matlab/algorithms/DART/examples/example2.m2
-rw-r--r--matlab/algorithms/DART/examples/example3.m2
-rw-r--r--matlab/algorithms/DART/tools/DARToptimizer.m2
-rw-r--r--matlab/algorithms/DART/tools/DARToptimizerBoneStudy.m2
-rw-r--r--matlab/algorithms/DART/tools/ProjDiffOptimFunc.m2
-rw-r--r--matlab/algorithms/DART/tools/dart_create_base_phantom.m2
-rw-r--r--matlab/algorithms/DART/tools/dart_scheduler.m2
-rw-r--r--matlab/algorithms/DART/tools/rNMPOptimFunc.m2
-rw-r--r--matlab/mex/astra_mex_algorithm_c.cpp2
-rw-r--r--matlab/mex/astra_mex_c.cpp2
-rw-r--r--matlab/mex/astra_mex_data2d_c.cpp2
-rw-r--r--matlab/mex/astra_mex_data3d_c.cpp2
-rw-r--r--matlab/mex/astra_mex_direct_c.cpp2
-rw-r--r--matlab/mex/astra_mex_log_c.cpp2
-rw-r--r--matlab/mex/astra_mex_matrix_c.cpp2
-rw-r--r--matlab/mex/astra_mex_plugin_c.cpp2
-rw-r--r--matlab/mex/astra_mex_projector3d_c.cpp2
-rw-r--r--matlab/mex/astra_mex_projector_c.cpp2
-rw-r--r--matlab/mex/mexCopyDataHelpFunctions.cpp2
-rw-r--r--matlab/mex/mexCopyDataHelpFunctions.h2
-rw-r--r--matlab/mex/mexDataManagerHelpFunctions.cpp2
-rw-r--r--matlab/mex/mexDataManagerHelpFunctions.h2
-rw-r--r--matlab/mex/mexHelpFunctions.cpp2
-rw-r--r--matlab/mex/mexHelpFunctions.h2
-rw-r--r--matlab/mex/octave_support.cpp2
-rw-r--r--matlab/tools/astra_add_noise_to_sino.m2
-rw-r--r--matlab/tools/astra_clear.m2
-rw-r--r--matlab/tools/astra_create_backprojection.m2
-rw-r--r--matlab/tools/astra_create_backprojection3d_cuda.m2
-rw-r--r--matlab/tools/astra_create_backprojection_cuda.m2
-rw-r--r--matlab/tools/astra_create_proj_geom.m2
-rw-r--r--matlab/tools/astra_create_projector.m2
-rw-r--r--matlab/tools/astra_create_reconstruction.m2
-rw-r--r--matlab/tools/astra_create_reconstruction_cuda.m2
-rw-r--r--matlab/tools/astra_create_sino.m2
-rw-r--r--matlab/tools/astra_create_sino3d_cuda.m2
-rw-r--r--matlab/tools/astra_create_sino_cuda.m2
-rw-r--r--matlab/tools/astra_create_sino_gpu.m2
-rw-r--r--matlab/tools/astra_create_sino_sampling.m2
-rw-r--r--matlab/tools/astra_create_vol_geom.m2
-rw-r--r--matlab/tools/astra_downsample_sinogram.m2
-rw-r--r--matlab/tools/astra_geom_2vec.m2
-rw-r--r--matlab/tools/astra_geom_postalignment.m2
-rw-r--r--matlab/tools/astra_geom_size.m2
-rw-r--r--matlab/tools/astra_get_gpu_info.m2
-rw-r--r--matlab/tools/astra_mex.m2
-rw-r--r--matlab/tools/astra_mex_algorithm.m2
-rw-r--r--matlab/tools/astra_mex_data2d.m2
-rw-r--r--matlab/tools/astra_mex_data3d.m2
-rw-r--r--matlab/tools/astra_mex_direct.m2
-rw-r--r--matlab/tools/astra_mex_log.m2
-rw-r--r--matlab/tools/astra_mex_matrix.m2
-rw-r--r--matlab/tools/astra_mex_plugin.m2
-rw-r--r--matlab/tools/astra_mex_projector.m2
-rw-r--r--matlab/tools/astra_mex_projector3d.m2
-rw-r--r--matlab/tools/astra_projector_handle.m2
-rw-r--r--matlab/tools/astra_set_directory.m2
-rw-r--r--matlab/tools/astra_set_gpu_index.m2
-rw-r--r--matlab/tools/astra_struct.m2
-rw-r--r--matlab/tools/astra_test.m2
-rw-r--r--matlab/tools/astra_test_CUDA.m2
-rw-r--r--matlab/tools/astra_test_noCUDA.m2
-rw-r--r--matlab/tools/createOrderART.m2
-rw-r--r--matlab/tools/imreadgs.m2
-rw-r--r--matlab/tools/imresize3D.m2
-rw-r--r--matlab/tools/imscale.m2
-rw-r--r--matlab/tools/imwritesc.m2
-rw-r--r--matlab/tools/kaiserBessel.m2
-rw-r--r--matlab/tools/linspace2.m2
-rw-r--r--matlab/tools/overlayImage.m2
-rw-r--r--matlab/tools/rebin_fan2par.m2
-rw-r--r--matlab/tools/sliceExtractor.m2
-rw-r--r--python/astra/PyAlgorithmFactory.pxd2
-rw-r--r--python/astra/PyAlgorithmManager.pxd2
-rw-r--r--python/astra/PyData2DManager.pxd2
-rw-r--r--python/astra/PyData3DManager.pxd2
-rw-r--r--python/astra/PyIncludes.pxd2
-rw-r--r--python/astra/PyIndexManager.pxd2
-rw-r--r--python/astra/PyMatrixManager.pxd2
-rw-r--r--python/astra/PyProjector2DFactory.pxd2
-rw-r--r--python/astra/PyProjector2DManager.pxd2
-rw-r--r--python/astra/PyProjector3DFactory.pxd2
-rw-r--r--python/astra/PyProjector3DManager.pxd2
-rw-r--r--python/astra/PyXMLDocument.pxd2
-rw-r--r--python/astra/__init__.py2
-rw-r--r--python/astra/algorithm.py2
-rw-r--r--python/astra/algorithm_c.pyx2
-rw-r--r--python/astra/astra.py2
-rw-r--r--python/astra/astra_c.pyx2
-rw-r--r--python/astra/creators.py2
-rw-r--r--python/astra/data2d.py2
-rw-r--r--python/astra/data2d_c.pyx2
-rw-r--r--python/astra/data3d.py2
-rw-r--r--python/astra/data3d_c.pyx2
-rw-r--r--python/astra/experimental.pyx2
-rw-r--r--python/astra/extrautils.pyx2
-rw-r--r--python/astra/functions.py2
-rw-r--r--python/astra/log.py2
-rw-r--r--python/astra/log_c.pyx2
-rw-r--r--python/astra/matlab.py2
-rw-r--r--python/astra/matrix.py2
-rw-r--r--python/astra/matrix_c.pyx2
-rw-r--r--python/astra/optomo.py2
-rw-r--r--python/astra/plugin.py2
-rw-r--r--python/astra/plugin_c.pyx2
-rw-r--r--python/astra/plugins/__init__.py2
-rw-r--r--python/astra/plugins/cgls.py2
-rw-r--r--python/astra/plugins/sirt.py2
-rw-r--r--python/astra/projector.py2
-rw-r--r--python/astra/projector3d.py2
-rw-r--r--python/astra/projector3d_c.pyx2
-rw-r--r--python/astra/projector_c.pyx2
-rw-r--r--python/astra/pythonutils.py2
-rw-r--r--python/astra/src/PythonPluginAlgorithm.cpp2
-rw-r--r--python/astra/src/PythonPluginAlgorithm.h2
-rw-r--r--python/astra/tests.py2
-rw-r--r--python/astra/utils.pxd2
-rw-r--r--python/astra/utils.pyx2
-rw-r--r--python/builder.py2
-rw-r--r--samples/matlab/s001_sinogram_par2d.m2
-rw-r--r--samples/matlab/s002_data2d.m2
-rw-r--r--samples/matlab/s003_gpu_reconstruction.m2
-rw-r--r--samples/matlab/s004_cpu_reconstruction.m2
-rw-r--r--samples/matlab/s005_3d_geometry.m2
-rw-r--r--samples/matlab/s006_3d_data.m2
-rw-r--r--samples/matlab/s007_3d_reconstruction.m2
-rw-r--r--samples/matlab/s008_gpu_selection.m2
-rw-r--r--samples/matlab/s009_projection_matrix.m2
-rw-r--r--samples/matlab/s010_supersampling.m2
-rw-r--r--samples/matlab/s011_object_info.m2
-rw-r--r--samples/matlab/s012_masks.m2
-rw-r--r--samples/matlab/s013_constraints.m2
-rw-r--r--samples/matlab/s014_FBP.m2
-rw-r--r--samples/matlab/s015_fp_bp.m2
-rw-r--r--samples/matlab/s016_plots.m2
-rw-r--r--samples/matlab/s017_opTomo.m2
-rw-r--r--samples/matlab/s020_3d_multiGPU.m2
-rw-r--r--samples/matlab/s022_fbp_cor.m2
-rw-r--r--samples/python/s001_sinogram_par2d.py2
-rw-r--r--samples/python/s002_data2d.py2
-rw-r--r--samples/python/s003_gpu_reconstruction.py2
-rw-r--r--samples/python/s004_cpu_reconstruction.py2
-rw-r--r--samples/python/s005_3d_geometry.py2
-rw-r--r--samples/python/s006_3d_data.py2
-rw-r--r--samples/python/s007_3d_reconstruction.py2
-rw-r--r--samples/python/s008_gpu_selection.py2
-rw-r--r--samples/python/s009_projection_matrix.py2
-rw-r--r--samples/python/s010_supersampling.py2
-rw-r--r--samples/python/s011_object_info.py2
-rw-r--r--samples/python/s012_masks.py2
-rw-r--r--samples/python/s013_constraints.py2
-rw-r--r--samples/python/s014_FBP.py2
-rw-r--r--samples/python/s015_fp_bp.py2
-rw-r--r--samples/python/s016_plots.py2
-rw-r--r--samples/python/s017_OpTomo.py2
-rw-r--r--samples/python/s018_plugin.py2
-rw-r--r--samples/python/s019_experimental_multires.py2
-rw-r--r--samples/python/s020_3d_multiGPU.py2
-rw-r--r--samples/python/s021_pygpu.py2
-rw-r--r--samples/python/s022_fbp_cor.py2
-rw-r--r--src/Algorithm.cpp2
-rw-r--r--src/ArtAlgorithm.cpp2
-rw-r--r--src/AstraObjectFactory.cpp2
-rw-r--r--src/AstraObjectManager.cpp2
-rw-r--r--src/AsyncAlgorithm.cpp2
-rw-r--r--src/BackProjectionAlgorithm.cpp2
-rw-r--r--src/CglsAlgorithm.cpp2
-rw-r--r--src/CompositeGeometryManager.cpp2
-rw-r--r--src/ConeProjectionGeometry3D.cpp2
-rw-r--r--src/ConeVecProjectionGeometry3D.cpp2
-rw-r--r--src/Config.cpp2
-rw-r--r--src/CudaBackProjectionAlgorithm.cpp2
-rw-r--r--src/CudaBackProjectionAlgorithm3D.cpp2
-rw-r--r--src/CudaCglsAlgorithm.cpp2
-rw-r--r--src/CudaCglsAlgorithm3D.cpp2
-rw-r--r--src/CudaDartMaskAlgorithm.cpp2
-rw-r--r--src/CudaDartMaskAlgorithm3D.cpp2
-rw-r--r--src/CudaDartSmoothingAlgorithm.cpp2
-rw-r--r--src/CudaDartSmoothingAlgorithm3D.cpp2
-rw-r--r--src/CudaDataOperationAlgorithm.cpp2
-rw-r--r--src/CudaEMAlgorithm.cpp2
-rw-r--r--src/CudaFDKAlgorithm3D.cpp2
-rw-r--r--src/CudaFilteredBackProjectionAlgorithm.cpp2
-rw-r--r--src/CudaForwardProjectionAlgorithm.cpp2
-rw-r--r--src/CudaForwardProjectionAlgorithm3D.cpp2
-rw-r--r--src/CudaProjector2D.cpp2
-rw-r--r--src/CudaProjector3D.cpp2
-rw-r--r--src/CudaReconstructionAlgorithm2D.cpp2
-rw-r--r--src/CudaRoiSelectAlgorithm.cpp2
-rw-r--r--src/CudaSartAlgorithm.cpp2
-rw-r--r--src/CudaSirtAlgorithm.cpp2
-rw-r--r--src/CudaSirtAlgorithm3D.cpp2
-rw-r--r--src/DataProjector.cpp2
-rw-r--r--src/DataProjectorPolicies.cpp2
-rw-r--r--src/FanFlatBeamLineKernelProjector2D.cpp2
-rw-r--r--src/FanFlatBeamStripKernelProjector2D.cpp2
-rw-r--r--src/FanFlatProjectionGeometry2D.cpp2
-rw-r--r--src/FanFlatVecProjectionGeometry2D.cpp2
-rw-r--r--src/FilteredBackProjectionAlgorithm.cpp2
-rw-r--r--src/Float32Data.cpp2
-rw-r--r--src/Float32Data2D.cpp2
-rw-r--r--src/Float32Data3D.cpp2
-rw-r--r--src/Float32Data3DGPU.cpp2
-rw-r--r--src/Float32Data3DMemory.cpp2
-rw-r--r--src/Float32ProjectionData2D.cpp2
-rw-r--r--src/Float32ProjectionData3D.cpp2
-rw-r--r--src/Float32ProjectionData3DGPU.cpp2
-rw-r--r--src/Float32ProjectionData3DMemory.cpp2
-rw-r--r--src/Float32VolumeData2D.cpp2
-rw-r--r--src/Float32VolumeData3D.cpp2
-rw-r--r--src/Float32VolumeData3DGPU.cpp2
-rw-r--r--src/Float32VolumeData3DMemory.cpp2
-rw-r--r--src/ForwardProjectionAlgorithm.cpp2
-rw-r--r--src/Fourier.cpp2
-rw-r--r--src/GeometryUtil2D.cpp2
-rw-r--r--src/GeometryUtil3D.cpp2
-rw-r--r--src/Globals.cpp2
-rw-r--r--src/Logging.cpp2
-rw-r--r--src/ParallelBeamBlobKernelProjector2D.cpp2
-rw-r--r--src/ParallelBeamLineKernelProjector2D.cpp2
-rw-r--r--src/ParallelBeamLinearKernelProjector2D.cpp2
-rw-r--r--src/ParallelBeamStripKernelProjector2D.cpp2
-rw-r--r--src/ParallelProjectionGeometry2D.cpp2
-rw-r--r--src/ParallelProjectionGeometry3D.cpp2
-rw-r--r--src/ParallelVecProjectionGeometry2D.cpp2
-rw-r--r--src/ParallelVecProjectionGeometry3D.cpp2
-rw-r--r--src/PlatformDepSystemCode.cpp2
-rw-r--r--src/PluginAlgorithm.cpp2
-rw-r--r--src/ProjectionGeometry2D.cpp2
-rw-r--r--src/ProjectionGeometry3D.cpp2
-rw-r--r--src/Projector2D.cpp2
-rw-r--r--src/Projector3D.cpp2
-rw-r--r--src/ReconstructionAlgorithm2D.cpp2
-rw-r--r--src/ReconstructionAlgorithm3D.cpp2
-rw-r--r--src/ReconstructionAlgorithmMultiSlice2D.cpp2
-rw-r--r--src/SartAlgorithm.cpp2
-rw-r--r--src/SirtAlgorithm.cpp2
-rw-r--r--src/SparseMatrix.cpp2
-rw-r--r--src/SparseMatrixProjectionGeometry2D.cpp2
-rw-r--r--src/SparseMatrixProjector2D.cpp2
-rw-r--r--src/Utilities.cpp2
-rw-r--r--src/Vector3D.cpp2
-rw-r--r--src/VolumeGeometry2D.cpp2
-rw-r--r--src/VolumeGeometry3D.cpp2
-rw-r--r--src/XMLDocument.cpp2
-rw-r--r--src/XMLNode.cpp2
-rw-r--r--tests/main.cpp2
-rw-r--r--tests/test_AstraObjectManager.cpp2
-rw-r--r--tests/test_FanFlatProjectionGeometry2D.cpp2
-rw-r--r--tests/test_Float32Data2D.cpp2
-rw-r--r--tests/test_Float32ProjectionData2D.cpp2
-rw-r--r--tests/test_Float32VolumeData2D.cpp2
-rw-r--r--tests/test_Fourier.cpp2
-rw-r--r--tests/test_ParallelBeamLineKernelProjector2D.cpp2
-rw-r--r--tests/test_ParallelBeamLinearKernelProjector2D.cpp2
-rw-r--r--tests/test_ParallelProjectionGeometry2D.cpp2
-rw-r--r--tests/test_VolumeGeometry2D.cpp2
-rw-r--r--tests/test_XMLDocument.cpp2
432 files changed, 433 insertions, 433 deletions
diff --git a/NEWS.txt b/NEWS.txt
index 2217d9c..0047099 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,7 +1,7 @@
-----------------------------------------------------------------------
This file is part of the ASTRA Toolbox
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
http://visielab.uantwerpen.be/ and http://www.cwi.nl/
License: Open Source under GPLv3
diff --git a/README.md b/README.md
index dcc7504..f35cb8b 100644
--- a/README.md
+++ b/README.md
@@ -162,6 +162,6 @@ The ASTRA Toolbox is open source under the GPLv3 license.
email: astra@astra-toolbox.com
website: http://www.astra-toolbox.com/
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
http://visielab.uantwerpen.be/ and http://www.cwi.nl/
diff --git a/README.txt b/README.txt
index 0424d57..be8fc4c 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
-----------------------------------------------------------------------
This file is part of the ASTRA Toolbox
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
http://visielab.uantwerpen.be/ and http://www.cwi.nl/
License: Open Source under GPLv3
diff --git a/build/linux/configure.ac b/build/linux/configure.ac
index 56432f5..ac0d82f 100644
--- a/build/linux/configure.ac
+++ b/build/linux/configure.ac
@@ -1,5 +1,5 @@
dnl -----------------------------------------------------------------------
-dnl Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+dnl Copyright: 2010-2018, imec Vision Lab, University of Antwerp
dnl 2014-2018, CWI, Amsterdam
dnl
dnl Contact: astra@astra-toolbox.com
diff --git a/build/msvc/build_release.bat b/build/msvc/build_release.bat
index c96a588..a469678 100644
--- a/build/msvc/build_release.bat
+++ b/build/msvc/build_release.bat
@@ -66,7 +66,7 @@ copy "%CUDA_PATH%\bin\cufft64_80.dll" astra
echo -----------------------------------------------------------------------
echo This file is part of the ASTRA Toolbox
echo.
-echo Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+echo Copyright: 2010-2018, imec Vision Lab, University of Antwerp
echo 2014-2018, CWI, Amsterdam
echo http://visielab.uantwerpen.be/ and http://www.cwi.nl/
echo License: Open Source under GPLv3
@@ -110,7 +110,7 @@ copy "%CUDA_PATH%\bin\cufft64_80.dll" astra
echo -----------------------------------------------------------------------
echo This file is part of the ASTRA Toolbox
echo.
-echo Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+echo Copyright: 2010-2018, imec Vision Lab, University of Antwerp
echo 2014-2018, CWI, Amsterdam
echo http://visielab.uantwerpen.be/ and http://www.cwi.nl/
echo License: Open Source under GPLv3
diff --git a/cuda/2d/algo.cu b/cuda/2d/algo.cu
index 36900e4..02790f0 100644
--- a/cuda/2d/algo.cu
+++ b/cuda/2d/algo.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/algo.h b/cuda/2d/algo.h
index e60fa83..2ce929c 100644
--- a/cuda/2d/algo.h
+++ b/cuda/2d/algo.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/arith.cu b/cuda/2d/arith.cu
index 50dba5d..0ff4aa0 100644
--- a/cuda/2d/arith.cu
+++ b/cuda/2d/arith.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/arith.h b/cuda/2d/arith.h
index b66ee8b..e18bb1b 100644
--- a/cuda/2d/arith.h
+++ b/cuda/2d/arith.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/astra.cu b/cuda/2d/astra.cu
index cf2db68..2ee469c 100644
--- a/cuda/2d/astra.cu
+++ b/cuda/2d/astra.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/astra.h b/cuda/2d/astra.h
index 11104ae..6f0e2f0 100644
--- a/cuda/2d/astra.h
+++ b/cuda/2d/astra.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/cgls.cu b/cuda/2d/cgls.cu
index a9345b0..f9fd6c1 100644
--- a/cuda/2d/cgls.cu
+++ b/cuda/2d/cgls.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/cgls.h b/cuda/2d/cgls.h
index aafab85..375a425 100644
--- a/cuda/2d/cgls.h
+++ b/cuda/2d/cgls.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/darthelper.cu b/cuda/2d/darthelper.cu
index 229797d..4041d79 100644
--- a/cuda/2d/darthelper.cu
+++ b/cuda/2d/darthelper.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/darthelper.h b/cuda/2d/darthelper.h
index 0e371f6..3c2f83c 100644
--- a/cuda/2d/darthelper.h
+++ b/cuda/2d/darthelper.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/dims.h b/cuda/2d/dims.h
index 243c393..0bdefa9 100644
--- a/cuda/2d/dims.h
+++ b/cuda/2d/dims.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/em.cu b/cuda/2d/em.cu
index 9b33ef5..cf67f9b 100644
--- a/cuda/2d/em.cu
+++ b/cuda/2d/em.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/em.h b/cuda/2d/em.h
index 821566b..3ffe01b 100644
--- a/cuda/2d/em.h
+++ b/cuda/2d/em.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/fan_bp.cu b/cuda/2d/fan_bp.cu
index 0fbbaa9..793b5f4 100644
--- a/cuda/2d/fan_bp.cu
+++ b/cuda/2d/fan_bp.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/fan_bp.h b/cuda/2d/fan_bp.h
index d5268ff..22349b0 100644
--- a/cuda/2d/fan_bp.h
+++ b/cuda/2d/fan_bp.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/fan_fp.cu b/cuda/2d/fan_fp.cu
index d350b1a..f08a681 100644
--- a/cuda/2d/fan_fp.cu
+++ b/cuda/2d/fan_fp.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/fan_fp.h b/cuda/2d/fan_fp.h
index 99db4c6..3e8f1e4 100644
--- a/cuda/2d/fan_fp.h
+++ b/cuda/2d/fan_fp.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/fbp.cu b/cuda/2d/fbp.cu
index 5481059..020b6ad 100644
--- a/cuda/2d/fbp.cu
+++ b/cuda/2d/fbp.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/fbp.h b/cuda/2d/fbp.h
index c55c828..9f6cee4 100644
--- a/cuda/2d/fbp.h
+++ b/cuda/2d/fbp.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/fbp_filters.h b/cuda/2d/fbp_filters.h
index 41a66fd..7c1121a 100644
--- a/cuda/2d/fbp_filters.h
+++ b/cuda/2d/fbp_filters.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/fft.cu b/cuda/2d/fft.cu
index 7b19f80..a1b1b93 100644
--- a/cuda/2d/fft.cu
+++ b/cuda/2d/fft.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/fft.h b/cuda/2d/fft.h
index 666ba4e..d36cae2 100644
--- a/cuda/2d/fft.h
+++ b/cuda/2d/fft.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/par_bp.cu b/cuda/2d/par_bp.cu
index db502f1..a894f3f 100644
--- a/cuda/2d/par_bp.cu
+++ b/cuda/2d/par_bp.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/par_bp.h b/cuda/2d/par_bp.h
index c4382d1..c8dfab8 100644
--- a/cuda/2d/par_bp.h
+++ b/cuda/2d/par_bp.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/par_fp.cu b/cuda/2d/par_fp.cu
index b542336..427a4e8 100644
--- a/cuda/2d/par_fp.cu
+++ b/cuda/2d/par_fp.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/par_fp.h b/cuda/2d/par_fp.h
index 3aeb5f1..62277a1 100644
--- a/cuda/2d/par_fp.h
+++ b/cuda/2d/par_fp.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/sart.cu b/cuda/2d/sart.cu
index 63fc80c..8b6f50e 100644
--- a/cuda/2d/sart.cu
+++ b/cuda/2d/sart.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/sart.h b/cuda/2d/sart.h
index ba2d3ce..6c0e547 100644
--- a/cuda/2d/sart.h
+++ b/cuda/2d/sart.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/sirt.cu b/cuda/2d/sirt.cu
index d2655cd..faba7a7 100644
--- a/cuda/2d/sirt.cu
+++ b/cuda/2d/sirt.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/sirt.h b/cuda/2d/sirt.h
index 519320e..434a07c 100644
--- a/cuda/2d/sirt.h
+++ b/cuda/2d/sirt.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/util.cu b/cuda/2d/util.cu
index 844f756..dfc5de9 100644
--- a/cuda/2d/util.cu
+++ b/cuda/2d/util.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/2d/util.h b/cuda/2d/util.h
index 0b5ba46..70e7c86 100644
--- a/cuda/2d/util.h
+++ b/cuda/2d/util.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/algo3d.cu b/cuda/3d/algo3d.cu
index bec3b51..ee7a23b 100644
--- a/cuda/3d/algo3d.cu
+++ b/cuda/3d/algo3d.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/algo3d.h b/cuda/3d/algo3d.h
index b830521..f5fd207 100644
--- a/cuda/3d/algo3d.h
+++ b/cuda/3d/algo3d.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/arith3d.cu b/cuda/3d/arith3d.cu
index bf5f4fc..05b94ce 100644
--- a/cuda/3d/arith3d.cu
+++ b/cuda/3d/arith3d.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/arith3d.h b/cuda/3d/arith3d.h
index 9805c8f..fa9f3a1 100644
--- a/cuda/3d/arith3d.h
+++ b/cuda/3d/arith3d.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/astra3d.cu b/cuda/3d/astra3d.cu
index f08043d..c0f4c4a 100644
--- a/cuda/3d/astra3d.cu
+++ b/cuda/3d/astra3d.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/astra3d.h b/cuda/3d/astra3d.h
index d50a6dd..0ea752d 100644
--- a/cuda/3d/astra3d.h
+++ b/cuda/3d/astra3d.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/cgls3d.cu b/cuda/3d/cgls3d.cu
index 0e1a8b7..7e31749 100644
--- a/cuda/3d/cgls3d.cu
+++ b/cuda/3d/cgls3d.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/cgls3d.h b/cuda/3d/cgls3d.h
index 7fbf12b..b9b9e3a 100644
--- a/cuda/3d/cgls3d.h
+++ b/cuda/3d/cgls3d.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/cone_bp.cu b/cuda/3d/cone_bp.cu
index 3fe0a02..3dd0c97 100644
--- a/cuda/3d/cone_bp.cu
+++ b/cuda/3d/cone_bp.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/cone_bp.h b/cuda/3d/cone_bp.h
index 527245e..6dcadb1 100644
--- a/cuda/3d/cone_bp.h
+++ b/cuda/3d/cone_bp.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/cone_fp.cu b/cuda/3d/cone_fp.cu
index c86e258..21598d0 100644
--- a/cuda/3d/cone_fp.cu
+++ b/cuda/3d/cone_fp.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/cone_fp.h b/cuda/3d/cone_fp.h
index 24230d0..4da72d4 100644
--- a/cuda/3d/cone_fp.h
+++ b/cuda/3d/cone_fp.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/darthelper3d.cu b/cuda/3d/darthelper3d.cu
index 00b5f0f..473199a 100644
--- a/cuda/3d/darthelper3d.cu
+++ b/cuda/3d/darthelper3d.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/darthelper3d.h b/cuda/3d/darthelper3d.h
index 5816546..385e48e 100644
--- a/cuda/3d/darthelper3d.h
+++ b/cuda/3d/darthelper3d.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/dims3d.h b/cuda/3d/dims3d.h
index 81dc774..ef4ea78 100644
--- a/cuda/3d/dims3d.h
+++ b/cuda/3d/dims3d.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/fdk.cu b/cuda/3d/fdk.cu
index 29458eb..4e926f2 100644
--- a/cuda/3d/fdk.cu
+++ b/cuda/3d/fdk.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/fdk.h b/cuda/3d/fdk.h
index fda2b05..f4049e6 100644
--- a/cuda/3d/fdk.h
+++ b/cuda/3d/fdk.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/mem3d.cu b/cuda/3d/mem3d.cu
index c1abb2f..4a26921 100644
--- a/cuda/3d/mem3d.cu
+++ b/cuda/3d/mem3d.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/mem3d.h b/cuda/3d/mem3d.h
index 9d14487..78e1294 100644
--- a/cuda/3d/mem3d.h
+++ b/cuda/3d/mem3d.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/par3d_bp.cu b/cuda/3d/par3d_bp.cu
index 113a597..6f76d22 100644
--- a/cuda/3d/par3d_bp.cu
+++ b/cuda/3d/par3d_bp.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/par3d_bp.h b/cuda/3d/par3d_bp.h
index 202c2b0..b4ec6a3 100644
--- a/cuda/3d/par3d_bp.h
+++ b/cuda/3d/par3d_bp.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/par3d_fp.cu b/cuda/3d/par3d_fp.cu
index 4ee017e..8e2a2d0 100644
--- a/cuda/3d/par3d_fp.cu
+++ b/cuda/3d/par3d_fp.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/par3d_fp.h b/cuda/3d/par3d_fp.h
index 0b90ed0..18f5f2e 100644
--- a/cuda/3d/par3d_fp.h
+++ b/cuda/3d/par3d_fp.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/sirt3d.cu b/cuda/3d/sirt3d.cu
index d7c1b6d..14f5768 100644
--- a/cuda/3d/sirt3d.cu
+++ b/cuda/3d/sirt3d.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/sirt3d.h b/cuda/3d/sirt3d.h
index a2b2ce0..7c9a7c0 100644
--- a/cuda/3d/sirt3d.h
+++ b/cuda/3d/sirt3d.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/util3d.cu b/cuda/3d/util3d.cu
index 5e55ab9..1f436d8 100644
--- a/cuda/3d/util3d.cu
+++ b/cuda/3d/util3d.cu
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/cuda/3d/util3d.h b/cuda/3d/util3d.h
index 125bd9e..17eb31e 100644
--- a/cuda/3d/util3d.h
+++ b/cuda/3d/util3d.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/Algorithm.h b/include/astra/Algorithm.h
index d8d5c2d..af9e41d 100644
--- a/include/astra/Algorithm.h
+++ b/include/astra/Algorithm.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/AlgorithmTypelist.h b/include/astra/AlgorithmTypelist.h
index 73ddec3..56c40b6 100644
--- a/include/astra/AlgorithmTypelist.h
+++ b/include/astra/AlgorithmTypelist.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/ArtAlgorithm.h b/include/astra/ArtAlgorithm.h
index d81f37b..85a12bf 100644
--- a/include/astra/ArtAlgorithm.h
+++ b/include/astra/ArtAlgorithm.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/AstraObjectFactory.h b/include/astra/AstraObjectFactory.h
index f438962..c963e35 100644
--- a/include/astra/AstraObjectFactory.h
+++ b/include/astra/AstraObjectFactory.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/AstraObjectManager.h b/include/astra/AstraObjectManager.h
index 5b5c5cc..81f5725 100644
--- a/include/astra/AstraObjectManager.h
+++ b/include/astra/AstraObjectManager.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/AsyncAlgorithm.h b/include/astra/AsyncAlgorithm.h
index 149ee3c..0e43e67 100644
--- a/include/astra/AsyncAlgorithm.h
+++ b/include/astra/AsyncAlgorithm.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/BackProjectionAlgorithm.h b/include/astra/BackProjectionAlgorithm.h
index f7eb0e8..1b2807c 100644
--- a/include/astra/BackProjectionAlgorithm.h
+++ b/include/astra/BackProjectionAlgorithm.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/CglsAlgorithm.h b/include/astra/CglsAlgorithm.h
index 34a0c8b..79d8aa6 100644
--- a/include/astra/CglsAlgorithm.h
+++ b/include/astra/CglsAlgorithm.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/CompositeGeometryManager.h b/include/astra/CompositeGeometryManager.h
index 6e0c2b5..bb57277 100644
--- a/include/astra/CompositeGeometryManager.h
+++ b/include/astra/CompositeGeometryManager.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/ConeProjectionGeometry3D.h b/include/astra/ConeProjectionGeometry3D.h
index 80f52af..cbb7a2b 100644
--- a/include/astra/ConeProjectionGeometry3D.h
+++ b/include/astra/ConeProjectionGeometry3D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/ConeVecProjectionGeometry3D.h b/include/astra/ConeVecProjectionGeometry3D.h
index 3c5157d..0a9813c 100644
--- a/include/astra/ConeVecProjectionGeometry3D.h
+++ b/include/astra/ConeVecProjectionGeometry3D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/Config.h b/include/astra/Config.h
index b7b8748..c801ee9 100644
--- a/include/astra/Config.h
+++ b/include/astra/Config.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/CudaBackProjectionAlgorithm.h b/include/astra/CudaBackProjectionAlgorithm.h
index f574994..aa96008 100644
--- a/include/astra/CudaBackProjectionAlgorithm.h
+++ b/include/astra/CudaBackProjectionAlgorithm.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/CudaBackProjectionAlgorithm3D.h b/include/astra/CudaBackProjectionAlgorithm3D.h
index dcca739..743d20a 100644
--- a/include/astra/CudaBackProjectionAlgorithm3D.h
+++ b/include/astra/CudaBackProjectionAlgorithm3D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/CudaCglsAlgorithm.h b/include/astra/CudaCglsAlgorithm.h
index 79ec69b..3570df2 100644
--- a/include/astra/CudaCglsAlgorithm.h
+++ b/include/astra/CudaCglsAlgorithm.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/CudaCglsAlgorithm3D.h b/include/astra/CudaCglsAlgorithm3D.h
index 4a49d15..6f35192 100644
--- a/include/astra/CudaCglsAlgorithm3D.h
+++ b/include/astra/CudaCglsAlgorithm3D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/CudaDartMaskAlgorithm.h b/include/astra/CudaDartMaskAlgorithm.h
index 146eeb3..8b69f08 100644
--- a/include/astra/CudaDartMaskAlgorithm.h
+++ b/include/astra/CudaDartMaskAlgorithm.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/CudaDartMaskAlgorithm3D.h b/include/astra/CudaDartMaskAlgorithm3D.h
index 50a41f3..7b3889e 100644
--- a/include/astra/CudaDartMaskAlgorithm3D.h
+++ b/include/astra/CudaDartMaskAlgorithm3D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/CudaDartSmoothingAlgorithm.h b/include/astra/CudaDartSmoothingAlgorithm.h
index 1783756..c0e7aef 100644
--- a/include/astra/CudaDartSmoothingAlgorithm.h
+++ b/include/astra/CudaDartSmoothingAlgorithm.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/CudaDartSmoothingAlgorithm3D.h b/include/astra/CudaDartSmoothingAlgorithm3D.h
index a0e720c..793a0c1 100644
--- a/include/astra/CudaDartSmoothingAlgorithm3D.h
+++ b/include/astra/CudaDartSmoothingAlgorithm3D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/CudaDataOperationAlgorithm.h b/include/astra/CudaDataOperationAlgorithm.h
index c55ed7f..c7795bc 100644
--- a/include/astra/CudaDataOperationAlgorithm.h
+++ b/include/astra/CudaDataOperationAlgorithm.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/CudaEMAlgorithm.h b/include/astra/CudaEMAlgorithm.h
index cbe6c7f..4a4ac4f 100644
--- a/include/astra/CudaEMAlgorithm.h
+++ b/include/astra/CudaEMAlgorithm.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/CudaFDKAlgorithm3D.h b/include/astra/CudaFDKAlgorithm3D.h
index f9de979..788de69 100644
--- a/include/astra/CudaFDKAlgorithm3D.h
+++ b/include/astra/CudaFDKAlgorithm3D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/CudaFilteredBackProjectionAlgorithm.h b/include/astra/CudaFilteredBackProjectionAlgorithm.h
index df27286..5ff9f02 100644
--- a/include/astra/CudaFilteredBackProjectionAlgorithm.h
+++ b/include/astra/CudaFilteredBackProjectionAlgorithm.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/CudaForwardProjectionAlgorithm.h b/include/astra/CudaForwardProjectionAlgorithm.h
index 29cf00a..005b856 100644
--- a/include/astra/CudaForwardProjectionAlgorithm.h
+++ b/include/astra/CudaForwardProjectionAlgorithm.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/CudaForwardProjectionAlgorithm3D.h b/include/astra/CudaForwardProjectionAlgorithm3D.h
index f17853b..4abc7ba 100644
--- a/include/astra/CudaForwardProjectionAlgorithm3D.h
+++ b/include/astra/CudaForwardProjectionAlgorithm3D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/CudaProjector2D.h b/include/astra/CudaProjector2D.h
index b6173ec..db6972e 100644
--- a/include/astra/CudaProjector2D.h
+++ b/include/astra/CudaProjector2D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/CudaProjector3D.h b/include/astra/CudaProjector3D.h
index 6c95a3f..83ce93e 100644
--- a/include/astra/CudaProjector3D.h
+++ b/include/astra/CudaProjector3D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/CudaReconstructionAlgorithm2D.h b/include/astra/CudaReconstructionAlgorithm2D.h
index 65e4ce9..197f984 100644
--- a/include/astra/CudaReconstructionAlgorithm2D.h
+++ b/include/astra/CudaReconstructionAlgorithm2D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/CudaRoiSelectAlgorithm.h b/include/astra/CudaRoiSelectAlgorithm.h
index 16f5f0e..69a02c6 100644
--- a/include/astra/CudaRoiSelectAlgorithm.h
+++ b/include/astra/CudaRoiSelectAlgorithm.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/CudaSartAlgorithm.h b/include/astra/CudaSartAlgorithm.h
index 3bfd8d2..ef5a2c5 100644
--- a/include/astra/CudaSartAlgorithm.h
+++ b/include/astra/CudaSartAlgorithm.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/CudaSirtAlgorithm.h b/include/astra/CudaSirtAlgorithm.h
index bb668b3..2098525 100644
--- a/include/astra/CudaSirtAlgorithm.h
+++ b/include/astra/CudaSirtAlgorithm.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/CudaSirtAlgorithm3D.h b/include/astra/CudaSirtAlgorithm3D.h
index 2834c54..9c041b9 100644
--- a/include/astra/CudaSirtAlgorithm3D.h
+++ b/include/astra/CudaSirtAlgorithm3D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/DataProjector.h b/include/astra/DataProjector.h
index 82a163b..15a540f 100644
--- a/include/astra/DataProjector.h
+++ b/include/astra/DataProjector.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/DataProjectorPolicies.h b/include/astra/DataProjectorPolicies.h
index 1624e90..695862c 100644
--- a/include/astra/DataProjectorPolicies.h
+++ b/include/astra/DataProjectorPolicies.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/DataProjectorPolicies.inl b/include/astra/DataProjectorPolicies.inl
index b2c319d..ad7c035 100644
--- a/include/astra/DataProjectorPolicies.inl
+++ b/include/astra/DataProjectorPolicies.inl
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/FanFlatBeamLineKernelProjector2D.h b/include/astra/FanFlatBeamLineKernelProjector2D.h
index 57eff4c..1bfaf07 100644
--- a/include/astra/FanFlatBeamLineKernelProjector2D.h
+++ b/include/astra/FanFlatBeamLineKernelProjector2D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/FanFlatBeamLineKernelProjector2D.inl b/include/astra/FanFlatBeamLineKernelProjector2D.inl
index 92ed054..58dec61 100644
--- a/include/astra/FanFlatBeamLineKernelProjector2D.inl
+++ b/include/astra/FanFlatBeamLineKernelProjector2D.inl
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/FanFlatBeamStripKernelProjector2D.h b/include/astra/FanFlatBeamStripKernelProjector2D.h
index bdfff87..a6a303c 100644
--- a/include/astra/FanFlatBeamStripKernelProjector2D.h
+++ b/include/astra/FanFlatBeamStripKernelProjector2D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/FanFlatBeamStripKernelProjector2D.inl b/include/astra/FanFlatBeamStripKernelProjector2D.inl
index cbe8754..bbd45cf 100644
--- a/include/astra/FanFlatBeamStripKernelProjector2D.inl
+++ b/include/astra/FanFlatBeamStripKernelProjector2D.inl
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/FanFlatProjectionGeometry2D.h b/include/astra/FanFlatProjectionGeometry2D.h
index 5f361f1..7a4e179 100644
--- a/include/astra/FanFlatProjectionGeometry2D.h
+++ b/include/astra/FanFlatProjectionGeometry2D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/FanFlatVecProjectionGeometry2D.h b/include/astra/FanFlatVecProjectionGeometry2D.h
index b0ae313..cafeda8 100644
--- a/include/astra/FanFlatVecProjectionGeometry2D.h
+++ b/include/astra/FanFlatVecProjectionGeometry2D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/FilteredBackProjectionAlgorithm.h b/include/astra/FilteredBackProjectionAlgorithm.h
index 9631385..1cd4296 100644
--- a/include/astra/FilteredBackProjectionAlgorithm.h
+++ b/include/astra/FilteredBackProjectionAlgorithm.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/Float32Data.h b/include/astra/Float32Data.h
index 1e88d82..811518b 100644
--- a/include/astra/Float32Data.h
+++ b/include/astra/Float32Data.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/Float32Data2D.h b/include/astra/Float32Data2D.h
index 521e9c3..bcc03e4 100644
--- a/include/astra/Float32Data2D.h
+++ b/include/astra/Float32Data2D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/Float32Data3D.h b/include/astra/Float32Data3D.h
index 76c8a38..12ad685 100644
--- a/include/astra/Float32Data3D.h
+++ b/include/astra/Float32Data3D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/Float32Data3DGPU.h b/include/astra/Float32Data3DGPU.h
index 110f359..9ebb341 100644
--- a/include/astra/Float32Data3DGPU.h
+++ b/include/astra/Float32Data3DGPU.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/Float32Data3DMemory.h b/include/astra/Float32Data3DMemory.h
index d681d7b..f9456d0 100644
--- a/include/astra/Float32Data3DMemory.h
+++ b/include/astra/Float32Data3DMemory.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/Float32ProjectionData2D.h b/include/astra/Float32ProjectionData2D.h
index 0ae8b6b..ee4aebe 100644
--- a/include/astra/Float32ProjectionData2D.h
+++ b/include/astra/Float32ProjectionData2D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/Float32ProjectionData3D.h b/include/astra/Float32ProjectionData3D.h
index 708e668..1040f89 100644
--- a/include/astra/Float32ProjectionData3D.h
+++ b/include/astra/Float32ProjectionData3D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/Float32ProjectionData3DGPU.h b/include/astra/Float32ProjectionData3DGPU.h
index 0bf8e7f..3b40935 100644
--- a/include/astra/Float32ProjectionData3DGPU.h
+++ b/include/astra/Float32ProjectionData3DGPU.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/Float32ProjectionData3DMemory.h b/include/astra/Float32ProjectionData3DMemory.h
index 262285b..c94ebf3 100644
--- a/include/astra/Float32ProjectionData3DMemory.h
+++ b/include/astra/Float32ProjectionData3DMemory.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/Float32VolumeData2D.h b/include/astra/Float32VolumeData2D.h
index dcef082..abd29df 100644
--- a/include/astra/Float32VolumeData2D.h
+++ b/include/astra/Float32VolumeData2D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/Float32VolumeData3D.h b/include/astra/Float32VolumeData3D.h
index 3d69c88..a1cbb1c 100644
--- a/include/astra/Float32VolumeData3D.h
+++ b/include/astra/Float32VolumeData3D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/Float32VolumeData3DGPU.h b/include/astra/Float32VolumeData3DGPU.h
index a9552ba..db203ee 100644
--- a/include/astra/Float32VolumeData3DGPU.h
+++ b/include/astra/Float32VolumeData3DGPU.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/Float32VolumeData3DMemory.h b/include/astra/Float32VolumeData3DMemory.h
index 811c0aa..b1e6ff2 100644
--- a/include/astra/Float32VolumeData3DMemory.h
+++ b/include/astra/Float32VolumeData3DMemory.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/ForwardProjectionAlgorithm.h b/include/astra/ForwardProjectionAlgorithm.h
index 871c30e..af02440 100644
--- a/include/astra/ForwardProjectionAlgorithm.h
+++ b/include/astra/ForwardProjectionAlgorithm.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/Fourier.h b/include/astra/Fourier.h
index 0d37e7f..2b6f41a 100644
--- a/include/astra/Fourier.h
+++ b/include/astra/Fourier.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/GeometryUtil2D.h b/include/astra/GeometryUtil2D.h
index 1c4af52..c3ce508 100644
--- a/include/astra/GeometryUtil2D.h
+++ b/include/astra/GeometryUtil2D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/GeometryUtil3D.h b/include/astra/GeometryUtil3D.h
index 235818a..e025d89 100644
--- a/include/astra/GeometryUtil3D.h
+++ b/include/astra/GeometryUtil3D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/Globals.h b/include/astra/Globals.h
index 3928606..993e443 100644
--- a/include/astra/Globals.h
+++ b/include/astra/Globals.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/Logging.h b/include/astra/Logging.h
index e7eb249..0150e26 100644
--- a/include/astra/Logging.h
+++ b/include/astra/Logging.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/ParallelBeamBlobKernelProjector2D.h b/include/astra/ParallelBeamBlobKernelProjector2D.h
index a22fe5e..46b0b52 100644
--- a/include/astra/ParallelBeamBlobKernelProjector2D.h
+++ b/include/astra/ParallelBeamBlobKernelProjector2D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/ParallelBeamBlobKernelProjector2D.inl b/include/astra/ParallelBeamBlobKernelProjector2D.inl
index a0be228..8c127ff 100644
--- a/include/astra/ParallelBeamBlobKernelProjector2D.inl
+++ b/include/astra/ParallelBeamBlobKernelProjector2D.inl
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/ParallelBeamLineKernelProjector2D.h b/include/astra/ParallelBeamLineKernelProjector2D.h
index 7a38107..f709e1d 100644
--- a/include/astra/ParallelBeamLineKernelProjector2D.h
+++ b/include/astra/ParallelBeamLineKernelProjector2D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/ParallelBeamLineKernelProjector2D.inl b/include/astra/ParallelBeamLineKernelProjector2D.inl
index e8c3036..a9f1aa0 100644
--- a/include/astra/ParallelBeamLineKernelProjector2D.inl
+++ b/include/astra/ParallelBeamLineKernelProjector2D.inl
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/ParallelBeamLinearKernelProjector2D.h b/include/astra/ParallelBeamLinearKernelProjector2D.h
index 254e340..a09dcd1 100644
--- a/include/astra/ParallelBeamLinearKernelProjector2D.h
+++ b/include/astra/ParallelBeamLinearKernelProjector2D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/ParallelBeamLinearKernelProjector2D.inl b/include/astra/ParallelBeamLinearKernelProjector2D.inl
index 66e9ba7..485eef6 100644
--- a/include/astra/ParallelBeamLinearKernelProjector2D.inl
+++ b/include/astra/ParallelBeamLinearKernelProjector2D.inl
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/ParallelBeamStripKernelProjector2D.h b/include/astra/ParallelBeamStripKernelProjector2D.h
index 9c7fd33..153a454 100644
--- a/include/astra/ParallelBeamStripKernelProjector2D.h
+++ b/include/astra/ParallelBeamStripKernelProjector2D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/ParallelBeamStripKernelProjector2D.inl b/include/astra/ParallelBeamStripKernelProjector2D.inl
index 2b5e88d..0d775b3 100644
--- a/include/astra/ParallelBeamStripKernelProjector2D.inl
+++ b/include/astra/ParallelBeamStripKernelProjector2D.inl
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/ParallelProjectionGeometry2D.h b/include/astra/ParallelProjectionGeometry2D.h
index 25e2f67..e45aaae 100644
--- a/include/astra/ParallelProjectionGeometry2D.h
+++ b/include/astra/ParallelProjectionGeometry2D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/ParallelProjectionGeometry3D.h b/include/astra/ParallelProjectionGeometry3D.h
index edbabfb..aaa6038 100644
--- a/include/astra/ParallelProjectionGeometry3D.h
+++ b/include/astra/ParallelProjectionGeometry3D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/ParallelVecProjectionGeometry2D.h b/include/astra/ParallelVecProjectionGeometry2D.h
index 983771f..fae7711 100644
--- a/include/astra/ParallelVecProjectionGeometry2D.h
+++ b/include/astra/ParallelVecProjectionGeometry2D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/ParallelVecProjectionGeometry3D.h b/include/astra/ParallelVecProjectionGeometry3D.h
index f9cbc33..08e7af9 100644
--- a/include/astra/ParallelVecProjectionGeometry3D.h
+++ b/include/astra/ParallelVecProjectionGeometry3D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/PlatformDepSystemCode.h b/include/astra/PlatformDepSystemCode.h
index f6573c5..1fc04c0 100644
--- a/include/astra/PlatformDepSystemCode.h
+++ b/include/astra/PlatformDepSystemCode.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/PluginAlgorithm.h b/include/astra/PluginAlgorithm.h
index 2992a0b..afaaf05 100644
--- a/include/astra/PluginAlgorithm.h
+++ b/include/astra/PluginAlgorithm.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/ProjectionGeometry2D.h b/include/astra/ProjectionGeometry2D.h
index 20f7e2c..65b3006 100644
--- a/include/astra/ProjectionGeometry2D.h
+++ b/include/astra/ProjectionGeometry2D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/ProjectionGeometry3D.h b/include/astra/ProjectionGeometry3D.h
index 8c48843..092402d 100644
--- a/include/astra/ProjectionGeometry3D.h
+++ b/include/astra/ProjectionGeometry3D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/Projector2D.h b/include/astra/Projector2D.h
index 2abcc18..8e0b7a8 100644
--- a/include/astra/Projector2D.h
+++ b/include/astra/Projector2D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/Projector2DImpl.inl b/include/astra/Projector2DImpl.inl
index 47b2635..b7edb1f 100644
--- a/include/astra/Projector2DImpl.inl
+++ b/include/astra/Projector2DImpl.inl
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/Projector3D.h b/include/astra/Projector3D.h
index 23e55c6..e10a42f 100644
--- a/include/astra/Projector3D.h
+++ b/include/astra/Projector3D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/ProjectorTypelist.h b/include/astra/ProjectorTypelist.h
index 7608715..1a65aad 100644
--- a/include/astra/ProjectorTypelist.h
+++ b/include/astra/ProjectorTypelist.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/ReconstructionAlgorithm2D.h b/include/astra/ReconstructionAlgorithm2D.h
index ed3953e..2204550 100644
--- a/include/astra/ReconstructionAlgorithm2D.h
+++ b/include/astra/ReconstructionAlgorithm2D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/ReconstructionAlgorithm3D.h b/include/astra/ReconstructionAlgorithm3D.h
index 9856063..1c63c88 100644
--- a/include/astra/ReconstructionAlgorithm3D.h
+++ b/include/astra/ReconstructionAlgorithm3D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/SartAlgorithm.h b/include/astra/SartAlgorithm.h
index 2a09934..bb50fd8 100644
--- a/include/astra/SartAlgorithm.h
+++ b/include/astra/SartAlgorithm.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/Singleton.h b/include/astra/Singleton.h
index b9ddd6b..eb5594c 100644
--- a/include/astra/Singleton.h
+++ b/include/astra/Singleton.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/SirtAlgorithm.h b/include/astra/SirtAlgorithm.h
index 4d914f5..8d547b3 100644
--- a/include/astra/SirtAlgorithm.h
+++ b/include/astra/SirtAlgorithm.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/SparseMatrix.h b/include/astra/SparseMatrix.h
index 2255db5..a26dc67 100644
--- a/include/astra/SparseMatrix.h
+++ b/include/astra/SparseMatrix.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/SparseMatrixProjectionGeometry2D.h b/include/astra/SparseMatrixProjectionGeometry2D.h
index 0c9668b..be2af22 100644
--- a/include/astra/SparseMatrixProjectionGeometry2D.h
+++ b/include/astra/SparseMatrixProjectionGeometry2D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/SparseMatrixProjector2D.h b/include/astra/SparseMatrixProjector2D.h
index e7319e2..db8c4e2 100644
--- a/include/astra/SparseMatrixProjector2D.h
+++ b/include/astra/SparseMatrixProjector2D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/SparseMatrixProjector2D.inl b/include/astra/SparseMatrixProjector2D.inl
index 30fcb57..e8ae981 100644
--- a/include/astra/SparseMatrixProjector2D.inl
+++ b/include/astra/SparseMatrixProjector2D.inl
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/TypeList.h b/include/astra/TypeList.h
index a18608c..88fae7a 100644
--- a/include/astra/TypeList.h
+++ b/include/astra/TypeList.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/Utilities.h b/include/astra/Utilities.h
index 676ba48..7ed8ecd 100644
--- a/include/astra/Utilities.h
+++ b/include/astra/Utilities.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/Vector3D.h b/include/astra/Vector3D.h
index 5bd49db..3973265 100644
--- a/include/astra/Vector3D.h
+++ b/include/astra/Vector3D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/VolumeGeometry2D.h b/include/astra/VolumeGeometry2D.h
index c17941f..5a35dab 100644
--- a/include/astra/VolumeGeometry2D.h
+++ b/include/astra/VolumeGeometry2D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/VolumeGeometry3D.h b/include/astra/VolumeGeometry3D.h
index 9aa4f2a..098baf4 100644
--- a/include/astra/VolumeGeometry3D.h
+++ b/include/astra/VolumeGeometry3D.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/XMLDocument.h b/include/astra/XMLDocument.h
index f353ddb..ca2c1a9 100644
--- a/include/astra/XMLDocument.h
+++ b/include/astra/XMLDocument.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/include/astra/XMLNode.h b/include/astra/XMLNode.h
index f0ca2bb..00c5c5d 100644
--- a/include/astra/XMLNode.h
+++ b/include/astra/XMLNode.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/matlab/algorithms/DART/DARTalgorithm.m b/matlab/algorithms/DART/DARTalgorithm.m
index 5cc151e..ef5d880 100644
--- a/matlab/algorithms/DART/DARTalgorithm.m
+++ b/matlab/algorithms/DART/DARTalgorithm.m
@@ -1,7 +1,7 @@
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/algorithms/DART/IterativeTomography.m b/matlab/algorithms/DART/IterativeTomography.m
index 79a4e3a..3b93b27 100644
--- a/matlab/algorithms/DART/IterativeTomography.m
+++ b/matlab/algorithms/DART/IterativeTomography.m
@@ -1,7 +1,7 @@
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/algorithms/DART/IterativeTomography3D.m b/matlab/algorithms/DART/IterativeTomography3D.m
index b350e6c..b2bf57d 100644
--- a/matlab/algorithms/DART/IterativeTomography3D.m
+++ b/matlab/algorithms/DART/IterativeTomography3D.m
@@ -1,7 +1,7 @@
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/algorithms/DART/Kernels.m b/matlab/algorithms/DART/Kernels.m
index e839fac..0db08a0 100644
--- a/matlab/algorithms/DART/Kernels.m
+++ b/matlab/algorithms/DART/Kernels.m
@@ -1,7 +1,7 @@
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/algorithms/DART/MaskingDefault.m b/matlab/algorithms/DART/MaskingDefault.m
index 29b7797..73e0f51 100644
--- a/matlab/algorithms/DART/MaskingDefault.m
+++ b/matlab/algorithms/DART/MaskingDefault.m
@@ -1,7 +1,7 @@
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/algorithms/DART/MaskingGPU.m b/matlab/algorithms/DART/MaskingGPU.m
index 8b39d63..b344dfd 100644
--- a/matlab/algorithms/DART/MaskingGPU.m
+++ b/matlab/algorithms/DART/MaskingGPU.m
@@ -1,7 +1,7 @@
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/algorithms/DART/OutputDefault.m b/matlab/algorithms/DART/OutputDefault.m
index 35454e0..2e337f8 100644
--- a/matlab/algorithms/DART/OutputDefault.m
+++ b/matlab/algorithms/DART/OutputDefault.m
@@ -1,7 +1,7 @@
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/algorithms/DART/SegmentationDefault.m b/matlab/algorithms/DART/SegmentationDefault.m
index ceb4ce6..21c2c7b 100644
--- a/matlab/algorithms/DART/SegmentationDefault.m
+++ b/matlab/algorithms/DART/SegmentationDefault.m
@@ -1,7 +1,7 @@
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/algorithms/DART/SmoothingDefault.m b/matlab/algorithms/DART/SmoothingDefault.m
index 97115ca..a66ab51 100644
--- a/matlab/algorithms/DART/SmoothingDefault.m
+++ b/matlab/algorithms/DART/SmoothingDefault.m
@@ -1,7 +1,7 @@
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/algorithms/DART/SmoothingGPU.m b/matlab/algorithms/DART/SmoothingGPU.m
index 4c0e2f2..80df9cc 100644
--- a/matlab/algorithms/DART/SmoothingGPU.m
+++ b/matlab/algorithms/DART/SmoothingGPU.m
@@ -1,7 +1,7 @@
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/algorithms/DART/StatisticsDefault.m b/matlab/algorithms/DART/StatisticsDefault.m
index 9d617c0..3a6a8e7 100644
--- a/matlab/algorithms/DART/StatisticsDefault.m
+++ b/matlab/algorithms/DART/StatisticsDefault.m
@@ -1,7 +1,7 @@
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/algorithms/DART/examples/example1.m b/matlab/algorithms/DART/examples/example1.m
index bb2e724..1b4023e 100644
--- a/matlab/algorithms/DART/examples/example1.m
+++ b/matlab/algorithms/DART/examples/example1.m
@@ -1,7 +1,7 @@
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/algorithms/DART/examples/example2.m b/matlab/algorithms/DART/examples/example2.m
index fe3c0c5..612830b 100644
--- a/matlab/algorithms/DART/examples/example2.m
+++ b/matlab/algorithms/DART/examples/example2.m
@@ -1,7 +1,7 @@
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/algorithms/DART/examples/example3.m b/matlab/algorithms/DART/examples/example3.m
index 1a11cbf..d38ca02 100644
--- a/matlab/algorithms/DART/examples/example3.m
+++ b/matlab/algorithms/DART/examples/example3.m
@@ -1,7 +1,7 @@
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/algorithms/DART/tools/DARToptimizer.m b/matlab/algorithms/DART/tools/DARToptimizer.m
index 48f40d5..7d228a0 100644
--- a/matlab/algorithms/DART/tools/DARToptimizer.m
+++ b/matlab/algorithms/DART/tools/DARToptimizer.m
@@ -1,7 +1,7 @@
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/algorithms/DART/tools/DARToptimizerBoneStudy.m b/matlab/algorithms/DART/tools/DARToptimizerBoneStudy.m
index 7615e25..7b14c9a 100644
--- a/matlab/algorithms/DART/tools/DARToptimizerBoneStudy.m
+++ b/matlab/algorithms/DART/tools/DARToptimizerBoneStudy.m
@@ -1,7 +1,7 @@
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/algorithms/DART/tools/ProjDiffOptimFunc.m b/matlab/algorithms/DART/tools/ProjDiffOptimFunc.m
index 19b056a..a526782 100644
--- a/matlab/algorithms/DART/tools/ProjDiffOptimFunc.m
+++ b/matlab/algorithms/DART/tools/ProjDiffOptimFunc.m
@@ -1,7 +1,7 @@
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/algorithms/DART/tools/dart_create_base_phantom.m b/matlab/algorithms/DART/tools/dart_create_base_phantom.m
index 8859746..26628af 100644
--- a/matlab/algorithms/DART/tools/dart_create_base_phantom.m
+++ b/matlab/algorithms/DART/tools/dart_create_base_phantom.m
@@ -1,7 +1,7 @@
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/algorithms/DART/tools/dart_scheduler.m b/matlab/algorithms/DART/tools/dart_scheduler.m
index 0d4edef..73db405 100644
--- a/matlab/algorithms/DART/tools/dart_scheduler.m
+++ b/matlab/algorithms/DART/tools/dart_scheduler.m
@@ -1,7 +1,7 @@
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/algorithms/DART/tools/rNMPOptimFunc.m b/matlab/algorithms/DART/tools/rNMPOptimFunc.m
index 797648c..6fdbd05 100644
--- a/matlab/algorithms/DART/tools/rNMPOptimFunc.m
+++ b/matlab/algorithms/DART/tools/rNMPOptimFunc.m
@@ -1,7 +1,7 @@
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/mex/astra_mex_algorithm_c.cpp b/matlab/mex/astra_mex_algorithm_c.cpp
index 598dc99..80c0424 100644
--- a/matlab/mex/astra_mex_algorithm_c.cpp
+++ b/matlab/mex/astra_mex_algorithm_c.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/matlab/mex/astra_mex_c.cpp b/matlab/mex/astra_mex_c.cpp
index bfa504e..f57c0cd 100644
--- a/matlab/mex/astra_mex_c.cpp
+++ b/matlab/mex/astra_mex_c.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/matlab/mex/astra_mex_data2d_c.cpp b/matlab/mex/astra_mex_data2d_c.cpp
index 01b3b4f..1a6cff0 100644
--- a/matlab/mex/astra_mex_data2d_c.cpp
+++ b/matlab/mex/astra_mex_data2d_c.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/matlab/mex/astra_mex_data3d_c.cpp b/matlab/mex/astra_mex_data3d_c.cpp
index 39de727..5504955 100644
--- a/matlab/mex/astra_mex_data3d_c.cpp
+++ b/matlab/mex/astra_mex_data3d_c.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/matlab/mex/astra_mex_direct_c.cpp b/matlab/mex/astra_mex_direct_c.cpp
index a4686cf..1a129f4 100644
--- a/matlab/mex/astra_mex_direct_c.cpp
+++ b/matlab/mex/astra_mex_direct_c.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/matlab/mex/astra_mex_log_c.cpp b/matlab/mex/astra_mex_log_c.cpp
index dcbe182..2c0e986 100644
--- a/matlab/mex/astra_mex_log_c.cpp
+++ b/matlab/mex/astra_mex_log_c.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/matlab/mex/astra_mex_matrix_c.cpp b/matlab/mex/astra_mex_matrix_c.cpp
index e30c60a..4a5ec18 100644
--- a/matlab/mex/astra_mex_matrix_c.cpp
+++ b/matlab/mex/astra_mex_matrix_c.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/matlab/mex/astra_mex_plugin_c.cpp b/matlab/mex/astra_mex_plugin_c.cpp
index 722177f..3bc812a 100644
--- a/matlab/mex/astra_mex_plugin_c.cpp
+++ b/matlab/mex/astra_mex_plugin_c.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/matlab/mex/astra_mex_projector3d_c.cpp b/matlab/mex/astra_mex_projector3d_c.cpp
index 1d2294e..5581d6c 100644
--- a/matlab/mex/astra_mex_projector3d_c.cpp
+++ b/matlab/mex/astra_mex_projector3d_c.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/matlab/mex/astra_mex_projector_c.cpp b/matlab/mex/astra_mex_projector_c.cpp
index 6234f7e..27c4b20 100644
--- a/matlab/mex/astra_mex_projector_c.cpp
+++ b/matlab/mex/astra_mex_projector_c.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/matlab/mex/mexCopyDataHelpFunctions.cpp b/matlab/mex/mexCopyDataHelpFunctions.cpp
index b2ff20b..92435a6 100644
--- a/matlab/mex/mexCopyDataHelpFunctions.cpp
+++ b/matlab/mex/mexCopyDataHelpFunctions.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/matlab/mex/mexCopyDataHelpFunctions.h b/matlab/mex/mexCopyDataHelpFunctions.h
index dca0a13..259467a 100644
--- a/matlab/mex/mexCopyDataHelpFunctions.h
+++ b/matlab/mex/mexCopyDataHelpFunctions.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/matlab/mex/mexDataManagerHelpFunctions.cpp b/matlab/mex/mexDataManagerHelpFunctions.cpp
index 50d00f2..a71928b 100644
--- a/matlab/mex/mexDataManagerHelpFunctions.cpp
+++ b/matlab/mex/mexDataManagerHelpFunctions.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/matlab/mex/mexDataManagerHelpFunctions.h b/matlab/mex/mexDataManagerHelpFunctions.h
index 8eba3cf..868f67e 100644
--- a/matlab/mex/mexDataManagerHelpFunctions.h
+++ b/matlab/mex/mexDataManagerHelpFunctions.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/matlab/mex/mexHelpFunctions.cpp b/matlab/mex/mexHelpFunctions.cpp
index 5a84910..319f338 100644
--- a/matlab/mex/mexHelpFunctions.cpp
+++ b/matlab/mex/mexHelpFunctions.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/matlab/mex/mexHelpFunctions.h b/matlab/mex/mexHelpFunctions.h
index e749c68..bf22929 100644
--- a/matlab/mex/mexHelpFunctions.h
+++ b/matlab/mex/mexHelpFunctions.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/matlab/mex/octave_support.cpp b/matlab/mex/octave_support.cpp
index 4ebb22a..8df6d4b 100644
--- a/matlab/mex/octave_support.cpp
+++ b/matlab/mex/octave_support.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_add_noise_to_sino.m b/matlab/tools/astra_add_noise_to_sino.m
index a554a1f..957b5d0 100644
--- a/matlab/tools/astra_add_noise_to_sino.m
+++ b/matlab/tools/astra_add_noise_to_sino.m
@@ -15,7 +15,7 @@ function sinogram_out = astra_add_noise_to_sino(sinogram_in,I0)
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_clear.m b/matlab/tools/astra_clear.m
index 599282e..7c8d1a4 100644
--- a/matlab/tools/astra_clear.m
+++ b/matlab/tools/astra_clear.m
@@ -5,7 +5,7 @@
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_create_backprojection.m b/matlab/tools/astra_create_backprojection.m
index 4aecf9e..eadc37e 100644
--- a/matlab/tools/astra_create_backprojection.m
+++ b/matlab/tools/astra_create_backprojection.m
@@ -13,7 +13,7 @@ function [vol_id, vol] = astra_create_backprojection(data, proj_id)
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_create_backprojection3d_cuda.m b/matlab/tools/astra_create_backprojection3d_cuda.m
index 7dde086..e1c5655 100644
--- a/matlab/tools/astra_create_backprojection3d_cuda.m
+++ b/matlab/tools/astra_create_backprojection3d_cuda.m
@@ -15,7 +15,7 @@ function [vol_id, vol] = astra_create_backprojection3d_cuda(data, proj_geom, vol
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_create_backprojection_cuda.m b/matlab/tools/astra_create_backprojection_cuda.m
index 9190038..f29d87c 100644
--- a/matlab/tools/astra_create_backprojection_cuda.m
+++ b/matlab/tools/astra_create_backprojection_cuda.m
@@ -14,7 +14,7 @@ function backProj = astra_create_backprojection_cuda(sinogramData, proj_geom, vo
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
- % Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+ % Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_create_proj_geom.m b/matlab/tools/astra_create_proj_geom.m
index d4b39f1..861fbe7 100644
--- a/matlab/tools/astra_create_proj_geom.m
+++ b/matlab/tools/astra_create_proj_geom.m
@@ -87,7 +87,7 @@ function proj_geom = astra_create_proj_geom(type, varargin)
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_create_projector.m b/matlab/tools/astra_create_projector.m
index 275a212..1c87cc4 100644
--- a/matlab/tools/astra_create_projector.m
+++ b/matlab/tools/astra_create_projector.m
@@ -15,7 +15,7 @@ function proj_id = astra_create_projector(type, proj_geom, vol_geom, options)
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_create_reconstruction.m b/matlab/tools/astra_create_reconstruction.m
index 7df27b9..ddcf5a2 100644
--- a/matlab/tools/astra_create_reconstruction.m
+++ b/matlab/tools/astra_create_reconstruction.m
@@ -21,7 +21,7 @@ function [recon_id, recon] = astra_create_reconstruction(rec_type, proj_id, sino
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_create_reconstruction_cuda.m b/matlab/tools/astra_create_reconstruction_cuda.m
index 4720b3f..71c0938 100644
--- a/matlab/tools/astra_create_reconstruction_cuda.m
+++ b/matlab/tools/astra_create_reconstruction_cuda.m
@@ -22,7 +22,7 @@ function [recon_id, recon] = astra_create_reconstruction_cuda(rec_type, proj_geo
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_create_sino.m b/matlab/tools/astra_create_sino.m
index afae979..06e91d2 100644
--- a/matlab/tools/astra_create_sino.m
+++ b/matlab/tools/astra_create_sino.m
@@ -13,7 +13,7 @@ function [sino_id, sino] = astra_create_sino(data, proj_id)
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_create_sino3d_cuda.m b/matlab/tools/astra_create_sino3d_cuda.m
index cf3fd00..3b67ae1 100644
--- a/matlab/tools/astra_create_sino3d_cuda.m
+++ b/matlab/tools/astra_create_sino3d_cuda.m
@@ -15,7 +15,7 @@ function [sino_id, sino] = astra_create_sino3d_cuda(data, proj_geom, vol_geom)
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_create_sino_cuda.m b/matlab/tools/astra_create_sino_cuda.m
index aa8162f..0ea3120 100644
--- a/matlab/tools/astra_create_sino_cuda.m
+++ b/matlab/tools/astra_create_sino_cuda.m
@@ -16,7 +16,7 @@ function [sino_id, sino] = astra_create_sino_cuda(data, proj_geom, vol_geom, gpu
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_create_sino_gpu.m b/matlab/tools/astra_create_sino_gpu.m
index 23299d1..9bfd9b8 100644
--- a/matlab/tools/astra_create_sino_gpu.m
+++ b/matlab/tools/astra_create_sino_gpu.m
@@ -16,7 +16,7 @@ function [sino_id, sino] = astra_create_sino_gpu(data, proj_geom, vol_geom, gpu_
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_create_sino_sampling.m b/matlab/tools/astra_create_sino_sampling.m
index 02888c2..f1b8ccd 100644
--- a/matlab/tools/astra_create_sino_sampling.m
+++ b/matlab/tools/astra_create_sino_sampling.m
@@ -16,7 +16,7 @@ function [sino_id, sino] = astra_create_sino_sampling(data, proj_geom, vol_geom,
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_create_vol_geom.m b/matlab/tools/astra_create_vol_geom.m
index 5aea90d..4273dc4 100644
--- a/matlab/tools/astra_create_vol_geom.m
+++ b/matlab/tools/astra_create_vol_geom.m
@@ -26,7 +26,7 @@ function vol_geom = astra_create_vol_geom(varargin)
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_downsample_sinogram.m b/matlab/tools/astra_downsample_sinogram.m
index 110b3e8..34f320e 100644
--- a/matlab/tools/astra_downsample_sinogram.m
+++ b/matlab/tools/astra_downsample_sinogram.m
@@ -15,7 +15,7 @@ function [sinogram_new, proj_geom_new] = astra_downsample_sinogram(sinogram, pro
%------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_geom_2vec.m b/matlab/tools/astra_geom_2vec.m
index f5816ea..2724ded 100644
--- a/matlab/tools/astra_geom_2vec.m
+++ b/matlab/tools/astra_geom_2vec.m
@@ -10,7 +10,7 @@ function proj_geom_vec = astra_geom_2vec(proj_geom)
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_geom_postalignment.m b/matlab/tools/astra_geom_postalignment.m
index 910c9ab..246b91f 100644
--- a/matlab/tools/astra_geom_postalignment.m
+++ b/matlab/tools/astra_geom_postalignment.m
@@ -18,7 +18,7 @@ function proj_geom = astra_geom_postalignment(proj_geom, factor)
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_geom_size.m b/matlab/tools/astra_geom_size.m
index fefaf8c..81e2b4a 100644
--- a/matlab/tools/astra_geom_size.m
+++ b/matlab/tools/astra_geom_size.m
@@ -10,7 +10,7 @@ function s = astra_geom_size(geom, dim)
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_get_gpu_info.m b/matlab/tools/astra_get_gpu_info.m
index 1ac74f8..1bc2b7b 100644
--- a/matlab/tools/astra_get_gpu_info.m
+++ b/matlab/tools/astra_get_gpu_info.m
@@ -6,7 +6,7 @@ function astra_set_gpu_index(index)
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_mex.m b/matlab/tools/astra_mex.m
index f52a25d..5210f38 100644
--- a/matlab/tools/astra_mex.m
+++ b/matlab/tools/astra_mex.m
@@ -6,7 +6,7 @@ function [varargout] = astra_mex(varargin)
%------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_mex_algorithm.m b/matlab/tools/astra_mex_algorithm.m
index f440809..abb99e7 100644
--- a/matlab/tools/astra_mex_algorithm.m
+++ b/matlab/tools/astra_mex_algorithm.m
@@ -6,7 +6,7 @@ function [varargout] = astra_mex_algorithm(varargin)
%------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_mex_data2d.m b/matlab/tools/astra_mex_data2d.m
index f178a81..49f0e10 100644
--- a/matlab/tools/astra_mex_data2d.m
+++ b/matlab/tools/astra_mex_data2d.m
@@ -6,7 +6,7 @@ function [varargout] = astra_mex_data2d(varargin)
%------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_mex_data3d.m b/matlab/tools/astra_mex_data3d.m
index 9dc86b2..ba965a0 100644
--- a/matlab/tools/astra_mex_data3d.m
+++ b/matlab/tools/astra_mex_data3d.m
@@ -6,7 +6,7 @@ function [varargout] = astra_mex_data3d(varargin)
%------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_mex_direct.m b/matlab/tools/astra_mex_direct.m
index bf0ef53..5fe03be 100644
--- a/matlab/tools/astra_mex_direct.m
+++ b/matlab/tools/astra_mex_direct.m
@@ -6,7 +6,7 @@ function [varargout] = astra_mex_direct(varargin)
%------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_mex_log.m b/matlab/tools/astra_mex_log.m
index bbe4b10..d795d24 100644
--- a/matlab/tools/astra_mex_log.m
+++ b/matlab/tools/astra_mex_log.m
@@ -6,7 +6,7 @@ function [varargout] = astra_mex_log(varargin)
%------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_mex_matrix.m b/matlab/tools/astra_mex_matrix.m
index 988e5b1..5750487 100644
--- a/matlab/tools/astra_mex_matrix.m
+++ b/matlab/tools/astra_mex_matrix.m
@@ -6,7 +6,7 @@ function [varargout] = astra_mex_matrix(varargin)
%------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_mex_plugin.m b/matlab/tools/astra_mex_plugin.m
index b0e6535..b6f8c33 100644
--- a/matlab/tools/astra_mex_plugin.m
+++ b/matlab/tools/astra_mex_plugin.m
@@ -6,7 +6,7 @@ function [varargout] = astra_mex_plugin(varargin)
%------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_mex_projector.m b/matlab/tools/astra_mex_projector.m
index ce8775b..6b77508 100644
--- a/matlab/tools/astra_mex_projector.m
+++ b/matlab/tools/astra_mex_projector.m
@@ -6,7 +6,7 @@ function [varargout] = astra_mex_projector(varargin)
%------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_mex_projector3d.m b/matlab/tools/astra_mex_projector3d.m
index c7b1b55..3d75158 100644
--- a/matlab/tools/astra_mex_projector3d.m
+++ b/matlab/tools/astra_mex_projector3d.m
@@ -6,7 +6,7 @@ function [varargout] = astra_mex_projector3d(varargin)
%------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_projector_handle.m b/matlab/tools/astra_projector_handle.m
index a004655..874e449 100644
--- a/matlab/tools/astra_projector_handle.m
+++ b/matlab/tools/astra_projector_handle.m
@@ -5,7 +5,7 @@ classdef astra_projector_handle < handle
%------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
- % Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+ % Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_set_directory.m b/matlab/tools/astra_set_directory.m
index bb1b630..00e765e 100644
--- a/matlab/tools/astra_set_directory.m
+++ b/matlab/tools/astra_set_directory.m
@@ -11,7 +11,7 @@ function in = astra_set_directory(in)
%------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_set_gpu_index.m b/matlab/tools/astra_set_gpu_index.m
index c93698f..b90d2b8 100644
--- a/matlab/tools/astra_set_gpu_index.m
+++ b/matlab/tools/astra_set_gpu_index.m
@@ -6,7 +6,7 @@ function astra_set_gpu_index(index)
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_struct.m b/matlab/tools/astra_struct.m
index c40e76c..0241028 100644
--- a/matlab/tools/astra_struct.m
+++ b/matlab/tools/astra_struct.m
@@ -11,7 +11,7 @@ function res = astra_struct(type)
%------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_test.m b/matlab/tools/astra_test.m
index a580d9a..3ea154e 100644
--- a/matlab/tools/astra_test.m
+++ b/matlab/tools/astra_test.m
@@ -4,7 +4,7 @@
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_test_CUDA.m b/matlab/tools/astra_test_CUDA.m
index 31de3c0..c034a08 100644
--- a/matlab/tools/astra_test_CUDA.m
+++ b/matlab/tools/astra_test_CUDA.m
@@ -4,7 +4,7 @@
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/astra_test_noCUDA.m b/matlab/tools/astra_test_noCUDA.m
index 6b9500b..733db3c 100644
--- a/matlab/tools/astra_test_noCUDA.m
+++ b/matlab/tools/astra_test_noCUDA.m
@@ -4,7 +4,7 @@
%--------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/createOrderART.m b/matlab/tools/createOrderART.m
index 0a0cbf2..cd49651 100644
--- a/matlab/tools/createOrderART.m
+++ b/matlab/tools/createOrderART.m
@@ -16,7 +16,7 @@ function rayOrder = createOrderART(proj_geom, mode)
%------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/imreadgs.m b/matlab/tools/imreadgs.m
index 440287c..a820734 100644
--- a/matlab/tools/imreadgs.m
+++ b/matlab/tools/imreadgs.m
@@ -12,7 +12,7 @@ function Im = imreadgs(filename)
%------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/imresize3D.m b/matlab/tools/imresize3D.m
index 0428b82..84e2020 100644
--- a/matlab/tools/imresize3D.m
+++ b/matlab/tools/imresize3D.m
@@ -12,7 +12,7 @@ function out = imresize3D(in, s_out, method)
%------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/imscale.m b/matlab/tools/imscale.m
index 1c21b05..363392b 100644
--- a/matlab/tools/imscale.m
+++ b/matlab/tools/imscale.m
@@ -11,7 +11,7 @@ function out = imscale(in)
%------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/imwritesc.m b/matlab/tools/imwritesc.m
index 8d56a4a..0ef2b37 100644
--- a/matlab/tools/imwritesc.m
+++ b/matlab/tools/imwritesc.m
@@ -11,7 +11,7 @@ function imwritesc(in, filename)
%------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/kaiserBessel.m b/matlab/tools/kaiserBessel.m
index 0ba7fce..d0a650d 100644
--- a/matlab/tools/kaiserBessel.m
+++ b/matlab/tools/kaiserBessel.m
@@ -14,7 +14,7 @@ function res = kaiserBessel(m,alpha,a,r)
%------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/linspace2.m b/matlab/tools/linspace2.m
index 2d10565..12bc6ca 100644
--- a/matlab/tools/linspace2.m
+++ b/matlab/tools/linspace2.m
@@ -13,7 +13,7 @@ function out = linspace2(a,b,c)
%------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/overlayImage.m b/matlab/tools/overlayImage.m
index 5886fe2..568ed22 100644
--- a/matlab/tools/overlayImage.m
+++ b/matlab/tools/overlayImage.m
@@ -11,7 +11,7 @@ function im = overlayImage(reconstruction, ground_truth)
%------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/rebin_fan2par.m b/matlab/tools/rebin_fan2par.m
index 7404968..44e5e07 100644
--- a/matlab/tools/rebin_fan2par.m
+++ b/matlab/tools/rebin_fan2par.m
@@ -19,7 +19,7 @@ function F = rebin_fan2par(RadonData, BetaDeg, D, thetaDeg)
%------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/matlab/tools/sliceExtractor.m b/matlab/tools/sliceExtractor.m
index 2212160..e428450 100644
--- a/matlab/tools/sliceExtractor.m
+++ b/matlab/tools/sliceExtractor.m
@@ -13,7 +13,7 @@ function slice = sliceExtractor(data, dir, slicenr)
%------------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/python/astra/PyAlgorithmFactory.pxd b/python/astra/PyAlgorithmFactory.pxd
index fb84c67..5913697 100644
--- a/python/astra/PyAlgorithmFactory.pxd
+++ b/python/astra/PyAlgorithmFactory.pxd
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/PyAlgorithmManager.pxd b/python/astra/PyAlgorithmManager.pxd
index bf0a6e7..7f2cbb8 100644
--- a/python/astra/PyAlgorithmManager.pxd
+++ b/python/astra/PyAlgorithmManager.pxd
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/PyData2DManager.pxd b/python/astra/PyData2DManager.pxd
index b925ff6..167f840 100644
--- a/python/astra/PyData2DManager.pxd
+++ b/python/astra/PyData2DManager.pxd
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/PyData3DManager.pxd b/python/astra/PyData3DManager.pxd
index d2388f0..cc9afad 100644
--- a/python/astra/PyData3DManager.pxd
+++ b/python/astra/PyData3DManager.pxd
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/PyIncludes.pxd b/python/astra/PyIncludes.pxd
index 26287c7..b9a61a9 100644
--- a/python/astra/PyIncludes.pxd
+++ b/python/astra/PyIncludes.pxd
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/PyIndexManager.pxd b/python/astra/PyIndexManager.pxd
index a4d08ea..9d4dff7 100644
--- a/python/astra/PyIndexManager.pxd
+++ b/python/astra/PyIndexManager.pxd
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/PyMatrixManager.pxd b/python/astra/PyMatrixManager.pxd
index d290091..5f6fb58 100644
--- a/python/astra/PyMatrixManager.pxd
+++ b/python/astra/PyMatrixManager.pxd
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/PyProjector2DFactory.pxd b/python/astra/PyProjector2DFactory.pxd
index 9db28e0..e21c73d 100644
--- a/python/astra/PyProjector2DFactory.pxd
+++ b/python/astra/PyProjector2DFactory.pxd
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/PyProjector2DManager.pxd b/python/astra/PyProjector2DManager.pxd
index 8a58740..cfadb2d 100644
--- a/python/astra/PyProjector2DManager.pxd
+++ b/python/astra/PyProjector2DManager.pxd
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/PyProjector3DFactory.pxd b/python/astra/PyProjector3DFactory.pxd
index 487ff79..191c965 100644
--- a/python/astra/PyProjector3DFactory.pxd
+++ b/python/astra/PyProjector3DFactory.pxd
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/PyProjector3DManager.pxd b/python/astra/PyProjector3DManager.pxd
index 6e4be37..56b714c 100644
--- a/python/astra/PyProjector3DManager.pxd
+++ b/python/astra/PyProjector3DManager.pxd
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/PyXMLDocument.pxd b/python/astra/PyXMLDocument.pxd
index 99fb05c..e1d606b 100644
--- a/python/astra/PyXMLDocument.pxd
+++ b/python/astra/PyXMLDocument.pxd
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/__init__.py b/python/astra/__init__.py
index ccbff3d..1a7f444 100644
--- a/python/astra/__init__.py
+++ b/python/astra/__init__.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/algorithm.py b/python/astra/algorithm.py
index e2a5150..33cca85 100644
--- a/python/astra/algorithm.py
+++ b/python/astra/algorithm.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/algorithm_c.pyx b/python/astra/algorithm_c.pyx
index 1eede78..a190ee1 100644
--- a/python/astra/algorithm_c.pyx
+++ b/python/astra/algorithm_c.pyx
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/astra.py b/python/astra/astra.py
index 249dabc..ef46db1 100644
--- a/python/astra/astra.py
+++ b/python/astra/astra.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/astra_c.pyx b/python/astra/astra_c.pyx
index f2b74b3..e7c5a6d 100644
--- a/python/astra/astra_c.pyx
+++ b/python/astra/astra_c.pyx
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/creators.py b/python/astra/creators.py
index 712818c..ca4916d 100644
--- a/python/astra/creators.py
+++ b/python/astra/creators.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/data2d.py b/python/astra/data2d.py
index e1df3a4..188ff69 100644
--- a/python/astra/data2d.py
+++ b/python/astra/data2d.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/data2d_c.pyx b/python/astra/data2d_c.pyx
index b3d8a43..d33581a 100644
--- a/python/astra/data2d_c.pyx
+++ b/python/astra/data2d_c.pyx
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/data3d.py b/python/astra/data3d.py
index bd158af..b0d54b2 100644
--- a/python/astra/data3d.py
+++ b/python/astra/data3d.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/data3d_c.pyx b/python/astra/data3d_c.pyx
index 033195c..d4073ea 100644
--- a/python/astra/data3d_c.pyx
+++ b/python/astra/data3d_c.pyx
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/experimental.pyx b/python/astra/experimental.pyx
index 5cc89a2..b1e3567 100644
--- a/python/astra/experimental.pyx
+++ b/python/astra/experimental.pyx
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/extrautils.pyx b/python/astra/extrautils.pyx
index a9d045c..2508865 100644
--- a/python/astra/extrautils.pyx
+++ b/python/astra/extrautils.pyx
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/functions.py b/python/astra/functions.py
index cf3b772..853c0b9 100644
--- a/python/astra/functions.py
+++ b/python/astra/functions.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/log.py b/python/astra/log.py
index 8c2c77a..28e9bad 100644
--- a/python/astra/log.py
+++ b/python/astra/log.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/log_c.pyx b/python/astra/log_c.pyx
index f287047..7701667 100644
--- a/python/astra/log_c.pyx
+++ b/python/astra/log_c.pyx
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/matlab.py b/python/astra/matlab.py
index efdab8a..df1135c 100644
--- a/python/astra/matlab.py
+++ b/python/astra/matlab.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/matrix.py b/python/astra/matrix.py
index 6d9102b..a097142 100644
--- a/python/astra/matrix.py
+++ b/python/astra/matrix.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/matrix_c.pyx b/python/astra/matrix_c.pyx
index aab8767..5c56233 100644
--- a/python/astra/matrix_c.pyx
+++ b/python/astra/matrix_c.pyx
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/optomo.py b/python/astra/optomo.py
index 6fc8c43..ff67791 100644
--- a/python/astra/optomo.py
+++ b/python/astra/optomo.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/plugin.py b/python/astra/plugin.py
index 50bce4c..0ef701e 100644
--- a/python/astra/plugin.py
+++ b/python/astra/plugin.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/plugin_c.pyx b/python/astra/plugin_c.pyx
index 01d2494..dcc22e9 100644
--- a/python/astra/plugin_c.pyx
+++ b/python/astra/plugin_c.pyx
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/plugins/__init__.py b/python/astra/plugins/__init__.py
index d4f6ee0..0f66907 100644
--- a/python/astra/plugins/__init__.py
+++ b/python/astra/plugins/__init__.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/plugins/cgls.py b/python/astra/plugins/cgls.py
index a5596d9..30fe8e6 100644
--- a/python/astra/plugins/cgls.py
+++ b/python/astra/plugins/cgls.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/plugins/sirt.py b/python/astra/plugins/sirt.py
index ce485c5..c5a8d90 100644
--- a/python/astra/plugins/sirt.py
+++ b/python/astra/plugins/sirt.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/projector.py b/python/astra/projector.py
index 6c671e7..2fcb889 100644
--- a/python/astra/projector.py
+++ b/python/astra/projector.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/projector3d.py b/python/astra/projector3d.py
index 052c3f4..4d474c3 100644
--- a/python/astra/projector3d.py
+++ b/python/astra/projector3d.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/projector3d_c.pyx b/python/astra/projector3d_c.pyx
index 1607a22..53d7113 100644
--- a/python/astra/projector3d_c.pyx
+++ b/python/astra/projector3d_c.pyx
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/projector_c.pyx b/python/astra/projector_c.pyx
index dd1cf2d..62225dc 100644
--- a/python/astra/projector_c.pyx
+++ b/python/astra/projector_c.pyx
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/pythonutils.py b/python/astra/pythonutils.py
index 994dd8e..715df30 100644
--- a/python/astra/pythonutils.py
+++ b/python/astra/pythonutils.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/src/PythonPluginAlgorithm.cpp b/python/astra/src/PythonPluginAlgorithm.cpp
index 4496c0e..d461f06 100644
--- a/python/astra/src/PythonPluginAlgorithm.cpp
+++ b/python/astra/src/PythonPluginAlgorithm.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2016, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/python/astra/src/PythonPluginAlgorithm.h b/python/astra/src/PythonPluginAlgorithm.h
index 9fc294a..947e30d 100644
--- a/python/astra/src/PythonPluginAlgorithm.h
+++ b/python/astra/src/PythonPluginAlgorithm.h
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/python/astra/tests.py b/python/astra/tests.py
index e772193..0d67521 100644
--- a/python/astra/tests.py
+++ b/python/astra/tests.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/utils.pxd b/python/astra/utils.pxd
index 500f548..e91ed98 100644
--- a/python/astra/utils.pxd
+++ b/python/astra/utils.pxd
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/astra/utils.pyx b/python/astra/utils.pyx
index 242d6a2..46be462 100644
--- a/python/astra/utils.pyx
+++ b/python/astra/utils.pyx
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/python/builder.py b/python/builder.py
index 05b357d..dd99633 100644
--- a/python/builder.py
+++ b/python/builder.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/samples/matlab/s001_sinogram_par2d.m b/samples/matlab/s001_sinogram_par2d.m
index 5d9ff30..5c49758 100644
--- a/samples/matlab/s001_sinogram_par2d.m
+++ b/samples/matlab/s001_sinogram_par2d.m
@@ -1,7 +1,7 @@
% -----------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/samples/matlab/s002_data2d.m b/samples/matlab/s002_data2d.m
index 5ca127c..f075291 100644
--- a/samples/matlab/s002_data2d.m
+++ b/samples/matlab/s002_data2d.m
@@ -1,7 +1,7 @@
% -----------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/samples/matlab/s003_gpu_reconstruction.m b/samples/matlab/s003_gpu_reconstruction.m
index d79fc4d..4a2cec7 100644
--- a/samples/matlab/s003_gpu_reconstruction.m
+++ b/samples/matlab/s003_gpu_reconstruction.m
@@ -1,7 +1,7 @@
% -----------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/samples/matlab/s004_cpu_reconstruction.m b/samples/matlab/s004_cpu_reconstruction.m
index 9a50188..c3b7a95 100644
--- a/samples/matlab/s004_cpu_reconstruction.m
+++ b/samples/matlab/s004_cpu_reconstruction.m
@@ -1,7 +1,7 @@
% -----------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/samples/matlab/s005_3d_geometry.m b/samples/matlab/s005_3d_geometry.m
index c1586e6..df3ffad 100644
--- a/samples/matlab/s005_3d_geometry.m
+++ b/samples/matlab/s005_3d_geometry.m
@@ -1,7 +1,7 @@
% -----------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/samples/matlab/s006_3d_data.m b/samples/matlab/s006_3d_data.m
index d5b5784..9fac2f8 100644
--- a/samples/matlab/s006_3d_data.m
+++ b/samples/matlab/s006_3d_data.m
@@ -1,7 +1,7 @@
% -----------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/samples/matlab/s007_3d_reconstruction.m b/samples/matlab/s007_3d_reconstruction.m
index f44f682..6e47490 100644
--- a/samples/matlab/s007_3d_reconstruction.m
+++ b/samples/matlab/s007_3d_reconstruction.m
@@ -1,7 +1,7 @@
% -----------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/samples/matlab/s008_gpu_selection.m b/samples/matlab/s008_gpu_selection.m
index 130c1a8..4cf7392 100644
--- a/samples/matlab/s008_gpu_selection.m
+++ b/samples/matlab/s008_gpu_selection.m
@@ -1,7 +1,7 @@
% -----------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/samples/matlab/s009_projection_matrix.m b/samples/matlab/s009_projection_matrix.m
index b2da89d..b272be9 100644
--- a/samples/matlab/s009_projection_matrix.m
+++ b/samples/matlab/s009_projection_matrix.m
@@ -1,7 +1,7 @@
% -----------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/samples/matlab/s010_supersampling.m b/samples/matlab/s010_supersampling.m
index 3144d47..7e52bc9 100644
--- a/samples/matlab/s010_supersampling.m
+++ b/samples/matlab/s010_supersampling.m
@@ -1,7 +1,7 @@
% -----------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/samples/matlab/s011_object_info.m b/samples/matlab/s011_object_info.m
index e0ff1f5..96aff2a 100644
--- a/samples/matlab/s011_object_info.m
+++ b/samples/matlab/s011_object_info.m
@@ -1,7 +1,7 @@
% -----------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/samples/matlab/s012_masks.m b/samples/matlab/s012_masks.m
index aec05ab..9914f4b 100644
--- a/samples/matlab/s012_masks.m
+++ b/samples/matlab/s012_masks.m
@@ -1,7 +1,7 @@
% -----------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/samples/matlab/s013_constraints.m b/samples/matlab/s013_constraints.m
index 7666857..aaaf4d1 100644
--- a/samples/matlab/s013_constraints.m
+++ b/samples/matlab/s013_constraints.m
@@ -1,7 +1,7 @@
% -----------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/samples/matlab/s014_FBP.m b/samples/matlab/s014_FBP.m
index f986327..1fc6f90 100644
--- a/samples/matlab/s014_FBP.m
+++ b/samples/matlab/s014_FBP.m
@@ -1,7 +1,7 @@
% -----------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/samples/matlab/s015_fp_bp.m b/samples/matlab/s015_fp_bp.m
index 0a96427..34235d4 100644
--- a/samples/matlab/s015_fp_bp.m
+++ b/samples/matlab/s015_fp_bp.m
@@ -1,7 +1,7 @@
% -----------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/samples/matlab/s016_plots.m b/samples/matlab/s016_plots.m
index 5a58094..ac7c169 100644
--- a/samples/matlab/s016_plots.m
+++ b/samples/matlab/s016_plots.m
@@ -1,7 +1,7 @@
% -----------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/samples/matlab/s017_opTomo.m b/samples/matlab/s017_opTomo.m
index e753607..175287a 100644
--- a/samples/matlab/s017_opTomo.m
+++ b/samples/matlab/s017_opTomo.m
@@ -1,7 +1,7 @@
% -----------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/samples/matlab/s020_3d_multiGPU.m b/samples/matlab/s020_3d_multiGPU.m
index 6551d25..e793848 100644
--- a/samples/matlab/s020_3d_multiGPU.m
+++ b/samples/matlab/s020_3d_multiGPU.m
@@ -1,7 +1,7 @@
% -----------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/samples/matlab/s022_fbp_cor.m b/samples/matlab/s022_fbp_cor.m
index 86798b9..2820541 100644
--- a/samples/matlab/s022_fbp_cor.m
+++ b/samples/matlab/s022_fbp_cor.m
@@ -1,7 +1,7 @@
% -----------------------------------------------------------------------
% This file is part of the ASTRA Toolbox
%
-% Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+% Copyright: 2010-2018, imec Vision Lab, University of Antwerp
% 2014-2018, CWI, Amsterdam
% License: Open Source under GPLv3
% Contact: astra@astra-toolbox.com
diff --git a/samples/python/s001_sinogram_par2d.py b/samples/python/s001_sinogram_par2d.py
index 265cf7c..cad3312 100644
--- a/samples/python/s001_sinogram_par2d.py
+++ b/samples/python/s001_sinogram_par2d.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/samples/python/s002_data2d.py b/samples/python/s002_data2d.py
index 10da662..764d328 100644
--- a/samples/python/s002_data2d.py
+++ b/samples/python/s002_data2d.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/samples/python/s003_gpu_reconstruction.py b/samples/python/s003_gpu_reconstruction.py
index e8527db..598d965 100644
--- a/samples/python/s003_gpu_reconstruction.py
+++ b/samples/python/s003_gpu_reconstruction.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/samples/python/s004_cpu_reconstruction.py b/samples/python/s004_cpu_reconstruction.py
index 395e8d1..8b632fc 100644
--- a/samples/python/s004_cpu_reconstruction.py
+++ b/samples/python/s004_cpu_reconstruction.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/samples/python/s005_3d_geometry.py b/samples/python/s005_3d_geometry.py
index dac6e5b..24f1a3e 100644
--- a/samples/python/s005_3d_geometry.py
+++ b/samples/python/s005_3d_geometry.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/samples/python/s006_3d_data.py b/samples/python/s006_3d_data.py
index 23928d9..7f2f955 100644
--- a/samples/python/s006_3d_data.py
+++ b/samples/python/s006_3d_data.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/samples/python/s007_3d_reconstruction.py b/samples/python/s007_3d_reconstruction.py
index cae0b08..c7283a1 100644
--- a/samples/python/s007_3d_reconstruction.py
+++ b/samples/python/s007_3d_reconstruction.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/samples/python/s008_gpu_selection.py b/samples/python/s008_gpu_selection.py
index 1ae60f9..21ce762 100644
--- a/samples/python/s008_gpu_selection.py
+++ b/samples/python/s008_gpu_selection.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/samples/python/s009_projection_matrix.py b/samples/python/s009_projection_matrix.py
index 26ac485..cd4cf63 100644
--- a/samples/python/s009_projection_matrix.py
+++ b/samples/python/s009_projection_matrix.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/samples/python/s010_supersampling.py b/samples/python/s010_supersampling.py
index aeca6c1..fb6cf59 100644
--- a/samples/python/s010_supersampling.py
+++ b/samples/python/s010_supersampling.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/samples/python/s011_object_info.py b/samples/python/s011_object_info.py
index 08c69a0..84da6f8 100644
--- a/samples/python/s011_object_info.py
+++ b/samples/python/s011_object_info.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/samples/python/s012_masks.py b/samples/python/s012_masks.py
index ab83af4..d7f5352 100644
--- a/samples/python/s012_masks.py
+++ b/samples/python/s012_masks.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/samples/python/s013_constraints.py b/samples/python/s013_constraints.py
index 1019bd9..b9bf6e4 100644
--- a/samples/python/s013_constraints.py
+++ b/samples/python/s013_constraints.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/samples/python/s014_FBP.py b/samples/python/s014_FBP.py
index ec46001..f7cefd4 100644
--- a/samples/python/s014_FBP.py
+++ b/samples/python/s014_FBP.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/samples/python/s015_fp_bp.py b/samples/python/s015_fp_bp.py
index 90e1306..10a4585 100644
--- a/samples/python/s015_fp_bp.py
+++ b/samples/python/s015_fp_bp.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/samples/python/s016_plots.py b/samples/python/s016_plots.py
index aaaeb40..0cacc94 100644
--- a/samples/python/s016_plots.py
+++ b/samples/python/s016_plots.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/samples/python/s017_OpTomo.py b/samples/python/s017_OpTomo.py
index 01189ef..f26d91d 100644
--- a/samples/python/s017_OpTomo.py
+++ b/samples/python/s017_OpTomo.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/samples/python/s018_plugin.py b/samples/python/s018_plugin.py
index 8fbac99..e2ff6f5 100644
--- a/samples/python/s018_plugin.py
+++ b/samples/python/s018_plugin.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/samples/python/s019_experimental_multires.py b/samples/python/s019_experimental_multires.py
index e07ba3d..9b26eca 100644
--- a/samples/python/s019_experimental_multires.py
+++ b/samples/python/s019_experimental_multires.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/samples/python/s020_3d_multiGPU.py b/samples/python/s020_3d_multiGPU.py
index d163950..5e65d87 100644
--- a/samples/python/s020_3d_multiGPU.py
+++ b/samples/python/s020_3d_multiGPU.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/samples/python/s021_pygpu.py b/samples/python/s021_pygpu.py
index fde90da..d89771c 100644
--- a/samples/python/s021_pygpu.py
+++ b/samples/python/s021_pygpu.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/samples/python/s022_fbp_cor.py b/samples/python/s022_fbp_cor.py
index fab9d82..a3b0542 100644
--- a/samples/python/s022_fbp_cor.py
+++ b/samples/python/s022_fbp_cor.py
@@ -1,5 +1,5 @@
# -----------------------------------------------------------------------
-# Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+# Copyright: 2010-2018, imec Vision Lab, University of Antwerp
# 2013-2018, CWI, Amsterdam
#
# Contact: astra@astra-toolbox.com
diff --git a/src/Algorithm.cpp b/src/Algorithm.cpp
index 0d21828..f6514fc 100644
--- a/src/Algorithm.cpp
+++ b/src/Algorithm.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/ArtAlgorithm.cpp b/src/ArtAlgorithm.cpp
index 160d99a..570897f 100644
--- a/src/ArtAlgorithm.cpp
+++ b/src/ArtAlgorithm.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/AstraObjectFactory.cpp b/src/AstraObjectFactory.cpp
index c84ac1e..2ce7474 100644
--- a/src/AstraObjectFactory.cpp
+++ b/src/AstraObjectFactory.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/AstraObjectManager.cpp b/src/AstraObjectManager.cpp
index f606e4d..92d2da4 100644
--- a/src/AstraObjectManager.cpp
+++ b/src/AstraObjectManager.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/AsyncAlgorithm.cpp b/src/AsyncAlgorithm.cpp
index 763529c..82f23ec 100644
--- a/src/AsyncAlgorithm.cpp
+++ b/src/AsyncAlgorithm.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/BackProjectionAlgorithm.cpp b/src/BackProjectionAlgorithm.cpp
index 057ac9c..2e35bdd 100644
--- a/src/BackProjectionAlgorithm.cpp
+++ b/src/BackProjectionAlgorithm.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/CglsAlgorithm.cpp b/src/CglsAlgorithm.cpp
index 1c77c37..7658182 100644
--- a/src/CglsAlgorithm.cpp
+++ b/src/CglsAlgorithm.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/CompositeGeometryManager.cpp b/src/CompositeGeometryManager.cpp
index 7316bb5..0d536e6 100644
--- a/src/CompositeGeometryManager.cpp
+++ b/src/CompositeGeometryManager.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/ConeProjectionGeometry3D.cpp b/src/ConeProjectionGeometry3D.cpp
index 1f52632..90adfa8 100644
--- a/src/ConeProjectionGeometry3D.cpp
+++ b/src/ConeProjectionGeometry3D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/ConeVecProjectionGeometry3D.cpp b/src/ConeVecProjectionGeometry3D.cpp
index cd82d71..0e0f70b 100644
--- a/src/ConeVecProjectionGeometry3D.cpp
+++ b/src/ConeVecProjectionGeometry3D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/Config.cpp b/src/Config.cpp
index 8aad522..de5b42e 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/CudaBackProjectionAlgorithm.cpp b/src/CudaBackProjectionAlgorithm.cpp
index 57c5b1e..09a356a 100644
--- a/src/CudaBackProjectionAlgorithm.cpp
+++ b/src/CudaBackProjectionAlgorithm.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/CudaBackProjectionAlgorithm3D.cpp b/src/CudaBackProjectionAlgorithm3D.cpp
index 218bc5e..bfe0bcd 100644
--- a/src/CudaBackProjectionAlgorithm3D.cpp
+++ b/src/CudaBackProjectionAlgorithm3D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/CudaCglsAlgorithm.cpp b/src/CudaCglsAlgorithm.cpp
index 85169b9..ec96991 100644
--- a/src/CudaCglsAlgorithm.cpp
+++ b/src/CudaCglsAlgorithm.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/CudaCglsAlgorithm3D.cpp b/src/CudaCglsAlgorithm3D.cpp
index c563e52..2ebc8a3 100644
--- a/src/CudaCglsAlgorithm3D.cpp
+++ b/src/CudaCglsAlgorithm3D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/CudaDartMaskAlgorithm.cpp b/src/CudaDartMaskAlgorithm.cpp
index c504644..5f9f67d 100644
--- a/src/CudaDartMaskAlgorithm.cpp
+++ b/src/CudaDartMaskAlgorithm.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/CudaDartMaskAlgorithm3D.cpp b/src/CudaDartMaskAlgorithm3D.cpp
index d93bc81..2703981 100644
--- a/src/CudaDartMaskAlgorithm3D.cpp
+++ b/src/CudaDartMaskAlgorithm3D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/CudaDartSmoothingAlgorithm.cpp b/src/CudaDartSmoothingAlgorithm.cpp
index 285c599..e3d569d 100644
--- a/src/CudaDartSmoothingAlgorithm.cpp
+++ b/src/CudaDartSmoothingAlgorithm.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/CudaDartSmoothingAlgorithm3D.cpp b/src/CudaDartSmoothingAlgorithm3D.cpp
index 8d375b1..26a379c 100644
--- a/src/CudaDartSmoothingAlgorithm3D.cpp
+++ b/src/CudaDartSmoothingAlgorithm3D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/CudaDataOperationAlgorithm.cpp b/src/CudaDataOperationAlgorithm.cpp
index c8c9db5..34c8a78 100644
--- a/src/CudaDataOperationAlgorithm.cpp
+++ b/src/CudaDataOperationAlgorithm.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/CudaEMAlgorithm.cpp b/src/CudaEMAlgorithm.cpp
index a4ec9ed..43a1eb4 100644
--- a/src/CudaEMAlgorithm.cpp
+++ b/src/CudaEMAlgorithm.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/CudaFDKAlgorithm3D.cpp b/src/CudaFDKAlgorithm3D.cpp
index 48b5ddd..6690401 100644
--- a/src/CudaFDKAlgorithm3D.cpp
+++ b/src/CudaFDKAlgorithm3D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/CudaFilteredBackProjectionAlgorithm.cpp b/src/CudaFilteredBackProjectionAlgorithm.cpp
index 02216a0..af9d55a 100644
--- a/src/CudaFilteredBackProjectionAlgorithm.cpp
+++ b/src/CudaFilteredBackProjectionAlgorithm.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/CudaForwardProjectionAlgorithm.cpp b/src/CudaForwardProjectionAlgorithm.cpp
index 12dbaa7..d1f6e96 100644
--- a/src/CudaForwardProjectionAlgorithm.cpp
+++ b/src/CudaForwardProjectionAlgorithm.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/CudaForwardProjectionAlgorithm3D.cpp b/src/CudaForwardProjectionAlgorithm3D.cpp
index 2e7033d..63b56f8 100644
--- a/src/CudaForwardProjectionAlgorithm3D.cpp
+++ b/src/CudaForwardProjectionAlgorithm3D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/CudaProjector2D.cpp b/src/CudaProjector2D.cpp
index 7765a70..3ee5b8e 100644
--- a/src/CudaProjector2D.cpp
+++ b/src/CudaProjector2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/CudaProjector3D.cpp b/src/CudaProjector3D.cpp
index fec6282..3ea7043 100644
--- a/src/CudaProjector3D.cpp
+++ b/src/CudaProjector3D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/CudaReconstructionAlgorithm2D.cpp b/src/CudaReconstructionAlgorithm2D.cpp
index a1c4648..e7e2ee1 100644
--- a/src/CudaReconstructionAlgorithm2D.cpp
+++ b/src/CudaReconstructionAlgorithm2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/CudaRoiSelectAlgorithm.cpp b/src/CudaRoiSelectAlgorithm.cpp
index 09aee63..9a92e10 100644
--- a/src/CudaRoiSelectAlgorithm.cpp
+++ b/src/CudaRoiSelectAlgorithm.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/CudaSartAlgorithm.cpp b/src/CudaSartAlgorithm.cpp
index 3ab2670..fea987e 100644
--- a/src/CudaSartAlgorithm.cpp
+++ b/src/CudaSartAlgorithm.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/CudaSirtAlgorithm.cpp b/src/CudaSirtAlgorithm.cpp
index b825667..3699d55 100644
--- a/src/CudaSirtAlgorithm.cpp
+++ b/src/CudaSirtAlgorithm.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/CudaSirtAlgorithm3D.cpp b/src/CudaSirtAlgorithm3D.cpp
index dec7bb2..b34b1e1 100644
--- a/src/CudaSirtAlgorithm3D.cpp
+++ b/src/CudaSirtAlgorithm3D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/DataProjector.cpp b/src/DataProjector.cpp
index ae07008..eaca6e0 100644
--- a/src/DataProjector.cpp
+++ b/src/DataProjector.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/DataProjectorPolicies.cpp b/src/DataProjectorPolicies.cpp
index fe6cbde..7a9da34 100644
--- a/src/DataProjectorPolicies.cpp
+++ b/src/DataProjectorPolicies.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/FanFlatBeamLineKernelProjector2D.cpp b/src/FanFlatBeamLineKernelProjector2D.cpp
index cddbe5f..6475ab2 100644
--- a/src/FanFlatBeamLineKernelProjector2D.cpp
+++ b/src/FanFlatBeamLineKernelProjector2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/FanFlatBeamStripKernelProjector2D.cpp b/src/FanFlatBeamStripKernelProjector2D.cpp
index 73689b0..7d25a55 100644
--- a/src/FanFlatBeamStripKernelProjector2D.cpp
+++ b/src/FanFlatBeamStripKernelProjector2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/FanFlatProjectionGeometry2D.cpp b/src/FanFlatProjectionGeometry2D.cpp
index 9616a9a..da9133c 100644
--- a/src/FanFlatProjectionGeometry2D.cpp
+++ b/src/FanFlatProjectionGeometry2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/FanFlatVecProjectionGeometry2D.cpp b/src/FanFlatVecProjectionGeometry2D.cpp
index 8eb6e7a..2a19233 100644
--- a/src/FanFlatVecProjectionGeometry2D.cpp
+++ b/src/FanFlatVecProjectionGeometry2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/FilteredBackProjectionAlgorithm.cpp b/src/FilteredBackProjectionAlgorithm.cpp
index 33a8f40..bb2e722 100644
--- a/src/FilteredBackProjectionAlgorithm.cpp
+++ b/src/FilteredBackProjectionAlgorithm.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/Float32Data.cpp b/src/Float32Data.cpp
index 1864a7f..48f0969 100644
--- a/src/Float32Data.cpp
+++ b/src/Float32Data.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/Float32Data2D.cpp b/src/Float32Data2D.cpp
index 5b4b371..c952700 100644
--- a/src/Float32Data2D.cpp
+++ b/src/Float32Data2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/Float32Data3D.cpp b/src/Float32Data3D.cpp
index 39d2504..da053a3 100644
--- a/src/Float32Data3D.cpp
+++ b/src/Float32Data3D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/Float32Data3DGPU.cpp b/src/Float32Data3DGPU.cpp
index f508d62..2b70d34 100644
--- a/src/Float32Data3DGPU.cpp
+++ b/src/Float32Data3DGPU.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/Float32Data3DMemory.cpp b/src/Float32Data3DMemory.cpp
index 5934d48..d1cede0 100644
--- a/src/Float32Data3DMemory.cpp
+++ b/src/Float32Data3DMemory.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/Float32ProjectionData2D.cpp b/src/Float32ProjectionData2D.cpp
index 725538b..fe6ae49 100644
--- a/src/Float32ProjectionData2D.cpp
+++ b/src/Float32ProjectionData2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/Float32ProjectionData3D.cpp b/src/Float32ProjectionData3D.cpp
index a517de0..ef614b8 100644
--- a/src/Float32ProjectionData3D.cpp
+++ b/src/Float32ProjectionData3D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/Float32ProjectionData3DGPU.cpp b/src/Float32ProjectionData3DGPU.cpp
index 3501fbe..30fcca3 100644
--- a/src/Float32ProjectionData3DGPU.cpp
+++ b/src/Float32ProjectionData3DGPU.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/Float32ProjectionData3DMemory.cpp b/src/Float32ProjectionData3DMemory.cpp
index e4b5194..dfa1deb 100644
--- a/src/Float32ProjectionData3DMemory.cpp
+++ b/src/Float32ProjectionData3DMemory.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/Float32VolumeData2D.cpp b/src/Float32VolumeData2D.cpp
index 0dafff9..6ef24fe 100644
--- a/src/Float32VolumeData2D.cpp
+++ b/src/Float32VolumeData2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/Float32VolumeData3D.cpp b/src/Float32VolumeData3D.cpp
index ae8f234..259f2db 100644
--- a/src/Float32VolumeData3D.cpp
+++ b/src/Float32VolumeData3D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/Float32VolumeData3DGPU.cpp b/src/Float32VolumeData3DGPU.cpp
index 52a6807..d0f4fba 100644
--- a/src/Float32VolumeData3DGPU.cpp
+++ b/src/Float32VolumeData3DGPU.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/Float32VolumeData3DMemory.cpp b/src/Float32VolumeData3DMemory.cpp
index 82d67a7..8399fb4 100644
--- a/src/Float32VolumeData3DMemory.cpp
+++ b/src/Float32VolumeData3DMemory.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/ForwardProjectionAlgorithm.cpp b/src/ForwardProjectionAlgorithm.cpp
index cfe96fe..d7b664d 100644
--- a/src/ForwardProjectionAlgorithm.cpp
+++ b/src/ForwardProjectionAlgorithm.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/Fourier.cpp b/src/Fourier.cpp
index ec4fa0c..1f3f1cb 100644
--- a/src/Fourier.cpp
+++ b/src/Fourier.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/GeometryUtil2D.cpp b/src/GeometryUtil2D.cpp
index 84e0d32..2735ad7 100644
--- a/src/GeometryUtil2D.cpp
+++ b/src/GeometryUtil2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/GeometryUtil3D.cpp b/src/GeometryUtil3D.cpp
index 9c710b9..5257998 100644
--- a/src/GeometryUtil3D.cpp
+++ b/src/GeometryUtil3D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/Globals.cpp b/src/Globals.cpp
index 5b0d84e..6b46cfe 100644
--- a/src/Globals.cpp
+++ b/src/Globals.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/Logging.cpp b/src/Logging.cpp
index f39c299..c9513fc 100644
--- a/src/Logging.cpp
+++ b/src/Logging.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/ParallelBeamBlobKernelProjector2D.cpp b/src/ParallelBeamBlobKernelProjector2D.cpp
index 01c6687..da21024 100644
--- a/src/ParallelBeamBlobKernelProjector2D.cpp
+++ b/src/ParallelBeamBlobKernelProjector2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/ParallelBeamLineKernelProjector2D.cpp b/src/ParallelBeamLineKernelProjector2D.cpp
index a7f356a..3654fb0 100644
--- a/src/ParallelBeamLineKernelProjector2D.cpp
+++ b/src/ParallelBeamLineKernelProjector2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/ParallelBeamLinearKernelProjector2D.cpp b/src/ParallelBeamLinearKernelProjector2D.cpp
index 2fbf23f..5ca1082 100644
--- a/src/ParallelBeamLinearKernelProjector2D.cpp
+++ b/src/ParallelBeamLinearKernelProjector2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/ParallelBeamStripKernelProjector2D.cpp b/src/ParallelBeamStripKernelProjector2D.cpp
index ccc47a8..4b10b68 100644
--- a/src/ParallelBeamStripKernelProjector2D.cpp
+++ b/src/ParallelBeamStripKernelProjector2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/ParallelProjectionGeometry2D.cpp b/src/ParallelProjectionGeometry2D.cpp
index ce586ae..74a8b34 100644
--- a/src/ParallelProjectionGeometry2D.cpp
+++ b/src/ParallelProjectionGeometry2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/ParallelProjectionGeometry3D.cpp b/src/ParallelProjectionGeometry3D.cpp
index a951c7f..15fe7b5 100644
--- a/src/ParallelProjectionGeometry3D.cpp
+++ b/src/ParallelProjectionGeometry3D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/ParallelVecProjectionGeometry2D.cpp b/src/ParallelVecProjectionGeometry2D.cpp
index d59a467..e6de5f3 100644
--- a/src/ParallelVecProjectionGeometry2D.cpp
+++ b/src/ParallelVecProjectionGeometry2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/ParallelVecProjectionGeometry3D.cpp b/src/ParallelVecProjectionGeometry3D.cpp
index dfab8be..58fc986 100644
--- a/src/ParallelVecProjectionGeometry3D.cpp
+++ b/src/ParallelVecProjectionGeometry3D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/PlatformDepSystemCode.cpp b/src/PlatformDepSystemCode.cpp
index 14850e8..d70cce7 100644
--- a/src/PlatformDepSystemCode.cpp
+++ b/src/PlatformDepSystemCode.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/PluginAlgorithm.cpp b/src/PluginAlgorithm.cpp
index 0636895..ea1e104 100644
--- a/src/PluginAlgorithm.cpp
+++ b/src/PluginAlgorithm.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/ProjectionGeometry2D.cpp b/src/ProjectionGeometry2D.cpp
index 4490487..64674bf 100644
--- a/src/ProjectionGeometry2D.cpp
+++ b/src/ProjectionGeometry2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/ProjectionGeometry3D.cpp b/src/ProjectionGeometry3D.cpp
index c216a10..bea88ab 100644
--- a/src/ProjectionGeometry3D.cpp
+++ b/src/ProjectionGeometry3D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/Projector2D.cpp b/src/Projector2D.cpp
index a4e267c..aae3b13 100644
--- a/src/Projector2D.cpp
+++ b/src/Projector2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/Projector3D.cpp b/src/Projector3D.cpp
index 1ebed6b..2623f7e 100644
--- a/src/Projector3D.cpp
+++ b/src/Projector3D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/ReconstructionAlgorithm2D.cpp b/src/ReconstructionAlgorithm2D.cpp
index 85ec1ae..9d1aa1d 100644
--- a/src/ReconstructionAlgorithm2D.cpp
+++ b/src/ReconstructionAlgorithm2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/ReconstructionAlgorithm3D.cpp b/src/ReconstructionAlgorithm3D.cpp
index 6b846be..20bc34e 100644
--- a/src/ReconstructionAlgorithm3D.cpp
+++ b/src/ReconstructionAlgorithm3D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/ReconstructionAlgorithmMultiSlice2D.cpp b/src/ReconstructionAlgorithmMultiSlice2D.cpp
index 17c1d47..a2544bf 100644
--- a/src/ReconstructionAlgorithmMultiSlice2D.cpp
+++ b/src/ReconstructionAlgorithmMultiSlice2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/SartAlgorithm.cpp b/src/SartAlgorithm.cpp
index e6ca937..94460ba 100644
--- a/src/SartAlgorithm.cpp
+++ b/src/SartAlgorithm.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/SirtAlgorithm.cpp b/src/SirtAlgorithm.cpp
index 706f283..3ea0a24 100644
--- a/src/SirtAlgorithm.cpp
+++ b/src/SirtAlgorithm.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/SparseMatrix.cpp b/src/SparseMatrix.cpp
index 2500173..34f032c 100644
--- a/src/SparseMatrix.cpp
+++ b/src/SparseMatrix.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/SparseMatrixProjectionGeometry2D.cpp b/src/SparseMatrixProjectionGeometry2D.cpp
index 5dafcb9..b55a282 100644
--- a/src/SparseMatrixProjectionGeometry2D.cpp
+++ b/src/SparseMatrixProjectionGeometry2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/SparseMatrixProjector2D.cpp b/src/SparseMatrixProjector2D.cpp
index e28a99c..6fded6a 100644
--- a/src/SparseMatrixProjector2D.cpp
+++ b/src/SparseMatrixProjector2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/Utilities.cpp b/src/Utilities.cpp
index d128ec1..6346a49 100644
--- a/src/Utilities.cpp
+++ b/src/Utilities.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/Vector3D.cpp b/src/Vector3D.cpp
index 8c1bea5..40c40c5 100644
--- a/src/Vector3D.cpp
+++ b/src/Vector3D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/VolumeGeometry2D.cpp b/src/VolumeGeometry2D.cpp
index 286296c..d7a8051 100644
--- a/src/VolumeGeometry2D.cpp
+++ b/src/VolumeGeometry2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/VolumeGeometry3D.cpp b/src/VolumeGeometry3D.cpp
index b95c3d4..b8c2409 100644
--- a/src/VolumeGeometry3D.cpp
+++ b/src/VolumeGeometry3D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/XMLDocument.cpp b/src/XMLDocument.cpp
index 58b1912..65cb0b6 100644
--- a/src/XMLDocument.cpp
+++ b/src/XMLDocument.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/src/XMLNode.cpp b/src/XMLNode.cpp
index 4064a46..35774d8 100644
--- a/src/XMLNode.cpp
+++ b/src/XMLNode.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/tests/main.cpp b/tests/main.cpp
index fb1e732..3fd5cab 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/tests/test_AstraObjectManager.cpp b/tests/test_AstraObjectManager.cpp
index 525acdb..78ebb17 100644
--- a/tests/test_AstraObjectManager.cpp
+++ b/tests/test_AstraObjectManager.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/tests/test_FanFlatProjectionGeometry2D.cpp b/tests/test_FanFlatProjectionGeometry2D.cpp
index fcda54f..6b14b18 100644
--- a/tests/test_FanFlatProjectionGeometry2D.cpp
+++ b/tests/test_FanFlatProjectionGeometry2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/tests/test_Float32Data2D.cpp b/tests/test_Float32Data2D.cpp
index 92e67af..921cf9a 100644
--- a/tests/test_Float32Data2D.cpp
+++ b/tests/test_Float32Data2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/tests/test_Float32ProjectionData2D.cpp b/tests/test_Float32ProjectionData2D.cpp
index 397b70e..639d42d 100644
--- a/tests/test_Float32ProjectionData2D.cpp
+++ b/tests/test_Float32ProjectionData2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/tests/test_Float32VolumeData2D.cpp b/tests/test_Float32VolumeData2D.cpp
index e62507d..3252a65 100644
--- a/tests/test_Float32VolumeData2D.cpp
+++ b/tests/test_Float32VolumeData2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/tests/test_Fourier.cpp b/tests/test_Fourier.cpp
index 66aeba0..0f153eb 100644
--- a/tests/test_Fourier.cpp
+++ b/tests/test_Fourier.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/tests/test_ParallelBeamLineKernelProjector2D.cpp b/tests/test_ParallelBeamLineKernelProjector2D.cpp
index 60babb4..71130c1 100644
--- a/tests/test_ParallelBeamLineKernelProjector2D.cpp
+++ b/tests/test_ParallelBeamLineKernelProjector2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/tests/test_ParallelBeamLinearKernelProjector2D.cpp b/tests/test_ParallelBeamLinearKernelProjector2D.cpp
index 0b2af0d..4610aa5 100644
--- a/tests/test_ParallelBeamLinearKernelProjector2D.cpp
+++ b/tests/test_ParallelBeamLinearKernelProjector2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/tests/test_ParallelProjectionGeometry2D.cpp b/tests/test_ParallelProjectionGeometry2D.cpp
index 19221d3..50af3da 100644
--- a/tests/test_ParallelProjectionGeometry2D.cpp
+++ b/tests/test_ParallelProjectionGeometry2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/tests/test_VolumeGeometry2D.cpp b/tests/test_VolumeGeometry2D.cpp
index 65d61e0..40e1655 100644
--- a/tests/test_VolumeGeometry2D.cpp
+++ b/tests/test_VolumeGeometry2D.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com
diff --git a/tests/test_XMLDocument.cpp b/tests/test_XMLDocument.cpp
index 79f0a6c..c808e8c 100644
--- a/tests/test_XMLDocument.cpp
+++ b/tests/test_XMLDocument.cpp
@@ -1,6 +1,6 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, iMinds-Vision Lab, University of Antwerp
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
2014-2018, CWI, Amsterdam
Contact: astra@astra-toolbox.com