diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-10-07 16:36:28 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-10-07 16:36:28 +0200 |
| commit | f6aa2db83dfea89f9d2cfc6fcbd3da141ee77e02 (patch) | |
| tree | 6de18fc05a9ee0cf033675aadfd8514a97d9e7d1 /cuda/2d | |
| parent | 741675b458bf23cf437a6c56f95483c5c66af774 (diff) | |
| parent | 8f2b55a66db9747419e75dae5973281a7536b934 (diff) | |
| download | astra-f6aa2db83dfea89f9d2cfc6fcbd3da141ee77e02.tar.gz astra-f6aa2db83dfea89f9d2cfc6fcbd3da141ee77e02.tar.bz2 astra-f6aa2db83dfea89f9d2cfc6fcbd3da141ee77e02.tar.xz astra-f6aa2db83dfea89f9d2cfc6fcbd3da141ee77e02.zip | |
Merge branch 'master' into parallel_vec
Diffstat (limited to 'cuda/2d')
| -rw-r--r-- | cuda/2d/fbp.cu | 3 | ||||
| -rw-r--r-- | cuda/2d/fft.cu | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cuda/2d/fbp.cu b/cuda/2d/fbp.cu index 2feac7d..04cac1e 100644 --- a/cuda/2d/fbp.cu +++ b/cuda/2d/fbp.cu @@ -297,10 +297,9 @@ bool FBP::iterate(unsigned int iterations) dims3d.iProjAngles = dims.iProjAngles; dims3d.iProjU = dims.iProjDets; dims3d.iProjV = 1; - dims3d.iRaysPerDetDim = dims3d.iRaysPerVoxelDim = 1; astraCUDA3d::FDK_PreWeight(tmp, fOriginSource, - fOriginDetector, 0.0f, 0.0f, + fOriginDetector, 0.0f, fDetSize, 1.0f, m_bShortScan, dims3d, pfAngles); } else { diff --git a/cuda/2d/fft.cu b/cuda/2d/fft.cu index 8a7cc10..f6d3cc7 100644 --- a/cuda/2d/fft.cu +++ b/cuda/2d/fft.cu @@ -35,7 +35,7 @@ $Id$ #include <fstream> #include "../../include/astra/Logging.h" -#include "astra/Fourier.h" +#include "../../include/astra/Fourier.h" using namespace astra; |