From 23d21ec3762fc15acd26b899e14559d3a11ca5f4 Mon Sep 17 00:00:00 2001 From: landmanbester Date: Wed, 17 Apr 2024 15:56:00 +0200 Subject: [PATCH 1/3] propagate flags to other correlations in flagchi2 worker --- surfvis/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/surfvis/utils.py b/surfvis/utils.py index 0313cb9..3f804c8 100644 --- a/surfvis/utils.py +++ b/surfvis/utils.py @@ -128,7 +128,7 @@ def _flagchisq(resid, weight, flag, ant1, ant2, w = weight[r, f, c] chi2 = (np.conj(res) * w * res).real if chi2 > flag_above or chi2 == 0: - flag[r, f, c] = True + flag[r, f, :] = True elif chi2 <= unflag_below : - flag[r, f, c] = False + flag[r, f, :] = False return flag From b5fd255a1fbe4eb0054a1620d70d51899629207c Mon Sep 17 00:00:00 2001 From: landmanbester Date: Wed, 17 Apr 2024 16:14:24 +0200 Subject: [PATCH 2/3] remove the option to unflag_below --- surfvis/flagchi2.py | 3 --- surfvis/utils.py | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/surfvis/flagchi2.py b/surfvis/flagchi2.py index 0970858..c84f877 100644 --- a/surfvis/flagchi2.py +++ b/surfvis/flagchi2.py @@ -30,8 +30,6 @@ def create_parser(): help='Flag column (default = FLAG)') parser.add_option('--flag-above', default=3, type=float, help='flag data with chisq above this value (default = 3)') - parser.add_option('--unflag-below', default=1.15, type=float, - help='unflag data with chisq below this value (default = 1.15)') parser.add_option('--nthreads', default=4, type=int, help='Number of dask threads to use') parser.add_option('--nrows', default=250000, type=int, @@ -98,7 +96,6 @@ def main(): uflag = flagchisq(resid, weight, flag, ant1, ant2, use_corrs=tuple(use_corrs), flag_above=options.flag_above, - unflag_below=options.unflag_below, respect_ants=tuple(rants)) out_ds = ds.assign(**{options.fcol: (("row", "chan", "corr"), uflag)}) diff --git a/surfvis/utils.py b/surfvis/utils.py index 3f804c8..d403be5 100644 --- a/surfvis/utils.py +++ b/surfvis/utils.py @@ -117,7 +117,7 @@ def flagchisq(resid, weight, flag, ant1, ant2, @njit(fastmath=True, nogil=True) def _flagchisq(resid, weight, flag, ant1, ant2, - use_corrs, flag_above, unflag_below, respect_ants): + use_corrs, flag_above, respect_ants): nrow, nchan, ncorr = resid.shape for r in range(nrow): if ant1[r] in respect_ants or ant2[r] in respect_ants: @@ -129,6 +129,4 @@ def _flagchisq(resid, weight, flag, ant1, ant2, chi2 = (np.conj(res) * w * res).real if chi2 > flag_above or chi2 == 0: flag[r, f, :] = True - elif chi2 <= unflag_below : - flag[r, f, :] = False return flag From a494f5d54b6f4a4608efeb0c57728e0eaa7247ab Mon Sep 17 00:00:00 2001 From: landmanbester Date: Wed, 17 Apr 2024 16:15:52 +0200 Subject: [PATCH 3/3] typo --- surfvis/utils.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/surfvis/utils.py b/surfvis/utils.py index d403be5..2be1d03 100644 --- a/surfvis/utils.py +++ b/surfvis/utils.py @@ -96,7 +96,7 @@ def _surfchisq(resid, weight, flag, ant1, ant2, def flagchisq(resid, weight, flag, ant1, ant2, - use_corrs=(), flag_above=5, unflag_below=1, + use_corrs=(), flag_above=5, respect_ants=()): # import pdb; pdb.set_trace() @@ -109,7 +109,6 @@ def flagchisq(resid, weight, flag, ant1, ant2, ant2, 'r', use_corrs, None, flag_above, None, - unflag_below, None, respect_ants, None, dtype=bool) return res