summaryrefslogtreecommitdiffstats
path: root/src/CudaFDKAlgorithm3D.cpp
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <wjp@usecode.org>2016-10-07 16:28:41 +0200
committerGitHub <noreply@github.com>2016-10-07 16:28:41 +0200
commit8f2b55a66db9747419e75dae5973281a7536b934 (patch)
treee7ca39da75ad5c9d728698295ac9c8ec32e4e499 /src/CudaFDKAlgorithm3D.cpp
parente4b8b6e94be7c5f7dbaad51543c5eace8882a115 (diff)
parente835d5d588b7404037289c7b5cfa1475e931ba44 (diff)
downloadastra-8f2b55a66db9747419e75dae5973281a7536b934.tar.gz
astra-8f2b55a66db9747419e75dae5973281a7536b934.tar.bz2
astra-8f2b55a66db9747419e75dae5973281a7536b934.tar.xz
astra-8f2b55a66db9747419e75dae5973281a7536b934.zip
Merge pull request #42 from wjp/FDK
Use CompositeGeometryManager for FDK
Diffstat (limited to 'src/CudaFDKAlgorithm3D.cpp')
-rw-r--r--src/CudaFDKAlgorithm3D.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/CudaFDKAlgorithm3D.cpp b/src/CudaFDKAlgorithm3D.cpp
index e101a42..c7c8ed5 100644
--- a/src/CudaFDKAlgorithm3D.cpp
+++ b/src/CudaFDKAlgorithm3D.cpp
@@ -32,6 +32,7 @@ $Id$
#include "astra/CudaProjector3D.h"
#include "astra/ConeProjectionGeometry3D.h"
+#include "astra/CompositeGeometryManager.h"
#include "astra/Logging.h"
@@ -206,6 +207,7 @@ void CCudaFDKAlgorithm3D::run(int _iNrIterations)
ASTRA_ASSERT(pReconMem);
+#if 0
bool ok = true;
ok = astraCudaFDK(pReconMem->getData(), pSinoMem->getDataConst(),
@@ -213,6 +215,13 @@ void CCudaFDKAlgorithm3D::run(int _iNrIterations)
m_bShortScan, m_iGPUIndex, m_iVoxelSuperSampling);
ASTRA_ASSERT(ok);
+#endif
+
+ CCompositeGeometryManager cgm;
+
+ cgm.doFDK(m_pProjector, pReconMem, pSinoMem, m_bShortScan);
+
+
}
//----------------------------------------------------------------------------------------