diff --git a/pfb/deconv/clark.py b/pfb/deconv/clark.py index c748293d..6ab51499 100644 --- a/pfb/deconv/clark.py +++ b/pfb/deconv/clark.py @@ -21,7 +21,6 @@ def subtract(A, psf, Ip, Iq, xhat, nxo2, nyo2): pp = nxo2 - Ip[i] qq = nyo2 - Iq[i] A[b, i] -= xhat[b] * psf[b, pp, qq] - # print(b, pp, qq, psf[b, pp, qq]) return A @@ -68,22 +67,7 @@ def subminor(A, psf, Ip, Iq, model, wsums, gamma=0.05, th=0.0, maxit=10000): Idelp = p - Ip Idelq = q - Iq - # coordinates in PSF - # pp = nxo2 - (p - Ip) - # qq = nyo2 - (q - Iq) - # - # nxo2 - p : nxo2 + nx - p - # nyo2 - q : nyo2 + ny - q - - # # find where PSF overlaps with image - # left_x = p - Ip >= 0 - # right_x = p + Ip < nx - # left_y = q - Iq >= 0 - # right_y = q + Iq < ny - # mask = (left_x & right_x) & (left_y & right_y) - mask = (np.abs(Idelp) <= nxo2) & (np.abs(Idelq) <= nyo2) - # Ipp, Iqq = psf[:, nxo2 - Ip[mask], nyo2 - Iq[mask]] A = subtract(A[:, mask], psf, Idelp[mask], Idelq[mask], xhat, nxo2, nyo2) diff --git a/pyproject.toml b/pyproject.toml index 9e90c43f..c267f554 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pfb-imaging" -version = "0.0.5" +version = "0.0.4" description = "Radio interferometric imaging suite based on a preconditioned forward-backward approach" authors = ["Landman Bester "] license = "MIT" diff --git a/tbump.toml b/tbump.toml index 09e52ea3..3d4d8c5b 100644 --- a/tbump.toml +++ b/tbump.toml @@ -2,7 +2,7 @@ github_url = "https://github.com/ratt-ru/pfb-imaging/" [version] -current = "0.0.5" +current = "0.0.4" # Example of a semver regexp. # Make sure this matches current_version before