Fixed bug in P_CDP

proxtoolbox/Algorithms/__init__.py

@@ -7,7 +7,7 @@ Created on Mon Dec 14 12:53:43 2015
 The "Algorithms"-module contains all algorithms provided by the ProxToolbox.
 """
 
-#from algorithms import Algorithm
+from .algorithms import Algorithm
 from .AP import *
 from .AP_expert import *
 from .HPR import *

proxtoolbox/ProxOperators/P_CDP.py

@@ -11,11 +11,13 @@ class P_CDP(ProxOperator):
     def __init__(self,config):
         self.Masks = config['Masks']
         self.data = config['data']
+        self.Ny = config['Ny']
+        self.Nx = config['Nx']
 
     
     def work(self,u):
         
-        if (Nx==1) or (Ny==1):
+        if (self.Ny==1) or (self.Nx==1):
             U = fft(self.Masks*u)
             U0 = magproj(self.data,u)
             u = ifft(U0)/self.Masks