Skip to content

Commit 6ada945

Browse files
timcornwelltimcornwell
committed
Change wslice to wstack
No need to confuse things
1 parent 8234003 commit 6ada945

14 files changed

Lines changed: 113 additions & 113 deletions

‎arl/fourier_transforms/ftprocessor.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
from arl.fourier_transforms.ftprocessor_params import *
1919
from arl.fourier_transforms.ftprocessor_base import *
2020
from arl.fourier_transforms.ftprocessor_timeslice import *
21-
from arl.fourier_transforms.ftprocessor_wslice import *
21+
from arl.fourier_transforms.ftprocessor_wstack import *
2222
from arl.fourier_transforms.ftprocessor_iterated import *
2323
from arl.fourier_transforms.ftprocessor_facets import *

arl/fourier_transforms/ftprocessor_wslice.py renamed to arl/fourier_transforms/ftprocessor_wstack.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,26 @@
2020
log = logging.getLogger(__name__)
2121

2222

23-
def predict_wslice(vis, model, **kwargs):
23+
def predict_wstack(vis, model, **kwargs):
2424
""" Predict using w slices.
2525
2626
:param vis: Visibility to be predicted
2727
:param model: model image
28-
:param wslice: wslice in seconds. If 'auto' will find plausible value
28+
:param wstack: wstack in seconds. If 'auto' will find plausible value
2929
:param nprocessor: Number of processors to be used (1)
3030
:returns: resulting visibility (in place works)
3131
"""
32-
log.info("predict_wslice: predicting using w slices")
32+
log.info("predict_wstack: predicting using wstack")
3333

3434
delA = get_parameter(kwargs, 'wloss', 0.02)
3535
advice = advise_wide_field(vis, delA)
36-
kwargs['wslice'] = get_parameter(kwargs, "wstep", advice['w_sampling_primary_beam'])
36+
kwargs['wstack'] = get_parameter(kwargs, "wstep", advice['w_sampling_primary_beam'])
3737

38-
return predict_with_vis_iterator(vis, model, vis_iter=vis_wslice_iter,
39-
predict=predict_wslice_single, **kwargs)
38+
return predict_with_vis_iterator(vis, model, vis_iter=vis_wstack_iter,
39+
predict=predict_wstack_single, **kwargs)
4040

4141

