Solving a bug adding some differences between 1d and 2D and rewritting code
hotfix for CG deconvolution