diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-11-28 13:41:08 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-11-28 13:41:08 +0100 |
| commit | 9101748879d81e8aafe7c77ecc4c8b2175390335 (patch) | |
| tree | e5c05f226b45d4fb910dda5fab74ff760d9e27a0 /include/astra | |
| parent | eeffd2d9748b8912b384a5764b808f5bfc850ade (diff) | |
| parent | 4a12901ad7b08021b2adad1241bf750aec4a3d2d (diff) | |
| download | astra-9101748879d81e8aafe7c77ecc4c8b2175390335.tar.gz astra-9101748879d81e8aafe7c77ecc4c8b2175390335.tar.bz2 astra-9101748879d81e8aafe7c77ecc4c8b2175390335.tar.xz astra-9101748879d81e8aafe7c77ecc4c8b2175390335.zip | |
Merge branch 'fdk_custom_filter'
Diffstat (limited to 'include/astra')
| -rw-r--r-- | include/astra/CompositeGeometryManager.h | 4 | ||||
| -rw-r--r-- | include/astra/CudaFDKAlgorithm3D.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/astra/CompositeGeometryManager.h b/include/astra/CompositeGeometryManager.h index 064370a..d30ffd1 100644 --- a/include/astra/CompositeGeometryManager.h +++ b/include/astra/CompositeGeometryManager.h @@ -57,6 +57,7 @@ struct SGPUParams { struct SFDKSettings { bool bShortScan; + const float *pfFilter; }; @@ -161,7 +162,8 @@ public: bool doBP(CProjector3D *pProjector, CFloat32VolumeData3DMemory *pVolData, CFloat32ProjectionData3DMemory *pProjData); bool doFDK(CProjector3D *pProjector, CFloat32VolumeData3DMemory *pVolData, - CFloat32ProjectionData3DMemory *pProjData, bool bShortScan); + CFloat32ProjectionData3DMemory *pProjData, bool bShortScan, + const float *pfFilter = 0); bool doFP(CProjector3D *pProjector, const std::vector<CFloat32VolumeData3DMemory *>& volData, const std::vector<CFloat32ProjectionData3DMemory *>& projData); bool doBP(CProjector3D *pProjector, const std::vector<CFloat32VolumeData3DMemory *>& volData, const std::vector<CFloat32ProjectionData3DMemory *>& projData); diff --git a/include/astra/CudaFDKAlgorithm3D.h b/include/astra/CudaFDKAlgorithm3D.h index 63f07fd..477bf34 100644 --- a/include/astra/CudaFDKAlgorithm3D.h +++ b/include/astra/CudaFDKAlgorithm3D.h @@ -151,6 +151,7 @@ protected: int m_iGPUIndex; int m_iVoxelSuperSampling; + int m_iFilterDataId; bool m_bShortScan; void initializeFromProjector(); |