summaryrefslogtreecommitdiffstats
path: root/src/CudaFDKAlgorithm3D.cpp
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <wjp@usecode.org>2018-07-18 11:46:05 +0200
committerGitHub <noreply@github.com>2018-07-18 11:46:05 +0200
commit93612c333d6aa0f7d80bd286d9983ce5047a0fd8 (patch)
treee78ac8d69f659b7c9c59e121f7dfb9cba8e5004f /src/CudaFDKAlgorithm3D.cpp
parent0d06afc38d7a8443a079d25d72ec4b4b15353974 (diff)
parent4d741fc8e6c7930f7a8e27f54c55e0ad4949ed07 (diff)
downloadastra-93612c333d6aa0f7d80bd286d9983ce5047a0fd8.tar.gz
astra-93612c333d6aa0f7d80bd286d9983ce5047a0fd8.tar.bz2
astra-93612c333d6aa0f7d80bd286d9983ce5047a0fd8.tar.xz
astra-93612c333d6aa0f7d80bd286d9983ce5047a0fd8.zip
Merge pull request #160 from wjp/FBP_filters
Custom filter support for CPU FBP
Diffstat (limited to 'src/CudaFDKAlgorithm3D.cpp')
-rw-r--r--src/CudaFDKAlgorithm3D.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/CudaFDKAlgorithm3D.cpp b/src/CudaFDKAlgorithm3D.cpp
index 4d8fc5a..24ed04f 100644
--- a/src/CudaFDKAlgorithm3D.cpp
+++ b/src/CudaFDKAlgorithm3D.cpp
@@ -35,9 +35,9 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
#include "astra/CompositeGeometryManager.h"
#include "astra/Logging.h"
+#include "astra/Filters.h"
#include "astra/cuda/3d/astra3d.h"
-#include "astra/cuda/2d/fft.h"
#include "astra/cuda/3d/util3d.h"
using namespace std;
@@ -156,7 +156,7 @@ bool CCudaFDKAlgorithm3D::initialize(const Config& _cfg)
const CProjectionGeometry3D* projgeom = m_pSinogram->getGeometry();
const CProjectionGeometry2D* filtgeom = pFilterData->getGeometry();
int iPaddedDetCount = calcNextPowerOfTwo(2 * projgeom->getDetectorColCount());
- int iHalfFFTSize = astraCUDA::calcFFTFourierSize(iPaddedDetCount);
+ int iHalfFFTSize = calcFFTFourierSize(iPaddedDetCount);
if(filtgeom->getDetectorCount()!=iHalfFFTSize || filtgeom->getProjectionAngleCount()!=projgeom->getProjectionCount()){
ASTRA_ERROR("Filter size does not match required size (%i angles, %i detectors)",projgeom->getProjectionCount(),iHalfFFTSize);
return false;