42-
def predict_wslice_single(vis, model, **kwargs):
42+
def predict_wstack_single(vis, model, **kwargs):
4343
""" Predict using a single w slices.
4444
4545
This fits a single plane and corrects the image geometry.
@@ -53,7 +53,7 @@ def predict_wslice_single(vis, model, **kwargs):
5353
else:
5454
avis = vis
5555

56-
log.info("predict_wslice_single: predicting using single w slice")
56+
log.info("predict_wstack_single: predicting using single w slice")
5757

5858
avis.data['vis'] *= 0.0
5959
tempvis = copy_visibility(vis)
@@ -74,7 +74,7 @@ def predict_wslice_single(vis, model, **kwargs):
7474
return vis
7575

7676

77-
def invert_wslice(vis, im, dopsf=False, normalize=True, **kwargs):
77+
def invert_wstack(vis, im, dopsf=False, normalize=True, **kwargs):
7878
""" Invert using w slices (top level function)
7979
8080
Use the image im as a template. Do PSF in a separate call.
@@ -83,22 +83,22 @@ def invert_wslice(vis, im, dopsf=False, normalize=True, **kwargs):
8383
:param im: image template (not changed)
8484
:param dopsf: Make the psf instead of the dirty image
8585
:param normalize: Normalize by the sum of weights (True)
86-
:param wslice: wslice in wavelenngths. If None or omitted will find plausible value
86+
:param wstack: wstack in wavelenngths. If None or omitted will find plausible value
8787
:param nprocessor: Number of processors to be used (1)
8888
:returns: resulting image[nchan, npol, ny, nx], sum of weights[nchan, npol]
8989
9090
"""
91-
log.info("invert_wslice: inverting using w slices")
91+
log.info("invert_wstack: inverting using wstack")
9292

9393
delA = get_parameter(kwargs, 'wloss', 0.02)
9494
advice = advise_wide_field(vis, delA)
95-
wslice = get_parameter(kwargs, "wstep", advice['w_sampling_primary_beam'])
96-
kwargs['wslice'] = wslice
95+
wstack = get_parameter(kwargs, "wstep", advice['w_sampling_primary_beam'])
96+
kwargs['wstack'] = wstack
9797

98-
return invert_with_vis_iterator(vis, im, dopsf, normalize=normalize, vis_iter=vis_wslice_iter,
99-
invert=invert_wslice_single, **kwargs)
98+
return invert_with_vis_iterator(vis, im, dopsf, normalize=normalize, vis_iter=vis_wstack_iter,
99+
invert=invert_wstack_single, **kwargs)
100100

101-
def invert_wslice_single(vis, im, dopsf, normalize=True, **kwargs):
101+
def invert_wstack_single(vis, im, dopsf, normalize=True, **kwargs):
102102
"""Process single w slice
103103
104104
Extracted for re-use in parallel version
@@ -107,7 +107,7 @@ def invert_wslice_single(vis, im, dopsf, normalize=True, **kwargs):
107107
:param dopsf: Make the psf instead of the dirty image
108108
:param normalize: Normalize by the sum of weights (True)
109109
"""
110-
log.info("invert_wslice_single: predicting using single w slice")
110+
log.info("invert_wstack_single: predicting using single w slice")
111111

112112
kwargs['imaginary'] = True
113113
reWorkimage, sumwt, imWorkimage = invert_2d_base(vis, im, dopsf, normalize=normalize, **kwargs)

‎arl/graphs/dask_graphs.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
from arl.data.data_models import Visibility, BlockVisibility, Image
3434
from arl.data.parameters import get_parameter
3535
from arl.fourier_transforms.ftprocessor import invert_timeslice_single, predict_timeslice_single, \
36-
invert_wslice_single, predict_wslice_single, normalize_sumwt, residual_image
36+
invert_wstack_single, predict_wstack_single, normalize_sumwt, residual_image
3737
from arl.image.deconvolution import deconvolve_cube, restore_cube
3838
from arl.image.gather_scatter import image_scatter, image_gather
3939
from arl.image.operations import copy_image, create_empty_image_like
@@ -139,7 +139,7 @@ def sum_invert_results(image_list):
139139

140140
def invert_ignore_None(vis, *args, **kwargs):
141141
if vis is not None:
142-
return invert_wslice_single(vis, *args, **kwargs)
142+
return invert_wstack_single(vis, *args, **kwargs)
143143
else:
144144
return None
145145

@@ -209,7 +209,7 @@ def predict_and_sum(vis, model, **kwargs):
209209
return [delayed(predict_and_sum, pure=True, nout=1)(v, model_graph, **kwargs) for v in vis_graph_list]
210210

211211

212-
def create_predict_wstack_graph(vis_graph_list, model_graph, predict_single=predict_wslice_single,
212+
def create_predict_wstack_graph(vis_graph_list, model_graph, predict_single=predict_wstack_single,
213213
vis_slices=1, **kwargs):
214214
"""
215215
@@ -231,7 +231,7 @@ def predict_and_sum(vis, model, **kwargs):
231231

232232
def predict_ignore_None(vis, *args, **kwargs):
233233
if vis is not None:
234-
return predict_wslice_single(vis, *args, **kwargs)
234+
return predict_wstack_single(vis, *args, **kwargs)
235235
else:
236236
return None
237237

@@ -247,7 +247,7 @@ def predict_ignore_None(vis, *args, **kwargs):
247247
return predicted_vis_list
248248

249249

