Skip to content

Commit 37de946

Browse files
committed
Rename notebooks appropriately.
1 parent 10280df commit 37de946

13 files changed

Lines changed: 454 additions & 9 deletions

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
**July 26, 2018** [Tim], Extracted pure-serial uses of processing components
2+
into workflows/serial (in analogy with workflows/arlexecute). This means that
3+
all functions remaining in processing components are suitable for use in
4+
workflows. The split between processing components and workflows is clearer.
5+
As a consequence nearly all notebooks have moved to workflows/notebooks.
6+
17
**July 24, 2018** [Tim], Renamed calskymodel to modelpartition to
28
be in line with the SDP model views. Also documentation cleanup.
39

‎docs/ARL_directory.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ Visibility Predict and Invert
5252
=============================
5353

5454
* Predict BlockVisibility or Visibility for Skycomponent :py:mod:`processing_components.imaging.base.predict_skycomponent_visibility`
55-
* Predict by de-gridding visibilities :py:mod:`processing_components.imaging.imaging_functions.predict_serial`
56-
* Invert by gridding visibilities :py:mod:`processing_components.imaging.imaging_functions.invert_serial`
55+
* Predict by de-gridding visibilities :py:mod:`workflows.serial.imaging.imaging_serial.predict_serial`
56+
* Invert by gridding visibilities :py:mod:`workflows.serial.imaging.imaging_serial.invert_serial`
5757

5858
Deconvolution
5959
=============
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
.. toctree::
2+
:maxdepth: 2
3+
4+
Serial Workflows
5+
****************
6+
7+
Serial workflows created using the ARL processing components. These are higher level and fewer
8+
in number than processing components.
9+
10+
Imaging workflows
11+
=================
12+
13+
* Invert: :py:mod:`workflows.serial.imaging.imaging_serial.invert_serial`
14+
* Predict: :py:mod:`workflows.serial.imaging.imaging_serial.predict_serial`
15+
16+
Pipeline workflows
17+
==================
18+
19+
* ICAL: :py:mod:`workflows.serial.pipelines.pipeline_serial.ical_serial`
20+
* RCAL: :py:mod:`workflows.serial.pipelines.pipeline_serial.rcal_serial`

‎docs/ARL_quickstart.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ See the jupyter note books below:
4444
.. toctree::
4545
:maxdepth: 3
4646

47-
workflows/imaging.rst
48-
workflows/imaging-fits.rst
49-
workflows/imaging-wterm.rst
50-
workflows/rcal.rst
47+
workflows/imaging_serial.rst
48+
workflows/imaging-fits_serial.rst
49+
workflows/imaging-wterm_serial.rst
50+
workflows/rcal_serial.rst
5151
workflows/simple-dask_arlexecute.rst
5252
workflows/modelpartition_arlexecute.rst
5353
workflows/imaging-pipelines_arlexecute.rst

‎docs/index.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ For clarity, not all connections are shown in this diagram.
2121
ARL_quickstart
2222
ARL_directory
2323
ARL_API
24+
ARL_directory_serial_workflows
2425
ARL_directory_arlexecute_workflows
2526

2627
Reference material:

‎workflows/notebooks/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11

2-
NBs = simple-dask_arlexecute.ipynb modelpartition_arlexecute.ipynb imaging-pipelines_arlexecute.ipynb imaging.ipynb imaging-fits.ipynb imaging-wterm.ipynb rcal.ipynb
2+
NBs = simple-dask_arlexecute.ipynb modelpartition_arlexecute.ipynb imaging-pipelines_arlexecute.ipynb imaging_serial.ipynb imaging-fits_serial.ipynb imaging-wterm_serial.ipynb rcal_serial.ipynb
33
include ../jupyter.mk

workflows/notebooks/bandpass-calibration.ipynb renamed to workflows/notebooks/bandpass-calibration_serial.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"from processing_components.image.operations import show_image\n",
5050
"from processing_components.simulation.testing_support import create_named_configuration, create_test_image, simulate_gaintable\n",
5151
"from processing_components.imaging.base import create_image_from_visibility\n",
52-
"from processing_components.imaging.imaging_functions import predict_function\n",
52+
"from workflows.serial.imaging.imaging_serial import predict_serial\n",
5353
"\n",
5454
"from data_models.polarisation import PolarisationFrame\n",
5555
"\n",
@@ -160,7 +160,7 @@
160160
"outputs": [],
161161
"source": [
162162
"vt = convert_blockvisibility_to_visibility(bvt)\n",
163-
"vt = predict_function(bvt, m31image, context='timeslice')\n",
163+
"vt = predict_serial(bvt, m31image, context='timeslice')\n",
164164
"bvt = convert_visibility_to_blockvisibility(vt)"
165165
]
166166
},

0 commit comments

Comments
 (0)