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 /samples/python | |
| 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 'samples/python')
| -rw-r--r-- | samples/python/s014_FBP.py | 2 | ||||
| -rw-r--r-- | samples/python/s023_FBP_filters.py | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/samples/python/s014_FBP.py b/samples/python/s014_FBP.py index f7cefd4..1c3a341 100644 --- a/samples/python/s014_FBP.py +++ b/samples/python/s014_FBP.py @@ -49,7 +49,7 @@ rec_id = astra.data2d.create('-vol', vol_geom) cfg = astra.astra_dict('FBP_CUDA') cfg['ReconstructionDataId'] = rec_id cfg['ProjectionDataId'] = sinogram_id -cfg['FilterType'] = 'Ram-Lak' +cfg['option'] = { 'FilterType': 'Ram-Lak' } # possible values for FilterType: # none, ram-lak, shepp-logan, cosine, hamming, hann, tukey, lanczos, diff --git a/samples/python/s023_FBP_filters.py b/samples/python/s023_FBP_filters.py index 11518ac..a67c338 100644 --- a/samples/python/s023_FBP_filters.py +++ b/samples/python/s023_FBP_filters.py @@ -47,11 +47,12 @@ cfg = astra.astra_dict('FBP') cfg['ReconstructionDataId'] = rec_id cfg['ProjectionDataId'] = sinogram_id cfg['ProjectorId'] = proj_id +cfg['option'] = {} # 1. Use a standard Ram-Lak filter -cfg['FilterType'] = 'ram-lak' +cfg['option']['FilterType'] = 'ram-lak' alg_id = astra.algorithm.create(cfg) astra.algorithm.run(alg_id) @@ -71,8 +72,8 @@ filter = np.reshape(kernel[0:halfFilterSize], (1, halfFilterSize)) filter_geom = astra.create_proj_geom('parallel', 1.0, halfFilterSize, [0]); filter_id = astra.data2d.create('-sino', filter_geom, filter); -cfg['FilterType'] = 'projection' -cfg['FilterSinogramId'] = filter_id +cfg['option']['FilterType'] = 'projection' +cfg['option']['FilterSinogramId'] = filter_id alg_id = astra.algorithm.create(cfg) astra.algorithm.run(alg_id) rec_filter = astra.data2d.get(rec_id) @@ -92,8 +93,8 @@ kernel[0, N//2] = 0.5 kernel_geom = astra.create_proj_geom('parallel', 1.0, N, [0]); kernel_id = astra.data2d.create('-sino', kernel_geom, kernel); -cfg['FilterType'] = 'rprojection' -cfg['FilterSinogramId'] = kernel_id +cfg['option']['FilterType'] = 'rprojection' +cfg['option']['FilterSinogramId'] = kernel_id alg_id = astra.algorithm.create(cfg) astra.algorithm.run(alg_id) rec_kernel = astra.data2d.get(rec_id) |