Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More flexible 2dclean areas. #94

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

More flexible 2dclean areas. #94

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6fe1b26
change rect definition in 2d clean.
aewallwi Aug 4, 2020
acdd218
stash for rebase?
aewallwi Aug 4, 2020
af6c986
more clean updates.
aewallwi Aug 4, 2020
3d3ef63
fix rebase breakages.
aewallwi Aug 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 35 additions & 18 deletions uvtools/dspec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,10 +490,12 @@ def fourier_filter(x, data, wgts, filter_centers, filter_half_widths, mode,
filter_half_widths=filter_half_widths, clean2d=filter2d, zero_residual_flags=zero_residual_flags,
**filter_kwargs)
if filter2d:
info['filter_params']['axis_0'] = filter_kwargs
info['filter_params']['axis_1'] = info['filter_params']['axis_0']
for param in filter_kwargs:
info['filter_params']['axis_0'][param] = filter_kwargs[param]
info['filter_params']['axis_1'][param] = info['filter_params']['axis_0'][param]
else:
info['filter_params']['axis_1'] = filter_kwargs
for param in filter_kwargs:
info['filter_params']['axis_1'][param] = filter_kwargs[param]
if 0 in filter_dims and not filter2d:
# undo transposes if we were performing a dimension 0
# time filter.
Expand Down Expand Up @@ -1661,29 +1663,40 @@ def _clean_filter(x, data, wgts, filter_centers, filter_half_widths,
info['filter_params'] = {'axis_0':{}, 'axis_1':{}}
info['clean_status'] = {'axis_0':{}, 'axis_1':{}}
info['status'] = {'axis_0':{}, 'axis_1':{}}
if filt2d_mode == 'rect' or not clean2d:
if not clean2d:
# if we are not in 2d clean mode, then area is the outer product of the
# cleaning area in the axis to be cleaned and ones along the axis not to
# be cleaned. This is because the filter_width is infinity along the axis
# not to be cleaned so _get_filter_area gives all ones.
for m in range(2):
for fc, fw in zip(filter_centers[m], filter_half_widths[m]):
area_vecs[m] = _get_filter_area(x[m], fc, fw)
area = np.outer(area_vecs[0], area_vecs[1])
elif filt2d_mode == 'plus' and clean2d:
else:
# if we are doing 2dclean, then either do rectangular or plus mode.
area = np.zeros(data.shape)
#construct and add a 'plus' for each filtering window pair in each dimension.
for fc0, fw0 in zip(filter_centers[0], filter_half_widths[0]):
for fc1, fw1 in zip(filter_centers[1], filter_half_widths[1]):
area_temp = np.zeros(area.shape)
if fc0 >= _x[0].min() and fc0 <= _x[0].max():
# in rectangle mode, the list of time filter centers / widths and frequency filter centers / widths
# specify rectangular regions in 2d Fourier space to CLEAN in. This loop iterates over those centers
# and widths.
for fc_t, fw_t, fc_f, fw_f in zip(filter_centers[0], filter_half_widths[0], filter_centers[1], filter_half_widths[1]):
if filt2d_mode == 'rect':
# determine rectangular region by taking outer products of filter areas along fourier time and fourier freq
# axes.
area_t = np.outer(_get_filter_area(x[0], fc_t, fw_t), _get_filter_area(x[1], fc_f, fw_f))
elif filt2d_mode == 'plus':
area_t = np.zeros(area.shape)
if fc_t >= _x[0].min() and fc_t <= _x[0].max():
#generate area vector centered at zero
av = _get_filter_area(x[1], fc1, fw1)
area_temp[np.argmin(np.abs(_x[0]-fc0)), :] = av
if fc1 >= _x[1].min() and fc1 <= _x[1].max():
av = _get_filter_area(x[1], fc_f, fw_f)
area_t[np.argmin(np.abs(_x[0]-fc_t)), :] = av
if fc_f >= _x[1].min() and fc_f <= _x[1].max():
#generate area vector centered at zero
av = _get_filter_area(x[0], fc0, fw0)
area_temp[:, np.argmin(np.abs(_x[1]-fc1))] = av
area += area_temp
av = _get_filter_area(x[0], fc_t, fw_t)
area_t[:, np.argmin(np.abs(_x[1]-fc_f))] = av
else:
raise ValueError("%s is not a valid filt2d_mode! choose from ['rect', 'plus']"%(filt2d_mode))
area += area_t
area = (area>0.).astype(int)
else:
raise ValueError("%s is not a valid filt2d_mode! choose from ['rect', 'plus']"%(filt2d_mode))
if clean2d:
_wgts = np.fft.ifft2(window[0] * wgts * window[1])
_data = np.fft.ifft2(window[0] * data * wgts * window[1])
Expand All @@ -1709,7 +1722,11 @@ def _clean_filter(x, data, wgts, filter_centers, filter_half_widths,
del(_info['res'])
info['clean_status']['axis_1'][i] = _info
info['status']['axis_1'][i] = 'success'
info['filter_params']['axis_1']['area'] = area.astype(bool)
elif clean2d:
# save area in both dims. Save as a bool to save space.
info['filter_params']['axis_0']['area'] = area.astype(bool)
info['filter_params']['axis_1']['area'] = info['filter_params']['axis_0']['area']
# we skip 2d cleans if all the data is close to zero (which can cause an infinite clean loop)
# or the weights are all equal to zero which can also lead to a clean loop.
# the maximum of _wgts should be the average value of all cells in 2d wgts.
Expand Down