diff options
author | Willem Jan Palenstijn <wjp@usecode.org> | 2015-12-02 17:20:12 +0100 |
---|---|---|
committer | Willem Jan Palenstijn <wjp@usecode.org> | 2015-12-02 17:20:12 +0100 |
commit | fd65fb03397ded59cfb872eb361e7d2e154c3335 (patch) | |
tree | 4c015188c6b5e33c1a9d88032f61a434063259fb /cuda/2d/em.cu | |
parent | 6d57f7874713e6632c2e49590538c6a48ddcc311 (diff) | |
parent | f637af457985fbcf6be5641e98df6d87ca622d24 (diff) | |
download | astra-fd65fb03397ded59cfb872eb361e7d2e154c3335.tar.gz astra-fd65fb03397ded59cfb872eb361e7d2e154c3335.tar.bz2 astra-fd65fb03397ded59cfb872eb361e7d2e154c3335.tar.xz astra-fd65fb03397ded59cfb872eb361e7d2e154c3335.zip |
Merge pull request #91 from wjp/volgeom3d
Remove restrictions on volgeom3d
Diffstat (limited to 'cuda/2d/em.cu')
-rw-r--r-- | cuda/2d/em.cu | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cuda/2d/em.cu b/cuda/2d/em.cu index 00127c0..8593b08 100644 --- a/cuda/2d/em.cu +++ b/cuda/2d/em.cu @@ -102,7 +102,7 @@ bool EM::precomputeWeights() #endif { processSino<opSet>(D_projData, 1.0f, projPitch, dims); - callBP(D_pixelWeight, pixelPitch, D_projData, projPitch); + callBP(D_pixelWeight, pixelPitch, D_projData, projPitch, 1.0f); } processVol<opInvert>(D_pixelWeight, pixelPitch, dims); @@ -137,7 +137,7 @@ bool EM::iterate(unsigned int iterations) // Do BP of projData into tmpData zeroVolumeData(D_tmpData, tmpPitch, dims); - callBP(D_tmpData, tmpPitch, D_projData, projPitch); + callBP(D_tmpData, tmpPitch, D_projData, projPitch, 1.0f); // Multiply volumeData with tmpData divided by pixel weights processVol<opMul2>(D_volumeData, D_tmpData, D_pixelWeight, pixelPitch, dims); |