From f8c6579b910d2752f40850fbf17f045fa5de0366 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 12 Dec 2014 12:01:59 +0100 Subject: Update copyright headers --- cuda/2d/sirt.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'cuda/2d/sirt.h') diff --git a/cuda/2d/sirt.h b/cuda/2d/sirt.h index 5592616..1dbf675 100644 --- a/cuda/2d/sirt.h +++ b/cuda/2d/sirt.h @@ -1,13 +1,13 @@ /* ----------------------------------------------------------------------- -Copyright 2012 iMinds-Vision Lab, University of Antwerp +Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp + 2014, CWI, Amsterdam -Contact: astra@ua.ac.be -Website: http://astra.ua.ac.be +Contact: astra@uantwerpen.be +Website: http://sf.net/projects/astra-toolbox +This file is part of the ASTRA Toolbox. -This file is part of the -All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA Toolbox"). The ASTRA Toolbox is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -- cgit v1.2.3 From 3eb6f61e48f7ab6ddaa0e78d9140a4322dbb92fb Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Thu, 2 Oct 2014 13:50:59 +0200 Subject: Add CUDA SIRT::doSlabCorrections() function This function optionally compensates for effectively infinitely large slab-like objects of finite thickness 1. --- cuda/2d/sirt.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'cuda/2d/sirt.h') diff --git a/cuda/2d/sirt.h b/cuda/2d/sirt.h index 1dbf675..0edddab 100644 --- a/cuda/2d/sirt.h +++ b/cuda/2d/sirt.h @@ -41,6 +41,10 @@ public: virtual bool init(); + // Do optional long-object compensation. See the comments in sirt.cu. + // Call this after init(). It can not be used in combination with masks. + bool doSlabCorrections(); + // Set min/max masks to existing GPU memory buffers bool setMinMaxMasks(float* D_minMaskData, float* D_maxMaskData, unsigned int pitch); -- cgit v1.2.3 From 37fde19dfe60bb8e0b0d96119cc005f756172a3e Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Mon, 26 Jan 2015 11:36:11 +0100 Subject: Update copyright to -2015 --- cuda/2d/sirt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cuda/2d/sirt.h') diff --git a/cuda/2d/sirt.h b/cuda/2d/sirt.h index 0edddab..21094a1 100644 --- a/cuda/2d/sirt.h +++ b/cuda/2d/sirt.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2014, iMinds-Vision Lab, University of Antwerp - 2014, CWI, Amsterdam +Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp + 2014-2015, CWI, Amsterdam Contact: astra@uantwerpen.be Website: http://sf.net/projects/astra-toolbox -- cgit v1.2.3 From 5edb35edc2c721b458334a65512b534912c2c542 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Wed, 23 Mar 2016 15:30:56 +0100 Subject: Add relaxation parameters to SIRT, SART --- cuda/2d/sirt.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'cuda/2d/sirt.h') diff --git a/cuda/2d/sirt.h b/cuda/2d/sirt.h index 21094a1..bc913f4 100644 --- a/cuda/2d/sirt.h +++ b/cuda/2d/sirt.h @@ -53,6 +53,8 @@ public: bool uploadMinMaxMasks(const float* minMaskData, const float* maxMaskData, unsigned int pitch); + void setRelaxation(float r) { fRelaxation = r; } + virtual bool iterate(unsigned int iterations); virtual float computeDiffNorm(); @@ -81,6 +83,8 @@ protected: unsigned int minMaskPitch; float* D_maxMaskData; unsigned int maxMaskPitch; + + float fRelaxation; }; bool doSIRT(float* D_volumeData, unsigned int volumePitch, -- cgit v1.2.3