From 73755371cf2632aa724fa941c78165728f96e3c7 Mon Sep 17 00:00:00 2001
From: algol <algol@algol-UX305FA>
Date: Wed, 5 Jul 2017 16:45:52 +0100
Subject: FISTA_REC code optimized and cleaned

---
 demos/DemoRD2.m | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'demos')

diff --git a/demos/DemoRD2.m b/demos/DemoRD2.m
index 518e24b..b991e70 100644
--- a/demos/DemoRD2.m
+++ b/demos/DemoRD2.m
@@ -60,7 +60,7 @@ params.vol_geom = vol_geom;
 params.sino = Sino3D;
 params.iterFISTA  = 40;
 params.L_const = 7.6789e+08; 
-params.Regul_LambdaTV = 0.005; % TV regularization parameter for FISTA-TV
+params.Regul_Lambda_FGPTV = 0.005; % TV regularization parameter for FGP-TV
 params.weights = Weights3D;
 params.show = 1;
 params.maxvalplot = 2.5; params.slice = 10;
@@ -76,7 +76,7 @@ params.vol_geom = vol_geom;
 params.sino = Sino3D;
 params.iterFISTA  = 40;
 params.L_const = 7.6789e+08; 
-params.Regul_LambdaTV = 0.005; % TV regularization parameter for FISTA-TV
+params.Regul_Lambda_FGPTV = 0.005; % TV regularization parameter for FGP-TV
 params.Ring_LambdaR_L1 = 0.002; % Soft-Thresh L1 ring variable parameter
 params.Ring_Alpha = 21; % to boost ring removal procedure
 params.weights = Weights3D;
@@ -93,10 +93,9 @@ params.proj_geom = proj_geom; % pass geometry to the function
 params.vol_geom = vol_geom;
 params.sino = Sino3D;
 params.iterFISTA  = 40;
-params.Regul_LambdaTV = 0.005; % TV regularization parameter for FISTA-TV
+params.Regul_Lambda_FGPTV = 0.005; % TV regularization parameter for FGP-TV
 params.Regul_LambdaHO = 200;  % regularization parameter for LLT problem
-params.Regul_tauHO = 0.0005; % time-step parameter for the explicit scheme
-params.Regul_iterHO = 250; % the max number of TV iterations
+params.Regul_tauLLT = 0.0005; % time-step parameter for the explicit scheme
 params.Ring_LambdaR_L1 = 0.002; % Soft-Thresh L1 ring variable parameter
 params.Ring_Alpha = 21; % to boost ring removal procedure
 params.weights = Weights3D;
-- 
cgit v1.2.3