diff --git a/autolens/config/visualize/plots.yaml b/autolens/config/visualize/plots.yaml index 66de11137..c41653b36 100644 --- a/autolens/config/visualize/plots.yaml +++ b/autolens/config/visualize/plots.yaml @@ -85,7 +85,7 @@ residual_map: false normalized_residual_map: false galaxies: # Settings for plots of galaxies (e.g. GalaxiesPlotter). - subplot_galaxies: true # Plot subplot of all quantities in each plane (e.g. images, convergence)? + subplot_galaxies: true # Plot subplot of all quantities in each galaxies group (e.g. images, convergence)? all_at_end_png: true # Plot all individual plots listed below as .png (even if False)? all_at_end_fits: true # Plot all individual plots listed below as .fits (even if False)? all_at_end_pdf: false # Plot all individual plots listed below as publication-quality .pdf (even if False)? diff --git a/docs/api/galaxy.rst b/docs/api/galaxy.rst index 5897d8c46..75d0f5e84 100644 --- a/docs/api/galaxy.rst +++ b/docs/api/galaxy.rst @@ -1,9 +1,9 @@ -======================= -Galaxy / Plane / Tracer -======================= +=============== +Galaxy / Tracer +=============== -Galaxy / Plane / Tracer ------------------------ +Galaxy / Tracer +--------------- .. currentmodule:: autolens @@ -13,7 +13,7 @@ Galaxy / Plane / Tracer :recursive: Galaxy - Plane + Galaxies Tracer To treat the redshift of a galaxy as a free parameter in a model, the ``Redshift`` object must diff --git a/docs/howtolens/chapter_1_introduction.rst b/docs/howtolens/chapter_1_introduction.rst index 55488ebff..216b256fc 100644 --- a/docs/howtolens/chapter_1_introduction.rst +++ b/docs/howtolens/chapter_1_introduction.rst @@ -19,20 +19,11 @@ The chapter contains the following tutorials: `Tutorial 3: galaxies `_ - Making galaxy objects out of light and mass profile. -`Tutorial 4: Planes `_ -- Grouping galaxies at a common redshift to form an image-plane and source-plane. - -`Tutorial 5: Ray Tracing `_ +`Tutorial 4: Ray Tracing `_ - Using Grids and galaxies to perform strong lens ray-tracing! -`Tutorial 6: More Ray Tracing `_ +`Tutorial 5: More Ray Tracing `_ - Advanced strong lens ray-tracing. -`Tutorial 7: Data `_ -- Loading and inspecting telescope imaging data of a strong lens. - -`Tutorial 8: Fitting `_ -- Fitting data with a strong lens model. - -`Tutorial 9: Summary `_ +`Tutorial 8: Summary `_ - A summary of the chapter. \ No newline at end of file diff --git a/docs/howtolens/chapter_2_lens_modeling.rst b/docs/howtolens/chapter_2_lens_modeling.rst index 82f29d2b2..c124c0c25 100644 --- a/docs/howtolens/chapter_2_lens_modeling.rst +++ b/docs/howtolens/chapter_2_lens_modeling.rst @@ -5,26 +5,32 @@ In chapter 2, we'll take you through how to model strong lenses using a non-line The chapter contains the following tutorials: -`Tutorial 1: Lens Modeling `_ +`Tutorial 1: Data `_ +- Loading and inspecting telescope imaging data of a strong lens. + +`Tutorial 2: Fitting `_ +- Fitting data with a strong lens model. + +`Tutorial 3: Non-linear Search `_ - How a non-linear search is used to fit a lens model. -`Tutorial 2: Parameter Space And Priors `_ +`Tutorial 4: Parameter Space And Priors `_ - The Concepts of a parameter space and priors. -`Tutorial 3: Realism and Complexity `_ +`Tutorial 5: Realism and Complexity `_ - Finding a balance between realism and complexity when composing and fitting a lens model. -`Tutorial 4: Dealing with Failure `_ +`Tutorial 6: Dealing with Failure `_ - What to do when PyAutoLens finds an inaccurate lens model. -`Tutorial 5: Linear Profiles `_ +`Tutorial 7: Linear Profiles `_ - Light profiles which capture complex morphologies in a reduced number of non-linear parameters. -`Tutorial 6: Masking and Positions `_ +`Tutorial 8: Masking and Positions `_ - How to mask and mark positions on your data to improve the lens model. -`Tutorial 7: Results `_ +`Tutorial 9: Results `_ - Overview of the results available after successfully fitting a lens model. -`Tutorial 8: Need for Speed `_ +`Tutorial 10: Need for Speed `_ - How to fit complex models whilst balancing efficiency and run-time. diff --git a/docs/index.rst b/docs/index.rst index fe0a6e50b..9db394f53 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -52,8 +52,8 @@ How does PyAutoLens Work? A strong lens system can be quickly assembled from abstracted objects. A ``Galaxy`` object contains one or more ``LightProfile``'s and ``MassProfile``'s, which represent its two dimensional distribution of starlight and mass. -``Galaxy``’s lie at a particular distance (redshift) from the observer, and are grouped into ``Plane``'s. Raytracing -through multiple ``Plane``'s is achieved by passing them to a ``Tracer`` with an ``astropy`` Cosmology. By passing +``Galaxy``’s lie at a particular distance (redshift) from the observer, and are grouped into planes. Ray tracing +through multiple planess is achieved by passing them to a ``Tracer`` with an ``astropy`` Cosmology. By passing these objects a ``Grid2D`` strong lens sightlines are computed, including multi-plane ray-tracing. All of these objects are extensible, making it straightforward to compose highly customized lensing system. The example code below shows this in action: diff --git a/test_autolens/lens/test_operate.py b/test_autolens/lens/test_operate.py index 6e9493296..b1f3686dc 100644 --- a/test_autolens/lens/test_operate.py +++ b/test_autolens/lens/test_operate.py @@ -21,8 +21,8 @@ def test__operate_image__blurred_images_2d_via_psf_from__for_tracer_gives_list_o grid=sub_grid_2d_7x7, psf=psf_3x3, blurring_grid=blurring_grid_2d_7x7 ) - source_grid_2d_7x7 = g0.traced_grid_from(grid=sub_grid_2d_7x7) - source_blurring_grid_2d_7x7 = g0.traced_grid_from(grid=blurring_grid_2d_7x7) + source_grid_2d_7x7 = g0.traced_grid_2d_from(grid=sub_grid_2d_7x7) + source_blurring_grid_2d_7x7 = g0.traced_grid_2d_from(grid=blurring_grid_2d_7x7) blurred_image_1 = g1.blurred_image_2d_from( grid=source_grid_2d_7x7, psf=psf_3x3, blurring_grid=source_blurring_grid_2d_7x7 @@ -65,8 +65,8 @@ def test__operate_image__blurred_images_2d_via_convolver_from__for_tracer_gives_ blurring_grid=blurring_grid_2d_7x7, ) - source_grid_2d_7x7 = g0.traced_grid_from(grid=sub_grid_2d_7x7) - source_blurring_grid_2d_7x7 = g0.traced_grid_from(grid=blurring_grid_2d_7x7) + source_grid_2d_7x7 = g0.traced_grid_2d_from(grid=sub_grid_2d_7x7) + source_blurring_grid_2d_7x7 = g0.traced_grid_2d_from(grid=blurring_grid_2d_7x7) blurred_image_1 = g1.blurred_image_2d_from( grid=source_grid_2d_7x7,