summaryrefslogtreecommitdiffstats
path: root/samples/python
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <wjp@usecode.org>2018-12-07 15:14:12 +0100
committerGitHub <noreply@github.com>2018-12-07 15:14:12 +0100
commit6f4b855f45248cb072abca453af523760f68bd62 (patch)
tree682d56a92ddacf4a31c2f3f2fa1179a7ef245540 /samples/python
parente8be82070824fa370285142550c1e708561bd63d (diff)
parent662dfcfc37bd7658e61a3b2f6bbc815472a16786 (diff)
downloadastra-6f4b855f45248cb072abca453af523760f68bd62.tar.gz
astra-6f4b855f45248cb072abca453af523760f68bd62.tar.bz2
astra-6f4b855f45248cb072abca453af523760f68bd62.tar.xz
astra-6f4b855f45248cb072abca453af523760f68bd62.zip
Merge pull request #180 from wjp/filter_config
Read filter config for FBP from cfg.options
Diffstat (limited to 'samples/python')
-rw-r--r--samples/python/s014_FBP.py2
-rw-r--r--samples/python/s023_FBP_filters.py11
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)