diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2014-06-03 09:05:39 +0000 |
|---|---|---|
| committer | wpalenst <Willem.Jan.Palenstijn@cwi.nl> | 2014-06-03 09:05:39 +0000 |
| commit | 63594f898b3581b0743b3540a70c30b9b76a0362 (patch) | |
| tree | de8763952f130d4add7d5325fd7eb35fae41e344 | |
| parent | 439a41fecd9714800a653142a14f84061ad53242 (diff) | |
| download | astra-63594f898b3581b0743b3540a70c30b9b76a0362.tar.gz astra-63594f898b3581b0743b3540a70c30b9b76a0362.tar.bz2 astra-63594f898b3581b0743b3540a70c30b9b76a0362.tar.xz astra-63594f898b3581b0743b3540a70c30b9b76a0362.zip | |
Fix FDK_CUDA output scale
| -rw-r--r-- | cuda/3d/arith3d.cu | 1 | ||||
| -rw-r--r-- | cuda/3d/fdk.cu | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/cuda/3d/arith3d.cu b/cuda/3d/arith3d.cu index cc96da5..f5badad 100644 --- a/cuda/3d/arith3d.cu +++ b/cuda/3d/arith3d.cu @@ -602,6 +602,7 @@ INST_DtoD(opMul) INST_DtoD(opAdd) INST_DtoD(opDividedBy) INST_toD(opInvert) +INST_FtoD(opMul) INST_FtoD(opSet) INST_FtoD(opClampMin) INST_FtoD(opClampMax) diff --git a/cuda/3d/fdk.cu b/cuda/3d/fdk.cu index 45b6a28..d1c23c6 100644 --- a/cuda/3d/fdk.cu +++ b/cuda/3d/fdk.cu @@ -40,6 +40,7 @@ $Id$ #endif #include "dims3d.h" +#include "arith3d.h" #include "../2d/fft.h" typedef texture<float, 3, cudaReadModeElementType> texture3D; @@ -443,6 +444,9 @@ bool FDK(cudaPitchedPtr D_volumeData, if (!ok) return false; + processVol3D<opMul>(D_volumeData, + (M_PI / 2.0f) / (float)dims.iProjAngles, dims); + return true; } |