summaryrefslogtreecommitdiffstats
path: root/demos/SoftwareX_supp
diff options
context:
space:
mode:
authordkazanc <dkazanc@hotmail.com>2019-03-12 17:29:07 +0000
committerdkazanc <dkazanc@hotmail.com>2019-03-12 17:29:07 +0000
commit420e71a0dcb42e91e1aa93306c2e2f688b309620 (patch)
tree116a2e9d8cbd0ed5297497c99d3747feba5a79c2 /demos/SoftwareX_supp
parentb901525766f8e3473ef58a19bf3fadc178d3778c (diff)
downloadregularization-420e71a0dcb42e91e1aa93306c2e2f688b309620.tar.gz
regularization-420e71a0dcb42e91e1aa93306c2e2f688b309620.tar.bz2
regularization-420e71a0dcb42e91e1aa93306c2e2f688b309620.tar.xz
regularization-420e71a0dcb42e91e1aa93306c2e2f688b309620.zip
cmakelists fixes, matlab wrappers done
Diffstat (limited to 'demos/SoftwareX_supp')
-rw-r--r--demos/SoftwareX_supp/Demo_RealData_Recon_SX.py4
-rw-r--r--demos/SoftwareX_supp/Demo_SimulData_ParOptimis_SX.py2
-rw-r--r--demos/SoftwareX_supp/Demo_SimulData_Recon_SX.py3
3 files changed, 4 insertions, 5 deletions
diff --git a/demos/SoftwareX_supp/Demo_RealData_Recon_SX.py b/demos/SoftwareX_supp/Demo_RealData_Recon_SX.py
index 01491d9..ca8f1d2 100644
--- a/demos/SoftwareX_supp/Demo_RealData_Recon_SX.py
+++ b/demos/SoftwareX_supp/Demo_RealData_Recon_SX.py
@@ -111,7 +111,7 @@ RectoolsIR = RecToolsIR(DetectorsDimH = np.size(det_y_crop), # DetectorsDimH #
datafidelity='LS',# data fidelity, choose LS, PWLS (wip), GH (wip), Student (wip)
nonnegativity='ENABLE', # enable nonnegativity constraint (set to 'ENABLE')
OS_number = None, # the number of subsets, NONE/(or > 1) ~ classical / ordered subsets
- tolerance = 1e-08, # tolerance to stop outer iterations earlier
+ tolerance = 0.0, # tolerance to stop inner (regularisation) iterations earlier
device='gpu')
#%%
print ("Reconstructing with ADMM method using SB-TV penalty")
@@ -228,4 +228,4 @@ for i in range(0,np.size(RecADMM_reg_tgv,0)):
# Saving recpnstructed data with a unique time label
np.save('Dendr_ADMM_TGV'+str(time_label)+'.npy', RecADMM_reg_tgv)
del RecADMM_reg_tgv
-#%% \ No newline at end of file
+#%%
diff --git a/demos/SoftwareX_supp/Demo_SimulData_ParOptimis_SX.py b/demos/SoftwareX_supp/Demo_SimulData_ParOptimis_SX.py
index 59ffc0e..be99afe 100644
--- a/demos/SoftwareX_supp/Demo_SimulData_ParOptimis_SX.py
+++ b/demos/SoftwareX_supp/Demo_SimulData_ParOptimis_SX.py
@@ -77,7 +77,7 @@ RectoolsIR = RecToolsIR(DetectorsDimH = Horiz_det, # DetectorsDimH # detector d
datafidelity='LS',# data fidelity, choose LS, PWLS (wip), GH (wip), Student (wip)
nonnegativity='ENABLE', # enable nonnegativity constraint (set to 'ENABLE')
OS_number = None, # the number of subsets, NONE/(or > 1) ~ classical / ordered subsets
- tolerance = 1e-08, # tolerance to stop outer iterations earlier
+ tolerance = 0.0, # tolerance to stop inner (regularisation) iterations earlier
device='gpu')
#%%
param_space = 30
diff --git a/demos/SoftwareX_supp/Demo_SimulData_Recon_SX.py b/demos/SoftwareX_supp/Demo_SimulData_Recon_SX.py
index 99b9fe8..ae2bfba 100644
--- a/demos/SoftwareX_supp/Demo_SimulData_Recon_SX.py
+++ b/demos/SoftwareX_supp/Demo_SimulData_Recon_SX.py
@@ -78,7 +78,6 @@ plt.title('3D Phantom, coronal (Y-Z) view')
plt.subplot(133)
plt.imshow(phantom[:,:,sliceSel],vmin=0, vmax=1, cmap="PuOr")
plt.title('3D Phantom, sagittal view')
-
"""
plt.show()
#%%
@@ -164,7 +163,7 @@ RectoolsIR = RecToolsIR(DetectorsDimH = Horiz_det, # DetectorsDimH # detector d
datafidelity='LS',# data fidelity, choose LS, PWLS (wip), GH (wip), Student (wip)
nonnegativity='ENABLE', # enable nonnegativity constraint (set to 'ENABLE')
OS_number = None, # the number of subsets, NONE/(or > 1) ~ classical / ordered subsets
- tolerance = 1e-08, # tolerance to stop inner iterations earlier
+ tolerance = 0.0, # tolerance to stop inner (regularisation) iterations earlier
device='gpu')
#%%
print ("Reconstructing with ADMM method using SB-TV penalty")