bug in the scaling if prox2 of ADMM

demos/JWST_ADMM.py

@@ -2,6 +2,6 @@
 import SetProxPythonPath
 from proxtoolbox.experiments.phase.JWST_Experiment import JWST_Experiment
 
-JWST = JWST_Experiment(algorithm='ADMM', lambda_0=3.0, lambda_max=3.0)
+JWST = JWST_Experiment(algorithm='ADMM', lambda_0=4.0, lambda_max=4.0, anim=True)
 JWST.run()
 JWST.show()

demos/JWST_ADMM_noise.py

@@ -3,6 +3,6 @@ import SetProxPythonPath
 from proxtoolbox.experiments.phase.JWST_Experiment import JWST_Experiment
 
 JWST = JWST_Experiment(algorithm='ADMM', lambda_0=3.0, lambda_max=3.0,
-                       MAXIT=300, noise = True, rotate = True)
+                       MAXIT=300, noise = True, rotate = True, anim=True)
 JWST.run()
 JWST.show()

proxtoolbox/proxoperators/ADMM_prox.py

@@ -207,7 +207,8 @@ class Approx_Pphase_FreFra_ADMM_Poisson(ProxOperator, ADMM_Context):
         tmp = log(tmp)
         h_u_hat = real(sum(sum(u_hat_sq*tmp + self.data_sq[j] - u_hat_sq)))
         if h_u_hat >= self.data_ball + self.TOL2:
-            u_image = magproj(self.data[j], u_hat*proj_scale + proj_const)
+            u_image = magproj(self.data[j], u_hat + proj_const/proj_scale)
+            # Thi Lan found bug above... was u_hat*proj_scale + proj_const, which is wrong
         else:
             u_image = u
         return u_image