diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2016-10-07 16:28:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-07 16:28:41 +0200 |
| commit | 8f2b55a66db9747419e75dae5973281a7536b934 (patch) | |
| tree | e7ca39da75ad5c9d728698295ac9c8ec32e4e499 /cuda/2d | |
| parent | e4b8b6e94be7c5f7dbaad51543c5eace8882a115 (diff) | |
| parent | e835d5d588b7404037289c7b5cfa1475e931ba44 (diff) | |
| download | astra-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 'cuda/2d')
| -rw-r--r-- | cuda/2d/astra.cu | 2 | ||||
| -rw-r--r-- | cuda/2d/fft.cu | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cuda/2d/astra.cu b/cuda/2d/astra.cu index 7317d69..b56ddf9 100644 --- a/cuda/2d/astra.cu +++ b/cuda/2d/astra.cu @@ -343,7 +343,7 @@ bool AstraFBP::run() dims3d.iProjV = 1; astraCUDA3d::FDK_PreWeight(tmp, pData->fOriginSourceDistance, - pData->fOriginDetectorDistance, 0.0f, 0.0f, + pData->fOriginDetectorDistance, 0.0f, pData->dims.fDetScale, 1.0f, // TODO: Are these correct? pData->bShortScan, dims3d, pData->angles); } diff --git a/cuda/2d/fft.cu b/cuda/2d/fft.cu index 2d259a9..3dd1c22 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; |