summaryrefslogtreecommitdiffstats
path: root/src/CudaCglsAlgorithm.cpp
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-10-08 11:24:49 +0200
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-10-09 12:10:31 +0200
commit003663649a191fc5bc011d6e5424496576b5e793 (patch)
treec7ae9cc0b3982ca461038f8c678dae834584b605 /src/CudaCglsAlgorithm.cpp
parent43a38c117405f99e3a1b498f899de4ba6d01a044 (diff)
downloadastra-003663649a191fc5bc011d6e5424496576b5e793.tar.gz
astra-003663649a191fc5bc011d6e5424496576b5e793.tar.bz2
astra-003663649a191fc5bc011d6e5424496576b5e793.tar.xz
astra-003663649a191fc5bc011d6e5424496576b5e793.zip
Improve option passing through CudaProjector2D
Not all constructors were reading options from the projector. Also allow passing GPUIndex via CudaProjector2D. Also refactor CudaReconstructionAlgorithm::initialize/check to avoid code duplication with ReconstructionAlgorithm.
Diffstat (limited to 'src/CudaCglsAlgorithm.cpp')
-rw-r--r--src/CudaCglsAlgorithm.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/CudaCglsAlgorithm.cpp b/src/CudaCglsAlgorithm.cpp
index 0cedff6..9dd4f78 100644
--- a/src/CudaCglsAlgorithm.cpp
+++ b/src/CudaCglsAlgorithm.cpp
@@ -77,11 +77,9 @@ bool CCudaCglsAlgorithm::initialize(const Config& _cfg)
// Initialize - C++
bool CCudaCglsAlgorithm::initialize(CProjector2D* _pProjector,
CFloat32ProjectionData2D* _pSinogram,
- CFloat32VolumeData2D* _pReconstruction,
- int _iGPUindex, int _iDetectorSuperSampling,
- int _iPixelSuperSampling)
+ CFloat32VolumeData2D* _pReconstruction)
{
- m_bIsInitialized = CCudaReconstructionAlgorithm2D::initialize(_pProjector, _pSinogram, _pReconstruction, _iGPUindex, _iDetectorSuperSampling, _iPixelSuperSampling);
+ m_bIsInitialized = CCudaReconstructionAlgorithm2D::initialize(_pProjector, _pSinogram, _pReconstruction);
if (!m_bIsInitialized)
return false;