diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-02-04 13:56:06 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-02-10 17:00:42 +0100 |
| commit | 559d3e599b7306e2de64f2a584d72bc5c98b692b (patch) | |
| tree | 84cce1a91b3896783361a7ebbbe6c05fd1889104 /cuda/3d/astra3d.h | |
| parent | 081355b609b11faf7f2d73414de9629e78cca2c5 (diff) | |
| download | astra-559d3e599b7306e2de64f2a584d72bc5c98b692b.tar.gz astra-559d3e599b7306e2de64f2a584d72bc5c98b692b.tar.bz2 astra-559d3e599b7306e2de64f2a584d72bc5c98b692b.tar.xz astra-559d3e599b7306e2de64f2a584d72bc5c98b692b.zip | |
Refactor CUDA projector params into struct
Diffstat (limited to 'cuda/3d/astra3d.h')
| -rw-r--r-- | cuda/3d/astra3d.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/cuda/3d/astra3d.h b/cuda/3d/astra3d.h index 2782994..1f1cee2 100644 --- a/cuda/3d/astra3d.h +++ b/cuda/3d/astra3d.h @@ -37,11 +37,6 @@ namespace astra { // TODO: Switch to a class hierarchy as with the 2D algorithms -enum Cuda3DProjectionKernel { - ker3d_default = 0, - ker3d_sum_square_weights -}; - class CProjectionGeometry3D; class CParallelProjectionGeometry3D; class CParallelVecProjectionGeometry3D; @@ -50,6 +45,10 @@ class CConeVecProjectionGeometry3D; class CVolumeGeometry3D; class AstraSIRT3d_internal; +using astraCUDA3d::Cuda3DProjectionKernel; +using astraCUDA3d::ker3d_default; +using astraCUDA3d::ker3d_sum_square_weights; + class _AstraExport AstraSIRT3d { public: @@ -289,7 +288,7 @@ bool convertAstraGeometry(const CVolumeGeometry3D* pVolGeom, const CProjectionGeometry3D* pProjGeom, SPar3DProjection*& pParProjs, SConeProjection*& pConeProjs, - float& fOutputScale); + astraCUDA3d::SProjectorParams3D& params); _AstraExport bool astraCudaFP(const float* pfVolume, float* pfProjections, const CVolumeGeometry3D* pVolGeom, |