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/3d/cgls3d.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/3d/cgls3d.cu')
| -rw-r--r-- | cuda/3d/cgls3d.cu | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cuda/3d/cgls3d.cu b/cuda/3d/cgls3d.cu index 5071a9b..dd0e8a0 100644 --- a/cuda/3d/cgls3d.cu +++ b/cuda/3d/cgls3d.cu @@ -165,7 +165,7 @@ bool CGLS::iterate(unsigned int iterations) // p = A'*r zeroVolumeData(D_p, dims); - callBP(D_p, D_r); + callBP(D_p, D_r, 1.0f); if (useVolumeMask) processVol3D<opMul>(D_p, D_maskData, dims); @@ -195,7 +195,7 @@ bool CGLS::iterate(unsigned int iterations) // z = A'*r zeroVolumeData(D_z, dims); - callBP(D_z, D_r); + callBP(D_z, D_r, 1.0f); if (useVolumeMask) processVol3D<opMul>(D_z, D_maskData, dims); @@ -242,7 +242,7 @@ bool doCGLS(cudaPitchedPtr& D_volumeData, CGLS cgls; bool ok = true; - ok &= cgls.setConeGeometry(dims, angles); + ok &= cgls.setConeGeometry(dims, angles, 1.0f); if (D_maskData.ptr) ok &= cgls.enableVolumeMask(); |