250-
def create_predict_facet_graph(vis_graph_list, model_graph, predict_single=predict_wslice_single,
250+
def create_predict_facet_graph(vis_graph_list, model_graph, predict_single=predict_wstack_single,
251251
facets=2, **kwargs):
252252
""" Predict visibility from a model using facets
253253

‎arl/image/solvers.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ def solve_image(vis: Visibility, model: Image, components=None, predict=predict_
2323
2424
:param vis:
2525
:param model: Model image
26-
:param predict: Predict function e.g. predict_2d, predict_wslice
27-
:param invert: Invert function e.g. invert_2d, invert_wslice
26+
:param predict: Predict function e.g. predict_2d, predict_wstack
27+
:param invert: Invert function e.g. invert_2d, invert_wstack
2828
:returns: Visibility, model
2929
"""
3030
nmajor = get_parameter(kwargs, 'nmajor', 5)

‎arl/visibility/gather_scatter.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from arl.visibility.operations import create_visibility_from_rows
1818
from arl.visibility.coalesce import coalesce_visibility, decoalesce_visibility
1919
from arl.data.data_models import *
20-
from arl.visibility.iterators import vis_slice_iter, vis_timeslice_iter, vis_wslice_iter
20+
from arl.visibility.iterators import vis_slice_iter, vis_timeslice_iter, vis_wstack_iter
2121

2222
log = logging.getLogger(__name__)
2323

@@ -61,9 +61,9 @@ def visibility_scatter_index(vis, **kwargs):
6161
def visibility_scatter_w(vis, **kwargs):
6262
if type(vis) == BlockVisibility:
6363
avis = coalesce_visibility(vis, **(kwargs))
64-
return visibility_scatter(avis, vis_iter=vis_wslice_iter, **kwargs)
64+
return visibility_scatter(avis, vis_iter=vis_wstack_iter, **kwargs)
6565
else:
66-
return visibility_scatter(vis, vis_iter=vis_wslice_iter, **kwargs)
66+
return visibility_scatter(vis, vis_iter=vis_wstack_iter, **kwargs)
6767

6868
def visibility_scatter_time(vis, **kwargs):
6969
return visibility_scatter(vis, vis_iter=vis_timeslice_iter, **kwargs)
@@ -74,10 +74,10 @@ def visibility_gather_index(visibility_list, vis, **kwargs):
7474
def visibility_gather_w(visibility_list, vis, **kwargs):
7575
if type(vis) == BlockVisibility:
7676
cvis = coalesce_visibility(vis, **kwargs)
77-
return decoalesce_visibility(visibility_gather(visibility_list, cvis, vis_iter=vis_wslice_iter,
77+
return decoalesce_visibility(visibility_gather(visibility_list, cvis, vis_iter=vis_wstack_iter,
7878
**kwargs))
7979
else:
80-
return visibility_gather(visibility_list, vis, vis_iter=vis_wslice_iter, **kwargs)
80+
return visibility_gather(visibility_list, vis, vis_iter=vis_wstack_iter, **kwargs)
8181

8282
def visibility_gather_time(visibility_list, vis, **kwargs):
8383
return visibility_gather(visibility_list, vis, vis_iter=vis_timeslice_iter, **kwargs)

‎arl/visibility/iterators.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,27 +50,27 @@ def vis_timeslice_iter(vis, **kwargs):
5050
yield rows
5151

5252

53-
def vis_wslice_iter(vis, **kwargs):
53+
def vis_wstack_iter(vis, **kwargs):
5454
""" W slice iterator
5555
56-
:param wslice: wslice (wavelengths)
57-
:param vis_slices: Number of slices (second in precedence to wslice)
56+
:param wstack: wstack (wavelengths)
57+
:param vis_slices: Number of slices (second in precedence to wstack)
5858
:returns: Boolean array with selected rows=True
5959
"""
6060
assert type(vis) == Visibility or type(vis) == BlockVisibility
6161
wmaxabs = (numpy.max(numpy.abs(vis.w)))
6262

63-
wslice = get_parameter(kwargs, "wslice", None)
64-
if wslice is None:
63+
wstack = get_parameter(kwargs, "wstack", None)
64+
if wstack is None:
6565
vis_slices = get_parameter(kwargs, "vis_slices", 1)
6666
boxes = numpy.linspace(- wmaxabs, +wmaxabs, vis_slices)
67-
wslice = 2 * wmaxabs / vis_slices
67+
wstack = 2 * wmaxabs / vis_slices
6868
else:
69-
vis_slices = 1 + 2 * numpy.round(wmaxabs / wslice).astype('int')
69+
vis_slices = 1 + 2 * numpy.round(wmaxabs / wstack).astype('int')
7070
boxes = numpy.linspace(- wmaxabs, +wmaxabs, vis_slices)
7171

7272
for box in boxes:
73-
rows = numpy.abs(vis.w - box) < 0.5 * wslice
73+
rows = numpy.abs(vis.w - box) < 0.5 * wstack
7474
if numpy.sum(rows) > 0:
7575
yield rows
7676
else:

‎docs/ARL_definition.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ FTProcessor
8989
.. automodule:: arl.fourier_transforms.ftprocessor_facets
9090
:members:
9191

92-
.. automodule:: arl.fourier_transforms.ftprocessor_wslice
92+
.. automodule:: arl.fourier_transforms.ftprocessor_wstack
9393
:members:
9494

9595
.. automodule:: arl.fourier_transforms.ftprocessor_timeslice

‎examples/arl/imaging-dask.ipynb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"from arl.visibility.operations import qa_visibility\n",
6363
"from arl.util.testing_support import create_named_configuration, simulate_gaintable\n",
6464
"from arl.fourier_transforms.ftprocessor import predict_2d, invert_2d, predict_timeslice, invert_timeslice, \\\n",
65-
" predict_wslice, invert_wslice, normalize_sumwt, create_image_from_visibility, \\\n",
65+
" predict_wstack, invert_wstack, normalize_sumwt, create_image_from_visibility, \\\n",
6666
" invert_wprojection, predict_wprojection,\\\n",
6767
" predict_skycomponent_blockvisibility, residual_image, invert_timeslice_single, \\\n",
6868
" predict_timeslice_single, predict_timeslice_single, advise_wide_field\n",
@@ -342,11 +342,11 @@
342342
}
343343
],
344344
"source": [
345-
"dirty_graph = create_invert_facet_graph(vis_graph_list, model_graph, wstep=25, wslice=25,\n",
345+
"dirty_graph = create_invert_facet_graph(vis_graph_list, model_graph, wstep=25, wstack=25,\n",
346346
" invert_single=invert_preferred, \n",
347347
" predict_single=predict_preferred,\n",
348348
" dopsf=False)\n",
349-
"psf_graph = create_invert_facet_graph(vis_graph_list, model_graph, wstep=25, wslice=25,\n",
349+
"psf_graph = create_invert_facet_graph(vis_graph_list, model_graph, wstep=25, wstack=25,\n",
350350
" invert_single=invert_preferred, \n",
351351
" predict_single=predict_preferred,\n",
352352
" opsf=True)\n",
@@ -434,7 +434,7 @@
434434
" c_residual_graph=create_residual_graph,\n",
435435
" invert_single=invert_wprojection, \n",
436436
" predict_single=predict_wprojection,\n",
437-
" wstep=25, wslice=25,\n",
437+
" wstep=25, wstack=25,\n",
438438
" algorithm='hogbom', niter=1000, \n",
439439
" fractional_threshold=0.1, threshold=2.0, nmajor=2,\n",
440440
" gain=0.1, facets=4)"
@@ -590,7 +590,7 @@
590590
" c_residual_graph=create_residual_graph,\n",
591591
" invert_single=invert_wprojection, \n",
592592
" predict_single=predict_wprojection,\n",
593-
" wstep=25, wslice=25,\n",
593+
" wstep=25, wstack=25,\n",
594594
" niter=1000, fractional_threshold=0.1,\n",
595595
" threshold=2.0, nmajor=3, first_selfcal=1, gain=0.1, facets=2)\n",
596596
"#g=ical_graph.visualize(filename='imaging-dask-ical-graph-%d' % (nfreqwin), format='svg')"

0 commit comments

Comments
 (0)