From 399422985fd27a1e6a1f8cea3642402128b050fa Mon Sep 17 00:00:00 2001 From: "Daniel M. Pelt" Date: Fri, 20 May 2016 15:10:03 +0200 Subject: Add option to specify custom filter for FDK --- include/astra/CudaFDKAlgorithm3D.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/astra/CudaFDKAlgorithm3D.h') 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(); -- cgit v1.2.3 From 71db6331f8dd0d5abbeee92977af01293be4f427 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Mon, 28 Nov 2016 15:54:07 +0100 Subject: Update headers (website+2016) --- include/astra/CudaFDKAlgorithm3D.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'include/astra/CudaFDKAlgorithm3D.h') diff --git a/include/astra/CudaFDKAlgorithm3D.h b/include/astra/CudaFDKAlgorithm3D.h index 477bf34..386129e 100644 --- a/include/astra/CudaFDKAlgorithm3D.h +++ b/include/astra/CudaFDKAlgorithm3D.h @@ -1,10 +1,10 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp - 2014-2015, CWI, Amsterdam +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/ This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see . ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_CUDAFDKALGORITHM3D -- cgit v1.2.3 From d85a660f064e8130b27e11c7fd762221c754c315 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Thu, 26 Jan 2017 14:57:57 +0100 Subject: Start work on CFloat32Data3DGPU to allow persistent/external GPU memory --- include/astra/CudaFDKAlgorithm3D.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/astra/CudaFDKAlgorithm3D.h') diff --git a/include/astra/CudaFDKAlgorithm3D.h b/include/astra/CudaFDKAlgorithm3D.h index 386129e..1c4c622 100644 --- a/include/astra/CudaFDKAlgorithm3D.h +++ b/include/astra/CudaFDKAlgorithm3D.h @@ -81,8 +81,8 @@ public: * @param _pReconstruction VolumeData3D object for storing the reconstructed volume. */ CCudaFDKAlgorithm3D(CProjector3D* _pProjector, - CFloat32ProjectionData3DMemory* _pProjectionData, - CFloat32VolumeData3DMemory* _pReconstruction); + CFloat32ProjectionData3D* _pProjectionData, + CFloat32VolumeData3D* _pReconstruction); /** Copy constructor. */ @@ -111,8 +111,8 @@ public: * @return initialization successful? */ bool initialize(CProjector3D* _pProjector, - CFloat32ProjectionData3DMemory* _pSinogram, - CFloat32VolumeData3DMemory* _pReconstruction); + CFloat32ProjectionData3D* _pSinogram, + CFloat32VolumeData3D* _pReconstruction); /** Get all information parameters * -- cgit v1.2.3 From 27e23f29f368e06315f2ea381ef38a3affa93c64 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Thu, 16 Feb 2017 14:37:44 +0100 Subject: Remove using namespace std; from headers --- include/astra/CudaFDKAlgorithm3D.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/astra/CudaFDKAlgorithm3D.h') diff --git a/include/astra/CudaFDKAlgorithm3D.h b/include/astra/CudaFDKAlgorithm3D.h index 1c4c622..1189651 100644 --- a/include/astra/CudaFDKAlgorithm3D.h +++ b/include/astra/CudaFDKAlgorithm3D.h @@ -118,7 +118,7 @@ public: * * @return map with all boost::any object */ - virtual map getInformation(); + virtual std::map getInformation(); /** Get a single piece of information represented as a boost::any * -- cgit v1.2.3