diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2018-07-12 12:11:52 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2018-07-17 11:30:05 +0200 |
| commit | d32df3bcd1910f56195e828a0f7fba8fc04b90ab (patch) | |
| tree | 56963d80f825af10639dee0e1c7c439bbffd1f76 /include/astra/cuda | |
| parent | d58f6b51493c7931cbc02feb3ffeb0eca6ea3a4e (diff) | |
| download | astra-d32df3bcd1910f56195e828a0f7fba8fc04b90ab.tar.gz astra-d32df3bcd1910f56195e828a0f7fba8fc04b90ab.tar.bz2 astra-d32df3bcd1910f56195e828a0f7fba8fc04b90ab.tar.xz astra-d32df3bcd1910f56195e828a0f7fba8fc04b90ab.zip | |
Refactor filter config
Diffstat (limited to 'include/astra/cuda')
| -rw-r--r-- | include/astra/cuda/2d/fbp.h | 4 | ||||
| -rw-r--r-- | include/astra/cuda/2d/fft.h | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/astra/cuda/2d/fbp.h b/include/astra/cuda/2d/fbp.h index 7febe69..1adf3b1 100644 --- a/include/astra/cuda/2d/fbp.h +++ b/include/astra/cuda/2d/fbp.h @@ -75,9 +75,7 @@ public: // FILTER_COSINE, FILTER_HAMMING, and FILTER_HANN) // have a D variable, which gives the cutoff point in the frequency domain. // Setting this value to 1.0 will include the whole filter - bool setFilter(astra::E_FBPFILTER _eFilter, - const float * _pfHostFilter = NULL, - int _iFilterWidth = 0, float _fD = 1.0f, float _fFilterParameter = -1.0f); + bool setFilter(const astra::SFilterConfig &_cfg); bool setShortScan(bool ss) { m_bShortScan = ss; return true; } diff --git a/include/astra/cuda/2d/fft.h b/include/astra/cuda/2d/fft.h index f5f8477..33612a0 100644 --- a/include/astra/cuda/2d/fft.h +++ b/include/astra/cuda/2d/fft.h @@ -60,9 +60,9 @@ void applyFilter(int _iProjectionCount, int _iFreqBinCount, int calcFFTFourierSize(int _iFFTRealSize); -void genCuFFTFilter(astra::E_FBPFILTER _eFilter, float _fD, int _iProjectionCount, +void genCuFFTFilter(const astra::SFilterConfig &_cfg, int _iProjectionCount, cufftComplex * _pFilter, int _iFFTRealDetectorCount, - int _iFFTFourierDetectorCount, float _fParameter = -1.0f); + int _iFFTFourierDetectorCount); void genIdenFilter(int _iProjectionCount, cufftComplex * _pFilter, int _iFFTRealDetectorCount, int _iFFTFourierDetectorCount); |