diff options
author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-11-22 17:30:28 +0100 |
---|---|---|
committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-11-22 17:30:28 +0100 |
commit | 985057bb58bdb85a31fd883f2651fce9fb3fad16 (patch) | |
tree | 69ad722aa934307adcd8cc9834d6437961b3215a /src/CudaFDKAlgorithm3D.cpp | |
parent | a527cc9e29cae256bd095b032f34c80957e84907 (diff) | |
parent | 231a6de483e94507de34bd2f79317d875bbb354b (diff) | |
download | astra-985057bb58bdb85a31fd883f2651fce9fb3fad16.tar.gz astra-985057bb58bdb85a31fd883f2651fce9fb3fad16.tar.bz2 astra-985057bb58bdb85a31fd883f2651fce9fb3fad16.tar.xz astra-985057bb58bdb85a31fd883f2651fce9fb3fad16.zip |
Merge branch 'master' into parallel_vec
Diffstat (limited to 'src/CudaFDKAlgorithm3D.cpp')
-rw-r--r-- | src/CudaFDKAlgorithm3D.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/CudaFDKAlgorithm3D.cpp b/src/CudaFDKAlgorithm3D.cpp index 6616a85..00e908e 100644 --- a/src/CudaFDKAlgorithm3D.cpp +++ b/src/CudaFDKAlgorithm3D.cpp @@ -31,6 +31,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "astra/CudaProjector3D.h" #include "astra/ConeProjectionGeometry3D.h" +#include "astra/ConeVecProjectionGeometry3D.h" #include "astra/CompositeGeometryManager.h" #include "astra/Logging.h" @@ -82,7 +83,7 @@ bool CCudaFDKAlgorithm3D::_check() ASTRA_CONFIG_CHECK(CReconstructionAlgorithm3D::_check(), "CUDA_FDK", "Error in ReconstructionAlgorithm3D initialization"); const CProjectionGeometry3D* projgeom = m_pSinogram->getGeometry(); - ASTRA_CONFIG_CHECK(dynamic_cast<const CConeProjectionGeometry3D*>(projgeom), "CUDA_FDK", "Error setting FDK geometry"); + ASTRA_CONFIG_CHECK(dynamic_cast<const CConeProjectionGeometry3D*>(projgeom) || dynamic_cast<const CConeVecProjectionGeometry3D*>(projgeom), "CUDA_FDK", "Error setting FDK geometry"); const CVolumeGeometry3D* volgeom = m_pReconstruction->getGeometry(); |