summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Algorithm.cpp4
-rw-r--r--src/ArtAlgorithm.cpp4
-rw-r--r--src/AstraObjectFactory.cpp4
-rw-r--r--src/AstraObjectManager.cpp4
-rw-r--r--src/AsyncAlgorithm.cpp4
-rw-r--r--src/BackProjectionAlgorithm.cpp4
-rw-r--r--src/CglsAlgorithm.cpp4
-rw-r--r--src/CompositeGeometryManager.cpp4
-rw-r--r--src/ConeProjectionGeometry3D.cpp83
-rw-r--r--src/ConeVecProjectionGeometry3D.cpp58
-rw-r--r--src/Config.cpp4
-rw-r--r--src/CudaBackProjectionAlgorithm.cpp4
-rw-r--r--src/CudaBackProjectionAlgorithm3D.cpp4
-rw-r--r--src/CudaCglsAlgorithm.cpp4
-rw-r--r--src/CudaCglsAlgorithm3D.cpp4
-rw-r--r--src/CudaDartMaskAlgorithm.cpp4
-rw-r--r--src/CudaDartMaskAlgorithm3D.cpp4
-rw-r--r--src/CudaDartSmoothingAlgorithm.cpp4
-rw-r--r--src/CudaDartSmoothingAlgorithm3D.cpp4
-rw-r--r--src/CudaDataOperationAlgorithm.cpp4
-rw-r--r--src/CudaEMAlgorithm.cpp4
-rw-r--r--src/CudaFDKAlgorithm3D.cpp4
-rw-r--r--src/CudaFilteredBackProjectionAlgorithm.cpp4
-rw-r--r--src/CudaForwardProjectionAlgorithm.cpp4
-rw-r--r--src/CudaForwardProjectionAlgorithm3D.cpp4
-rw-r--r--src/CudaProjector2D.cpp4
-rw-r--r--src/CudaProjector3D.cpp4
-rw-r--r--src/CudaReconstructionAlgorithm2D.cpp4
-rw-r--r--src/CudaRoiSelectAlgorithm.cpp4
-rw-r--r--src/CudaSartAlgorithm.cpp4
-rw-r--r--src/CudaSirtAlgorithm.cpp4
-rw-r--r--src/CudaSirtAlgorithm3D.cpp4
-rw-r--r--src/DataProjector.cpp4
-rw-r--r--src/DataProjectorPolicies.cpp4
-rw-r--r--src/FanFlatBeamLineKernelProjector2D.cpp4
-rw-r--r--src/FanFlatBeamStripKernelProjector2D.cpp4
-rw-r--r--src/FanFlatProjectionGeometry2D.cpp4
-rw-r--r--src/FanFlatVecProjectionGeometry2D.cpp4
-rw-r--r--src/Features.cpp7
-rw-r--r--src/FilteredBackProjectionAlgorithm.cpp4
-rw-r--r--src/Filters.cpp4
-rw-r--r--src/Float32Data.cpp4
-rw-r--r--src/Float32Data2D.cpp4
-rw-r--r--src/Float32Data3D.cpp4
-rw-r--r--src/Float32Data3DGPU.cpp4
-rw-r--r--src/Float32Data3DMemory.cpp4
-rw-r--r--src/Float32ProjectionData2D.cpp4
-rw-r--r--src/Float32ProjectionData3D.cpp4
-rw-r--r--src/Float32ProjectionData3DGPU.cpp4
-rw-r--r--src/Float32ProjectionData3DMemory.cpp4
-rw-r--r--src/Float32VolumeData2D.cpp4
-rw-r--r--src/Float32VolumeData3D.cpp4
-rw-r--r--src/Float32VolumeData3DGPU.cpp4
-rw-r--r--src/Float32VolumeData3DMemory.cpp4
-rw-r--r--src/ForwardProjectionAlgorithm.cpp4
-rw-r--r--src/Fourier.cpp4
-rw-r--r--src/GeometryUtil2D.cpp4
-rw-r--r--src/GeometryUtil3D.cpp88
-rw-r--r--src/Globals.cpp8
-rw-r--r--src/Logging.cpp4
-rw-r--r--src/ParallelBeamBlobKernelProjector2D.cpp4
-rw-r--r--src/ParallelBeamDistanceDrivenProjector2D.cpp4
-rw-r--r--src/ParallelBeamLineKernelProjector2D.cpp4
-rw-r--r--src/ParallelBeamLinearKernelProjector2D.cpp4
-rw-r--r--src/ParallelBeamStripKernelProjector2D.cpp4
-rw-r--r--src/ParallelProjectionGeometry2D.cpp4
-rw-r--r--src/ParallelProjectionGeometry3D.cpp77
-rw-r--r--src/ParallelVecProjectionGeometry2D.cpp4
-rw-r--r--src/ParallelVecProjectionGeometry3D.cpp59
-rw-r--r--src/PlatformDepSystemCode.cpp4
-rw-r--r--src/PluginAlgorithmFactory.cpp4
-rw-r--r--src/ProjectionGeometry2D.cpp4
-rw-r--r--src/ProjectionGeometry3D.cpp4
-rw-r--r--src/Projector2D.cpp4
-rw-r--r--src/Projector3D.cpp4
-rw-r--r--src/ReconstructionAlgorithm2D.cpp4
-rw-r--r--src/ReconstructionAlgorithm3D.cpp4
-rw-r--r--src/SartAlgorithm.cpp4
-rw-r--r--src/SirtAlgorithm.cpp4
-rw-r--r--src/SparseMatrix.cpp4
-rw-r--r--src/SparseMatrixProjectionGeometry2D.cpp4
-rw-r--r--src/SparseMatrixProjector2D.cpp4
-rw-r--r--src/Utilities.cpp4
-rw-r--r--src/Vector3D.cpp4
-rw-r--r--src/VolumeGeometry2D.cpp4
-rw-r--r--src/VolumeGeometry3D.cpp4
-rw-r--r--src/XMLDocument.cpp4
-rw-r--r--src/XMLNode.cpp4
88 files changed, 181 insertions, 523 deletions
diff --git a/src/Algorithm.cpp b/src/Algorithm.cpp
index 41da987..09ffd55 100644
--- a/src/Algorithm.cpp
+++ b/src/Algorithm.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/ArtAlgorithm.cpp b/src/ArtAlgorithm.cpp
index 570897f..5445034 100644
--- a/src/ArtAlgorithm.cpp
+++ b/src/ArtAlgorithm.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/AstraObjectFactory.cpp b/src/AstraObjectFactory.cpp
index a103bc6..58513a1 100644
--- a/src/AstraObjectFactory.cpp
+++ b/src/AstraObjectFactory.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/AstraObjectManager.cpp b/src/AstraObjectManager.cpp
index 92d2da4..9ba204b 100644
--- a/src/AstraObjectManager.cpp
+++ b/src/AstraObjectManager.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/AsyncAlgorithm.cpp b/src/AsyncAlgorithm.cpp
index 7b82376..f963b19 100644
--- a/src/AsyncAlgorithm.cpp
+++ b/src/AsyncAlgorithm.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/BackProjectionAlgorithm.cpp b/src/BackProjectionAlgorithm.cpp
index 97bdb33..fb31407 100644
--- a/src/BackProjectionAlgorithm.cpp
+++ b/src/BackProjectionAlgorithm.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/CglsAlgorithm.cpp b/src/CglsAlgorithm.cpp
index 7658182..0921b24 100644
--- a/src/CglsAlgorithm.cpp
+++ b/src/CglsAlgorithm.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/CompositeGeometryManager.cpp b/src/CompositeGeometryManager.cpp
index 822f746..bbca805 100644
--- a/src/CompositeGeometryManager.cpp
+++ b/src/CompositeGeometryManager.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/ConeProjectionGeometry3D.cpp b/src/ConeProjectionGeometry3D.cpp
index 1223564..abd9124 100644
--- a/src/ConeProjectionGeometry3D.cpp
+++ b/src/ConeProjectionGeometry3D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
@@ -266,84 +266,5 @@ void CConeProjectionGeometry3D::projectPoint(double fX, double fY, double fZ,
fU = detectorOffsetXToColIndexFloat( (fS * (m_fOriginSourceDistance + m_fOriginDetectorDistance)) / fD );
}
-void CConeProjectionGeometry3D::backprojectPointX(int iAngleIndex, double fU, double fV,
- double fX, double &fY, double &fZ) const
-{
- ASTRA_ASSERT(iAngleIndex >= 0);
- ASTRA_ASSERT(iAngleIndex < m_iProjectionAngleCount);
-
- SConeProjection *projs = genConeProjections(1, m_iDetectorColCount, m_iDetectorRowCount,
- m_fOriginSourceDistance,
- m_fOriginDetectorDistance,
- m_fDetectorSpacingX, m_fDetectorSpacingY,
- &m_pfProjectionAngles[iAngleIndex]);
-
- SConeProjection &proj = projs[0];
-
- double px = proj.fDetSX + fU * proj.fDetUX + fV * proj.fDetVX;
- double py = proj.fDetSY + fU * proj.fDetUY + fV * proj.fDetVY;
- double pz = proj.fDetSZ + fU * proj.fDetUZ + fV * proj.fDetVZ;
-
- double a = (fX - proj.fSrcX) / (px - proj.fSrcX);
-
- fY = proj.fSrcY + a * (py - proj.fSrcY);
- fZ = proj.fSrcZ + a * (pz - proj.fSrcZ);
-
- delete[] projs;
-}
-
-void CConeProjectionGeometry3D::backprojectPointY(int iAngleIndex, double fU, double fV,
- double fY, double &fX, double &fZ) const
-{
- ASTRA_ASSERT(iAngleIndex >= 0);
- ASTRA_ASSERT(iAngleIndex < m_iProjectionAngleCount);
-
- SConeProjection *projs = genConeProjections(1, m_iDetectorColCount, m_iDetectorRowCount,
- m_fOriginSourceDistance,
- m_fOriginDetectorDistance,
- m_fDetectorSpacingX, m_fDetectorSpacingY,
- &m_pfProjectionAngles[iAngleIndex]);
-
- SConeProjection &proj = projs[0];
-
- double px = proj.fDetSX + fU * proj.fDetUX + fV * proj.fDetVX;
- double py = proj.fDetSY + fU * proj.fDetUY + fV * proj.fDetVY;
- double pz = proj.fDetSZ + fU * proj.fDetUZ + fV * proj.fDetVZ;
-
- double a = (fY - proj.fSrcY) / (py - proj.fSrcY);
-
- fX = proj.fSrcX + a * (px - proj.fSrcX);
- fZ = proj.fSrcZ + a * (pz - proj.fSrcZ);
-
- delete[] projs;
-}
-
-void CConeProjectionGeometry3D::backprojectPointZ(int iAngleIndex, double fU, double fV,
- double fZ, double &fX, double &fY) const
-{
- ASTRA_ASSERT(iAngleIndex >= 0);
- ASTRA_ASSERT(iAngleIndex < m_iProjectionAngleCount);
-
- SConeProjection *projs = genConeProjections(1, m_iDetectorColCount, m_iDetectorRowCount,
- m_fOriginSourceDistance,
- m_fOriginDetectorDistance,
- m_fDetectorSpacingX, m_fDetectorSpacingY,
- &m_pfProjectionAngles[iAngleIndex]);
-
- SConeProjection &proj = projs[0];
-
- double px = proj.fDetSX + fU * proj.fDetUX + fV * proj.fDetVX;
- double py = proj.fDetSY + fU * proj.fDetUY + fV * proj.fDetVY;
- double pz = proj.fDetSZ + fU * proj.fDetUZ + fV * proj.fDetVZ;
-
- double a = (fZ - proj.fSrcZ) / (pz - proj.fSrcZ);
-
- fX = proj.fSrcX + a * (px - proj.fSrcX);
- fY = proj.fSrcY + a * (py - proj.fSrcY);
-
- delete[] projs;
-}
-
-
} // end namespace astra
diff --git a/src/ConeVecProjectionGeometry3D.cpp b/src/ConeVecProjectionGeometry3D.cpp
index b6a55c5..eb605d8 100644
--- a/src/ConeVecProjectionGeometry3D.cpp
+++ b/src/ConeVecProjectionGeometry3D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
@@ -258,60 +258,6 @@ void CConeVecProjectionGeometry3D::projectPoint(double fX, double fY, double fZ,
}
-void CConeVecProjectionGeometry3D::backprojectPointX(int iAngleIndex, double fU, double fV,
- double fX, double &fY, double &fZ) const
-{
- ASTRA_ASSERT(iAngleIndex >= 0);
- ASTRA_ASSERT(iAngleIndex < m_iProjectionAngleCount);
-
- SConeProjection &proj = m_pProjectionAngles[iAngleIndex];
-
- double px = proj.fDetSX + fU * proj.fDetUX + fV * proj.fDetVX;
- double py = proj.fDetSY + fU * proj.fDetUY + fV * proj.fDetVY;
- double pz = proj.fDetSZ + fU * proj.fDetUZ + fV * proj.fDetVZ;
-
- double a = (fX - proj.fSrcX) / (px - proj.fSrcX);
-
- fY = proj.fSrcY + a * (py - proj.fSrcY);
- fZ = proj.fSrcZ + a * (pz - proj.fSrcZ);
-}
-
-void CConeVecProjectionGeometry3D::backprojectPointY(int iAngleIndex, double fU, double fV,
- double fY, double &fX, double &fZ) const
-{
- ASTRA_ASSERT(iAngleIndex >= 0);
- ASTRA_ASSERT(iAngleIndex < m_iProjectionAngleCount);
-
- SConeProjection &proj = m_pProjectionAngles[iAngleIndex];
-
- double px = proj.fDetSX + fU * proj.fDetUX + fV * proj.fDetVX;
- double py = proj.fDetSY + fU * proj.fDetUY + fV * proj.fDetVY;
- double pz = proj.fDetSZ + fU * proj.fDetUZ + fV * proj.fDetVZ;
-
- double a = (fY - proj.fSrcY) / (py - proj.fSrcY);
-
- fX = proj.fSrcX + a * (px - proj.fSrcX);
- fZ = proj.fSrcZ + a * (pz - proj.fSrcZ);
-}
-
-void CConeVecProjectionGeometry3D::backprojectPointZ(int iAngleIndex, double fU, double fV,
- double fZ, double &fX, double &fY) const
-{
- ASTRA_ASSERT(iAngleIndex >= 0);
- ASTRA_ASSERT(iAngleIndex < m_iProjectionAngleCount);
-
- SConeProjection &proj = m_pProjectionAngles[iAngleIndex];
-
- double px = proj.fDetSX + fU * proj.fDetUX + fV * proj.fDetVX;
- double py = proj.fDetSY + fU * proj.fDetUY + fV * proj.fDetVY;
- double pz = proj.fDetSZ + fU * proj.fDetUZ + fV * proj.fDetVZ;
-
- double a = (fZ - proj.fSrcZ) / (pz - proj.fSrcZ);
-
- fX = proj.fSrcX + a * (px - proj.fSrcX);
- fY = proj.fSrcY + a * (py - proj.fSrcY);
-}
-
//----------------------------------------------------------------------------------------
bool CConeVecProjectionGeometry3D::_check()
diff --git a/src/Config.cpp b/src/Config.cpp
index 9420e1f..8712e3e 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/CudaBackProjectionAlgorithm.cpp b/src/CudaBackProjectionAlgorithm.cpp
index c8d56f3..187b7d5 100644
--- a/src/CudaBackProjectionAlgorithm.cpp
+++ b/src/CudaBackProjectionAlgorithm.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/CudaBackProjectionAlgorithm3D.cpp b/src/CudaBackProjectionAlgorithm3D.cpp
index d17c1cb..4c3e7ba 100644
--- a/src/CudaBackProjectionAlgorithm3D.cpp
+++ b/src/CudaBackProjectionAlgorithm3D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/CudaCglsAlgorithm.cpp b/src/CudaCglsAlgorithm.cpp
index bc60325..c964016 100644
--- a/src/CudaCglsAlgorithm.cpp
+++ b/src/CudaCglsAlgorithm.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/CudaCglsAlgorithm3D.cpp b/src/CudaCglsAlgorithm3D.cpp
index 2977c80..4d8ddd6 100644
--- a/src/CudaCglsAlgorithm3D.cpp
+++ b/src/CudaCglsAlgorithm3D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/CudaDartMaskAlgorithm.cpp b/src/CudaDartMaskAlgorithm.cpp
index f6760bc..e9fcb87 100644
--- a/src/CudaDartMaskAlgorithm.cpp
+++ b/src/CudaDartMaskAlgorithm.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/CudaDartMaskAlgorithm3D.cpp b/src/CudaDartMaskAlgorithm3D.cpp
index f2778cf..0c3d646 100644
--- a/src/CudaDartMaskAlgorithm3D.cpp
+++ b/src/CudaDartMaskAlgorithm3D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/CudaDartSmoothingAlgorithm.cpp b/src/CudaDartSmoothingAlgorithm.cpp
index 3f81b91..18c8fc3 100644
--- a/src/CudaDartSmoothingAlgorithm.cpp
+++ b/src/CudaDartSmoothingAlgorithm.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/CudaDartSmoothingAlgorithm3D.cpp b/src/CudaDartSmoothingAlgorithm3D.cpp
index 0dc0631..f90f613 100644
--- a/src/CudaDartSmoothingAlgorithm3D.cpp
+++ b/src/CudaDartSmoothingAlgorithm3D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/CudaDataOperationAlgorithm.cpp b/src/CudaDataOperationAlgorithm.cpp
index c48eedb..31c4b15 100644
--- a/src/CudaDataOperationAlgorithm.cpp
+++ b/src/CudaDataOperationAlgorithm.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/CudaEMAlgorithm.cpp b/src/CudaEMAlgorithm.cpp
index 94e05a0..4a4effb 100644
--- a/src/CudaEMAlgorithm.cpp
+++ b/src/CudaEMAlgorithm.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/CudaFDKAlgorithm3D.cpp b/src/CudaFDKAlgorithm3D.cpp
index 24ed04f..cc23df9 100644
--- a/src/CudaFDKAlgorithm3D.cpp
+++ b/src/CudaFDKAlgorithm3D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/CudaFilteredBackProjectionAlgorithm.cpp b/src/CudaFilteredBackProjectionAlgorithm.cpp
index c1d3dc8..0304ba0 100644
--- a/src/CudaFilteredBackProjectionAlgorithm.cpp
+++ b/src/CudaFilteredBackProjectionAlgorithm.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/CudaForwardProjectionAlgorithm.cpp b/src/CudaForwardProjectionAlgorithm.cpp
index 24d9a46..bab8306 100644
--- a/src/CudaForwardProjectionAlgorithm.cpp
+++ b/src/CudaForwardProjectionAlgorithm.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/CudaForwardProjectionAlgorithm3D.cpp b/src/CudaForwardProjectionAlgorithm3D.cpp
index 2ec1fe2..3eb377b 100644
--- a/src/CudaForwardProjectionAlgorithm3D.cpp
+++ b/src/CudaForwardProjectionAlgorithm3D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/CudaProjector2D.cpp b/src/CudaProjector2D.cpp
index 3ee5b8e..42b7937 100644
--- a/src/CudaProjector2D.cpp
+++ b/src/CudaProjector2D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/CudaProjector3D.cpp b/src/CudaProjector3D.cpp
index e5c55cc..ba4fb1a 100644
--- a/src/CudaProjector3D.cpp
+++ b/src/CudaProjector3D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/CudaReconstructionAlgorithm2D.cpp b/src/CudaReconstructionAlgorithm2D.cpp
index 6730cea..3009c90 100644
--- a/src/CudaReconstructionAlgorithm2D.cpp
+++ b/src/CudaReconstructionAlgorithm2D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/CudaRoiSelectAlgorithm.cpp b/src/CudaRoiSelectAlgorithm.cpp
index efeb04c..67bab7f 100644
--- a/src/CudaRoiSelectAlgorithm.cpp
+++ b/src/CudaRoiSelectAlgorithm.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/CudaSartAlgorithm.cpp b/src/CudaSartAlgorithm.cpp
index 7c7ecc0..ebae294 100644
--- a/src/CudaSartAlgorithm.cpp
+++ b/src/CudaSartAlgorithm.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/CudaSirtAlgorithm.cpp b/src/CudaSirtAlgorithm.cpp
index ae1b13d..d550bb8 100644
--- a/src/CudaSirtAlgorithm.cpp
+++ b/src/CudaSirtAlgorithm.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/CudaSirtAlgorithm3D.cpp b/src/CudaSirtAlgorithm3D.cpp
index 17fea67..5519b7f 100644
--- a/src/CudaSirtAlgorithm3D.cpp
+++ b/src/CudaSirtAlgorithm3D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/DataProjector.cpp b/src/DataProjector.cpp
index eaca6e0..e9380b2 100644
--- a/src/DataProjector.cpp
+++ b/src/DataProjector.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/DataProjectorPolicies.cpp b/src/DataProjectorPolicies.cpp
index 7a9da34..e150fc9 100644
--- a/src/DataProjectorPolicies.cpp
+++ b/src/DataProjectorPolicies.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/FanFlatBeamLineKernelProjector2D.cpp b/src/FanFlatBeamLineKernelProjector2D.cpp
index a092504..28821e4 100644
--- a/src/FanFlatBeamLineKernelProjector2D.cpp
+++ b/src/FanFlatBeamLineKernelProjector2D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/FanFlatBeamStripKernelProjector2D.cpp b/src/FanFlatBeamStripKernelProjector2D.cpp
index c974b82..6534808 100644
--- a/src/FanFlatBeamStripKernelProjector2D.cpp
+++ b/src/FanFlatBeamStripKernelProjector2D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/FanFlatProjectionGeometry2D.cpp b/src/FanFlatProjectionGeometry2D.cpp
index 734b4c5..c25dc98 100644
--- a/src/FanFlatProjectionGeometry2D.cpp
+++ b/src/FanFlatProjectionGeometry2D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/FanFlatVecProjectionGeometry2D.cpp b/src/FanFlatVecProjectionGeometry2D.cpp
index ce4e220..e460d1d 100644
--- a/src/FanFlatVecProjectionGeometry2D.cpp
+++ b/src/FanFlatVecProjectionGeometry2D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/Features.cpp b/src/Features.cpp
index 09a3499..c758084 100644
--- a/src/Features.cpp
+++ b/src/Features.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
@@ -40,6 +40,9 @@ _AstraExport bool hasFeature(const std::string &flag) {
if (flag == "fan_cone_BP_density_weighting_by_default") {
return true;
}
+ if (flag == "unpadded_GPULink") {
+ return true;
+ }
return false;
}
diff --git a/src/FilteredBackProjectionAlgorithm.cpp b/src/FilteredBackProjectionAlgorithm.cpp
index 6b4093d..4400d45 100644
--- a/src/FilteredBackProjectionAlgorithm.cpp
+++ b/src/FilteredBackProjectionAlgorithm.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/Filters.cpp b/src/Filters.cpp
index 234829c..4407056 100644
--- a/src/Filters.cpp
+++ b/src/Filters.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/Float32Data.cpp b/src/Float32Data.cpp
index 48f0969..a503b62 100644
--- a/src/Float32Data.cpp
+++ b/src/Float32Data.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/Float32Data2D.cpp b/src/Float32Data2D.cpp
index c952700..aba5428 100644
--- a/src/Float32Data2D.cpp
+++ b/src/Float32Data2D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/Float32Data3D.cpp b/src/Float32Data3D.cpp
index 078673d..27e6d21 100644
--- a/src/Float32Data3D.cpp
+++ b/src/Float32Data3D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/Float32Data3DGPU.cpp b/src/Float32Data3DGPU.cpp
index 2b1ddb2..efa332e 100644
--- a/src/Float32Data3DGPU.cpp
+++ b/src/Float32Data3DGPU.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/Float32Data3DMemory.cpp b/src/Float32Data3DMemory.cpp
index d1cede0..d6de720 100644
--- a/src/Float32Data3DMemory.cpp
+++ b/src/Float32Data3DMemory.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/Float32ProjectionData2D.cpp b/src/Float32ProjectionData2D.cpp
index fe6ae49..8a9a222 100644
--- a/src/Float32ProjectionData2D.cpp
+++ b/src/Float32ProjectionData2D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/Float32ProjectionData3D.cpp b/src/Float32ProjectionData3D.cpp
index ef614b8..e6285b3 100644
--- a/src/Float32ProjectionData3D.cpp
+++ b/src/Float32ProjectionData3D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/Float32ProjectionData3DGPU.cpp b/src/Float32ProjectionData3DGPU.cpp
index e1ae896..ee0ebcd 100644
--- a/src/Float32ProjectionData3DGPU.cpp
+++ b/src/Float32ProjectionData3DGPU.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/Float32ProjectionData3DMemory.cpp b/src/Float32ProjectionData3DMemory.cpp
index dfa1deb..3525c23 100644
--- a/src/Float32ProjectionData3DMemory.cpp
+++ b/src/Float32ProjectionData3DMemory.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/Float32VolumeData2D.cpp b/src/Float32VolumeData2D.cpp
index 6ef24fe..46b4abf 100644
--- a/src/Float32VolumeData2D.cpp
+++ b/src/Float32VolumeData2D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/Float32VolumeData3D.cpp b/src/Float32VolumeData3D.cpp
index 259f2db..1151a0f 100644
--- a/src/Float32VolumeData3D.cpp
+++ b/src/Float32VolumeData3D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/Float32VolumeData3DGPU.cpp b/src/Float32VolumeData3DGPU.cpp
index 00e030c..75510ce 100644
--- a/src/Float32VolumeData3DGPU.cpp
+++ b/src/Float32VolumeData3DGPU.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/Float32VolumeData3DMemory.cpp b/src/Float32VolumeData3DMemory.cpp
index 8399fb4..db94692 100644
--- a/src/Float32VolumeData3DMemory.cpp
+++ b/src/Float32VolumeData3DMemory.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/ForwardProjectionAlgorithm.cpp b/src/ForwardProjectionAlgorithm.cpp
index 732f38c..7d71722 100644
--- a/src/ForwardProjectionAlgorithm.cpp
+++ b/src/ForwardProjectionAlgorithm.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/Fourier.cpp b/src/Fourier.cpp
index 1f3f1cb..63176c0 100644
--- a/src/Fourier.cpp
+++ b/src/Fourier.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/GeometryUtil2D.cpp b/src/GeometryUtil2D.cpp
index 806572f..e7c1934 100644
--- a/src/GeometryUtil2D.cpp
+++ b/src/GeometryUtil2D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/GeometryUtil3D.cpp b/src/GeometryUtil3D.cpp
index 5257998..28a7a9c 100644
--- a/src/GeometryUtil3D.cpp
+++ b/src/GeometryUtil3D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
@@ -159,88 +159,4 @@ void computeBP_UV_Coeffs(const SConeProjection& proj, double &fUX, double &fUY,
}
-// TODO: Handle cases of rays parallel to coordinate planes
-
-void backprojectPointX(const SPar3DProjection& proj, double fU, double fV,
- double fX, double &fY, double &fZ)
-{
- double px = proj.fDetSX + fU * proj.fDetUX + fV * proj.fDetVX;
- double py = proj.fDetSY + fU * proj.fDetUY + fV * proj.fDetVY;
- double pz = proj.fDetSZ + fU * proj.fDetUZ + fV * proj.fDetVZ;
-
- double a = (fX - px) / proj.fRayX;
-
- fY = py + a * proj.fRayY;
- fZ = pz + a * proj.fRayZ;
-}
-
-void backprojectPointY(const SPar3DProjection& proj, double fU, double fV,
- double fY, double &fX, double &fZ)
-{
- double px = proj.fDetSX + fU * proj.fDetUX + fV * proj.fDetVX;
- double py = proj.fDetSY + fU * proj.fDetUY + fV * proj.fDetVY;
- double pz = proj.fDetSZ + fU * proj.fDetUZ + fV * proj.fDetVZ;
-
- double a = (fY - py) / proj.fRayY;
-
- fX = px + a * proj.fRayX;
- fZ = pz + a * proj.fRayZ;
-
-}
-
-void backprojectPointZ(const SPar3DProjection& proj, double fU, double fV,
- double fZ, double &fX, double &fY)
-{
- double px = proj.fDetSX + fU * proj.fDetUX + fV * proj.fDetVX;
- double py = proj.fDetSY + fU * proj.fDetUY + fV * proj.fDetVY;
- double pz = proj.fDetSZ + fU * proj.fDetUZ + fV * proj.fDetVZ;
-
- double a = (fZ - pz) / proj.fRayZ;
-
- fX = px + a * proj.fRayX;
- fY = py + a * proj.fRayY;
-}
-
-
-
-void backprojectPointX(const SConeProjection& proj, double fU, double fV,
- double fX, double &fY, double &fZ)
-{
- double px = proj.fDetSX + fU * proj.fDetUX + fV * proj.fDetVX;
- double py = proj.fDetSY + fU * proj.fDetUY + fV * proj.fDetVY;
- double pz = proj.fDetSZ + fU * proj.fDetUZ + fV * proj.fDetVZ;
-
- double a = (fX - proj.fSrcX) / (px - proj.fSrcX);
-
- fY = proj.fSrcY + a * (py - proj.fSrcY);
- fZ = proj.fSrcZ + a * (pz - proj.fSrcZ);
-}
-
-void backprojectPointY(const SConeProjection& proj, double fU, double fV,
- double fY, double &fX, double &fZ)
-{
- double px = proj.fDetSX + fU * proj.fDetUX + fV * proj.fDetVX;
- double py = proj.fDetSY + fU * proj.fDetUY + fV * proj.fDetVY;
- double pz = proj.fDetSZ + fU * proj.fDetUZ + fV * proj.fDetVZ;
-
- double a = (fY - proj.fSrcY) / (py - proj.fSrcY);
-
- fX = proj.fSrcX + a * (px - proj.fSrcX);
- fZ = proj.fSrcZ + a * (pz - proj.fSrcZ);
-}
-
-void backprojectPointZ(const SConeProjection& proj, double fU, double fV,
- double fZ, double &fX, double &fY)
-{
- double px = proj.fDetSX + fU * proj.fDetUX + fV * proj.fDetVX;
- double py = proj.fDetSY + fU * proj.fDetUY + fV * proj.fDetVY;
- double pz = proj.fDetSZ + fU * proj.fDetUZ + fV * proj.fDetVZ;
-
- double a = (fZ - proj.fSrcZ) / (pz - proj.fSrcZ);
-
- fX = proj.fSrcX + a * (px - proj.fSrcX);
- fY = proj.fSrcY + a * (py - proj.fSrcY);
-}
-
-
}
diff --git a/src/Globals.cpp b/src/Globals.cpp
index 5f32482..a3c7a0a 100644
--- a/src/Globals.cpp
+++ b/src/Globals.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
@@ -43,11 +43,11 @@ _AstraExport bool cudaAvailable() {
static bool (*pShouldAbortHook)(void) = 0;
-void setShouldAbortHook(bool (*_pShouldAbortHook)(void)) {
+_AstraExport void setShouldAbortHook(bool (*_pShouldAbortHook)(void)) {
pShouldAbortHook = _pShouldAbortHook;
}
-bool shouldAbort() {
+_AstraExport bool shouldAbort() {
if (pShouldAbortHook && (*pShouldAbortHook)())
return true;
diff --git a/src/Logging.cpp b/src/Logging.cpp
index c9513fc..560d404 100644
--- a/src/Logging.cpp
+++ b/src/Logging.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/ParallelBeamBlobKernelProjector2D.cpp b/src/ParallelBeamBlobKernelProjector2D.cpp
index 0fb658f..eca72a2 100644
--- a/src/ParallelBeamBlobKernelProjector2D.cpp
+++ b/src/ParallelBeamBlobKernelProjector2D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/ParallelBeamDistanceDrivenProjector2D.cpp b/src/ParallelBeamDistanceDrivenProjector2D.cpp
index 531bef9..97e2eac 100644
--- a/src/ParallelBeamDistanceDrivenProjector2D.cpp
+++ b/src/ParallelBeamDistanceDrivenProjector2D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/ParallelBeamLineKernelProjector2D.cpp b/src/ParallelBeamLineKernelProjector2D.cpp
index 1765df3..5961e28 100644
--- a/src/ParallelBeamLineKernelProjector2D.cpp
+++ b/src/ParallelBeamLineKernelProjector2D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/ParallelBeamLinearKernelProjector2D.cpp b/src/ParallelBeamLinearKernelProjector2D.cpp
index 120b1a2..c1ce1fe 100644
--- a/src/ParallelBeamLinearKernelProjector2D.cpp
+++ b/src/ParallelBeamLinearKernelProjector2D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/ParallelBeamStripKernelProjector2D.cpp b/src/ParallelBeamStripKernelProjector2D.cpp
index d2086da..ba70cd2 100644
--- a/src/ParallelBeamStripKernelProjector2D.cpp
+++ b/src/ParallelBeamStripKernelProjector2D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/ParallelProjectionGeometry2D.cpp b/src/ParallelProjectionGeometry2D.cpp
index 0622795..8c3b976 100644
--- a/src/ParallelProjectionGeometry2D.cpp
+++ b/src/ParallelProjectionGeometry2D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/ParallelProjectionGeometry3D.cpp b/src/ParallelProjectionGeometry3D.cpp
index 8b0585c..1d29ad6 100644
--- a/src/ParallelProjectionGeometry3D.cpp
+++ b/src/ParallelProjectionGeometry3D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
@@ -215,79 +215,6 @@ CParallelProjectionGeometry2D * CParallelProjectionGeometry3D::createProjectionG
return pOutput;
}
-void CParallelProjectionGeometry3D::backprojectPointX(int iAngleIndex, double fU, double fV,
- double fX, double &fY, double &fZ) const
-{
- ASTRA_ASSERT(iAngleIndex >= 0);
- ASTRA_ASSERT(iAngleIndex < m_iProjectionAngleCount);
-
- SPar3DProjection *projs = genPar3DProjections(1, m_iDetectorColCount, m_iDetectorRowCount,
- m_fDetectorSpacingX, m_fDetectorSpacingY,
- &m_pfProjectionAngles[iAngleIndex]);
-
- SPar3DProjection &proj = projs[0];
-
- double px = proj.fDetSX + fU * proj.fDetUX + fV * proj.fDetVX;
- double py = proj.fDetSY + fU * proj.fDetUY + fV * proj.fDetVY;
- double pz = proj.fDetSZ + fU * proj.fDetUZ + fV * proj.fDetVZ;
-
- double a = (fX - px) / proj.fRayX;
-
- fY = py + a * proj.fRayY;
- fZ = pz + a * proj.fRayZ;
-
- delete[] projs;
-}
-
-void CParallelProjectionGeometry3D::backprojectPointY(int iAngleIndex, double fU, double fV,
- double fY, double &fX, double &fZ) const
-{
- ASTRA_ASSERT(iAngleIndex >= 0);
- ASTRA_ASSERT(iAngleIndex < m_iProjectionAngleCount);
-
- SPar3DProjection *projs = genPar3DProjections(1, m_iDetectorColCount, m_iDetectorRowCount,
- m_fDetectorSpacingX, m_fDetectorSpacingY,
- &m_pfProjectionAngles[iAngleIndex]);
-
- SPar3DProjection &proj = projs[0];
-
- double px = proj.fDetSX + fU * proj.fDetUX + fV * proj.fDetVX;
- double py = proj.fDetSY + fU * proj.fDetUY + fV * proj.fDetVY;
- double pz = proj.fDetSZ + fU * proj.fDetUZ + fV * proj.fDetVZ;
-
- double a = (fY - py) / proj.fRayY;
-
- fX = px + a * proj.fRayX;
- fZ = pz + a * proj.fRayZ;
-
- delete[] projs;
-}
-
-void CParallelProjectionGeometry3D::backprojectPointZ(int iAngleIndex, double fU, double fV,
- double fZ, double &fX, double &fY) const
-{
- ASTRA_ASSERT(iAngleIndex >= 0);
- ASTRA_ASSERT(iAngleIndex < m_iProjectionAngleCount);
-
- SPar3DProjection *projs = genPar3DProjections(1, m_iDetectorColCount, m_iDetectorRowCount,
- m_fDetectorSpacingX, m_fDetectorSpacingY,
- &m_pfProjectionAngles[iAngleIndex]);
-
- SPar3DProjection &proj = projs[0];
-
- double px = proj.fDetSX + fU * proj.fDetUX + fV * proj.fDetVX;
- double py = proj.fDetSY + fU * proj.fDetUY + fV * proj.fDetVY;
- double pz = proj.fDetSZ + fU * proj.fDetUZ + fV * proj.fDetVZ;
-
- double a = (fZ - pz) / proj.fRayZ;
-
- fX = px + a * proj.fRayX;
- fY = py + a * proj.fRayY;
-
- delete[] projs;
-}
-
-
//----------------------------------------------------------------------------------------
} // end namespace astra
diff --git a/src/ParallelVecProjectionGeometry2D.cpp b/src/ParallelVecProjectionGeometry2D.cpp
index 0994b55..4f3d8c4 100644
--- a/src/ParallelVecProjectionGeometry2D.cpp
+++ b/src/ParallelVecProjectionGeometry2D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/ParallelVecProjectionGeometry3D.cpp b/src/ParallelVecProjectionGeometry3D.cpp
index 5dc3df8..78e6d9d 100644
--- a/src/ParallelVecProjectionGeometry3D.cpp
+++ b/src/ParallelVecProjectionGeometry3D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
@@ -256,61 +256,6 @@ void CParallelVecProjectionGeometry3D::projectPoint(double fX, double fY, double
}
-void CParallelVecProjectionGeometry3D::backprojectPointX(int iAngleIndex, double fU, double fV,
- double fX, double &fY, double &fZ) const
-{
- ASTRA_ASSERT(iAngleIndex >= 0);
- ASTRA_ASSERT(iAngleIndex < m_iProjectionAngleCount);
-
- SPar3DProjection &proj = m_pProjectionAngles[iAngleIndex];
-
- double px = proj.fDetSX + fU * proj.fDetUX + fV * proj.fDetVX;
- double py = proj.fDetSY + fU * proj.fDetUY + fV * proj.fDetVY;
- double pz = proj.fDetSZ + fU * proj.fDetUZ + fV * proj.fDetVZ;
-
- double a = (fX - px) / proj.fRayX;
-
- fY = py + a * proj.fRayY;
- fZ = pz + a * proj.fRayZ;
-}
-
-void CParallelVecProjectionGeometry3D::backprojectPointY(int iAngleIndex, double fU, double fV,
- double fY, double &fX, double &fZ) const
-{
- ASTRA_ASSERT(iAngleIndex >= 0);
- ASTRA_ASSERT(iAngleIndex < m_iProjectionAngleCount);
-
- SPar3DProjection &proj = m_pProjectionAngles[iAngleIndex];
-
- double px = proj.fDetSX + fU * proj.fDetUX + fV * proj.fDetVX;
- double py = proj.fDetSY + fU * proj.fDetUY + fV * proj.fDetVY;
- double pz = proj.fDetSZ + fU * proj.fDetUZ + fV * proj.fDetVZ;
-
- double a = (fY - py) / proj.fRayY;
-
- fX = px + a * proj.fRayX;
- fZ = pz + a * proj.fRayZ;
-}
-
-void CParallelVecProjectionGeometry3D::backprojectPointZ(int iAngleIndex, double fU, double fV,
- double fZ, double &fX, double &fY) const
-{
- ASTRA_ASSERT(iAngleIndex >= 0);
- ASTRA_ASSERT(iAngleIndex < m_iProjectionAngleCount);
-
- SPar3DProjection &proj = m_pProjectionAngles[iAngleIndex];
-
- double px = proj.fDetSX + fU * proj.fDetUX + fV * proj.fDetVX;
- double py = proj.fDetSY + fU * proj.fDetUY + fV * proj.fDetVY;
- double pz = proj.fDetSZ + fU * proj.fDetUZ + fV * proj.fDetVZ;
-
- double a = (fZ - pz) / proj.fRayZ;
-
- fX = px + a * proj.fRayX;
- fY = py + a * proj.fRayY;
-}
-
-
//----------------------------------------------------------------------------------------
bool CParallelVecProjectionGeometry3D::_check()
diff --git a/src/PlatformDepSystemCode.cpp b/src/PlatformDepSystemCode.cpp
index d70cce7..d93d6f5 100644
--- a/src/PlatformDepSystemCode.cpp
+++ b/src/PlatformDepSystemCode.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/PluginAlgorithmFactory.cpp b/src/PluginAlgorithmFactory.cpp
index a6b445f..420e22c 100644
--- a/src/PluginAlgorithmFactory.cpp
+++ b/src/PluginAlgorithmFactory.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/ProjectionGeometry2D.cpp b/src/ProjectionGeometry2D.cpp
index 93dd5c6..87dc816 100644
--- a/src/ProjectionGeometry2D.cpp
+++ b/src/ProjectionGeometry2D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/ProjectionGeometry3D.cpp b/src/ProjectionGeometry3D.cpp
index 8d2dc76..71c8df5 100644
--- a/src/ProjectionGeometry3D.cpp
+++ b/src/ProjectionGeometry3D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/Projector2D.cpp b/src/Projector2D.cpp
index aae3b13..bb73a88 100644
--- a/src/Projector2D.cpp
+++ b/src/Projector2D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/Projector3D.cpp b/src/Projector3D.cpp
index 2623f7e..32fd6ff 100644
--- a/src/Projector3D.cpp
+++ b/src/Projector3D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/ReconstructionAlgorithm2D.cpp b/src/ReconstructionAlgorithm2D.cpp
index 781b391..a75b0c4 100644
--- a/src/ReconstructionAlgorithm2D.cpp
+++ b/src/ReconstructionAlgorithm2D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/ReconstructionAlgorithm3D.cpp b/src/ReconstructionAlgorithm3D.cpp
index 86be290..14ff2e6 100644
--- a/src/ReconstructionAlgorithm3D.cpp
+++ b/src/ReconstructionAlgorithm3D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/SartAlgorithm.cpp b/src/SartAlgorithm.cpp
index 7a3947d..05162cd 100644
--- a/src/SartAlgorithm.cpp
+++ b/src/SartAlgorithm.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/SirtAlgorithm.cpp b/src/SirtAlgorithm.cpp
index f08e8b2..3a67d41 100644
--- a/src/SirtAlgorithm.cpp
+++ b/src/SirtAlgorithm.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/SparseMatrix.cpp b/src/SparseMatrix.cpp
index 34f032c..893a4a0 100644
--- a/src/SparseMatrix.cpp
+++ b/src/SparseMatrix.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/SparseMatrixProjectionGeometry2D.cpp b/src/SparseMatrixProjectionGeometry2D.cpp
index e8165a3..dae26d4 100644
--- a/src/SparseMatrixProjectionGeometry2D.cpp
+++ b/src/SparseMatrixProjectionGeometry2D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/SparseMatrixProjector2D.cpp b/src/SparseMatrixProjector2D.cpp
index 46302f3..ef6fe3c 100644
--- a/src/SparseMatrixProjector2D.cpp
+++ b/src/SparseMatrixProjector2D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/Utilities.cpp b/src/Utilities.cpp
index b14b444..d69b0b8 100644
--- a/src/Utilities.cpp
+++ b/src/Utilities.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/Vector3D.cpp b/src/Vector3D.cpp
index 40c40c5..d158138 100644
--- a/src/Vector3D.cpp
+++ b/src/Vector3D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/VolumeGeometry2D.cpp b/src/VolumeGeometry2D.cpp
index b27caa8..d326995 100644
--- a/src/VolumeGeometry2D.cpp
+++ b/src/VolumeGeometry2D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/VolumeGeometry3D.cpp b/src/VolumeGeometry3D.cpp
index eb8cc60..a9f8ae1 100644
--- a/src/VolumeGeometry3D.cpp
+++ b/src/VolumeGeometry3D.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/XMLDocument.cpp b/src/XMLDocument.cpp
index 65cb0b6..53823d0 100644
--- a/src/XMLDocument.cpp
+++ b/src/XMLDocument.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/
diff --git a/src/XMLNode.cpp b/src/XMLNode.cpp
index 35774d8..78ed58b 100644
--- a/src/XMLNode.cpp
+++ b/src/XMLNode.cpp
@@ -1,7 +1,7 @@
/*
-----------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
- 2014-2018, CWI, Amsterdam
+Copyright: 2010-2021, imec Vision Lab, University of Antwerp
+ 2014-2021, CWI, Amsterdam
Contact: astra@astra-toolbox.com
Website: http://www.astra-toolbox.com/