summaryrefslogtreecommitdiffstats
path: root/include/astra/CudaCglsAlgorithm.h
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-12-02 15:29:58 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-12-02 15:29:58 +0100
commitf637af457985fbcf6be5641e98df6d87ca622d24 (patch)
tree4c015188c6b5e33c1a9d88032f61a434063259fb /include/astra/CudaCglsAlgorithm.h
parente48d0a53730bb7faa2463a64db0989ba341e12b8 (diff)
parent6d57f7874713e6632c2e49590538c6a48ddcc311 (diff)
downloadastra-f637af457985fbcf6be5641e98df6d87ca622d24.tar.gz
astra-f637af457985fbcf6be5641e98df6d87ca622d24.tar.bz2
astra-f637af457985fbcf6be5641e98df6d87ca622d24.tar.xz
astra-f637af457985fbcf6be5641e98df6d87ca622d24.zip
Merge branch 'master' into volgeom3d
Diffstat (limited to 'include/astra/CudaCglsAlgorithm.h')
-rw-r--r--include/astra/CudaCglsAlgorithm.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/include/astra/CudaCglsAlgorithm.h b/include/astra/CudaCglsAlgorithm.h
index c51093c..6aa0343 100644
--- a/include/astra/CudaCglsAlgorithm.h
+++ b/include/astra/CudaCglsAlgorithm.h
@@ -91,18 +91,13 @@ public:
/** Initialize class, use sequential order.
*
- * @param _pProjector Projector Object. (Ignored)
+ * @param _pProjector Projector Object. (Optional)
* @param _pSinogram ProjectionData2D object containing the sinogram
* @param _pReconstruction VolumeData2D for storing the reconstruction
- * @param _iGPUindex Index of GPU to use. (Starting at 0.)
- * @param _iDetectorSuperSampling Supersampling factor for the FP.
- * @param _iPixelSuperSampling Square root of number of samples per voxel, used to compute the backprojection
*/
bool initialize(CProjector2D* _pProjector,
CFloat32ProjectionData2D* _pSinogram,
- CFloat32VolumeData2D* _pReconstruction,
- int _iGPUindex = -1, int _iDetectorSuperSampling = 1,
- int _iPixelSuperSampling = 1);
+ CFloat32VolumeData2D* _pReconstruction);
/** Get a description of the class.
*