diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2018-12-05 12:03:14 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2018-12-06 13:57:35 +0100 |
| commit | 7bfc5b3713f750efe21992fcd8d02e840d5d4867 (patch) | |
| tree | 4daeac31555bc6b568b5f8766cd27c90096d578e /include/astra | |
| parent | e8be82070824fa370285142550c1e708561bd63d (diff) | |
| download | astra-7bfc5b3713f750efe21992fcd8d02e840d5d4867.tar.gz astra-7bfc5b3713f750efe21992fcd8d02e840d5d4867.tar.bz2 astra-7bfc5b3713f750efe21992fcd8d02e840d5d4867.tar.xz astra-7bfc5b3713f750efe21992fcd8d02e840d5d4867.zip | |
Read filter config for FBP from cfg.options
Since these settings are optional, they should have been in cfg.options
instead of directly in cfg. The old syntax remains a fallback.
This has the side-effect that the tomopy/astra interface can also supply them.
Diffstat (limited to 'include/astra')
| -rw-r--r-- | include/astra/Filters.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/astra/Filters.h b/include/astra/Filters.h index a1dec97..2e229b9 100644 --- a/include/astra/Filters.h +++ b/include/astra/Filters.h @@ -28,6 +28,8 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #ifndef _INC_ASTRA_FILTERS_H #define _INC_ASTRA_FILTERS_H +#include <string> + namespace astra { struct Config; @@ -82,7 +84,7 @@ float *genFilter(const SFilterConfig &_cfg, int _iFFTFourierDetectorCount); // Convert string to filter type. Returns FILTER_ERROR if unrecognized. -E_FBPFILTER convertStringToFilter(const char * _filterType); +E_FBPFILTER convertStringToFilter(const std::string &_filterType); SFilterConfig getFilterConfigForAlgorithm(const Config& _cfg, CAlgorithm *_alg); |