Skip to content

Commit 107f882

Browse files
committed
Merge branch 'toy_models' into develop
# Conflicts: # autoarray/dataset/imaging.py # autoarray/mask/mask.py # autoarray/plotters/array_plotters.py # autoarray/plotters/fit_imaging_plotters.py # autoarray/plotters/fit_interferometer_plotters.py # autoarray/plotters/grid_plotters.py # autoarray/plotters/imaging_plotters.py # autoarray/plotters/interferometer_plotters.py # autoarray/plotters/inversion_plotters.py # autoarray/plotters/line_yx_plotters.py # autoarray/plotters/mapper_plotters.py # autoarray/plotters/plotter_util.py # autoarray/plotters/quantity_radii_plotters.py # test_autoarray/unit/mask/test_mask.py # test_autoarray/unit/operators/test_convolver.py # test_autoarray/unit/plotters/test_mapper_plotters.py # test_autoarray/unit/structures/test_grids.py
2 parents 4216c2e + db35f19 commit 107f882

46 files changed

Lines changed: 1898 additions & 753 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

autoarray/dataset/abstract_dataset.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ def __init__(self, data, noise_map, exposure_time_map=None):
1111
Parameters
1212
----------
1313
data : arrays.Array
14-
The array of the image data_type, in units of electrons per second.
14+
The array of the image data_type, in unit_label of electrons per second.
1515
pixel_scales : float
1616
The size of each pixel in arc seconds.
1717
psf : PSF
1818
An array describing the PSF kernel of the image.
1919
noise_map : NoiseMap | float | ndarray
20-
An array describing the RMS standard deviation error in each pixel, preferably in units of electrons per
20+
An array describing the RMS standard deviation error in each pixel, preferably in unit_label of electrons per
2121
second.
2222
background_noise_map : NoiseMap
2323
An array describing the RMS standard deviation error in each pixel due to the background sky noise_map,
24-
preferably in units of electrons per second.
24+
preferably in unit_label of electrons per second.
2525
poisson_noise_map : NoiseMap
2626
An array describing the RMS standard deviation error in each pixel due to the Poisson counts of the source,
27-
preferably in units of electrons per second.
27+
preferably in unit_label of electrons per second.
2828
exposure_time_map : arrays.Array
2929
An array describing the effective exposure time in each imaging pixel.
3030
background_sky_map : aa.Scaled
@@ -81,7 +81,7 @@ def potential_chi_squared_max(self):
8181

8282
def array_from_electrons_per_second_to_counts(self, array):
8383
"""
84-
For an array (in electrons per second) and an exposure time mappers, return an array in units counts.
84+
For an array (in electrons per second) and an exposure time mappers, return an array in unit_label counts.
8585
8686
Parameters
8787
----------
@@ -92,7 +92,7 @@ def array_from_electrons_per_second_to_counts(self, array):
9292

9393
def array_from_counts_to_electrons_per_second(self, array):
9494
"""
95-
For an array (in counts) and an exposure time mappers, convert the array to units electrons per second
95+
For an array (in counts) and an exposure time mappers, convert the array to unit_label electrons per second
9696
9797
Parameters
9898
----------
@@ -106,7 +106,7 @@ def array_from_counts_to_electrons_per_second(self, array):
106106

107107
def array_from_adus_to_electrons_per_second(self, array, gain):
108108
"""
109-
For an array (in counts) and an exposure time mappers, convert the array to units electrons per second
109+
For an array (in counts) and an exposure time mappers, convert the array to unit_label electrons per second
110110
111111
Parameters
112112
----------
@@ -120,7 +120,7 @@ def array_from_adus_to_electrons_per_second(self, array, gain):
120120

121121
@property
122122
def image_counts(self):
123-
"""The image in units of counts."""
123+
"""The image in unit_label of counts."""
124124
return self.array_from_electrons_per_second_to_counts(self.data)
125125

126126

autoarray/dataset/imaging.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ def signal_to_noise_limited_from_signal_to_noise_limit(self, signal_to_noise_lim
262262

263263
@property
264264
def background_noise_map_counts(self):
265-
""" The background noise_maps mappers in units of counts."""
265+
""" The background noise_maps mappers in unit_label of counts."""
266266
return self.array_from_electrons_per_second_to_counts(self.background_noise_map)
267267

268268
@property
@@ -380,18 +380,18 @@ def __init__(
380380
Parameters
381381
----------
382382
image : aa.Array
383-
The array of the image data_type, in units of electrons per second.
383+
The array of the image data_type, in unit_label of electrons per second.
384384
psf : PSF
385385
An array describing the PSF kernel of the image.
386386
noise_map : NoiseMap | float | ndarray
387-
An array describing the RMS standard deviation error in each pixel, preferably in units of electrons per
387+
An array describing the RMS standard deviation error in each pixel, preferably in unit_label of electrons per
388388
second.
389389
background_noise_map : NoiseMap
390390
An array describing the RMS standard deviation error in each pixel due to the background sky noise_map,
391-
preferably in units of electrons per second.
391+
preferably in unit_label of electrons per second.
392392
poisson_noise_map : NoiseMap
393393
An array describing the RMS standard deviation error in each pixel due to the Poisson counts of the source,
394-
preferably in units of electrons per second.
394+
preferably in unit_label of electrons per second.
395395
exposure_time_map : aa.Array
396396
An array describing the effective exposure time in each imaging pixel.
397397
background_sky_map : aa.Scaled
@@ -468,7 +468,7 @@ def from_fits(
468468
"""Factory for loading the imaging data_type from .fits files, as well as computing properties like the noise-map,
469469
exposure-time map, etc. from the imaging-data.
470470
471-
This factory also includes a number of routines for converting the imaging-data from units not supported by PyAutoLens \
471+
This factory also includes a number of routines for converting the imaging-data from unit_label not supported by PyAutoLens \
472472
(e.g. adus, electrons) to electrons per second.
473473
474474
Parameters
@@ -550,12 +550,12 @@ def from_fits(
550550
background_sky_map_hdu : int
551551
The hdu the background_sky_map is contained in the .fits file specified by *background_sky_map_path*.
552552
convert_from_electrons : bool
553-
If True, the input unblurred_image_1d are in units of electrons and all converted to electrons / second using the exposure \
553+
If True, the input unblurred_image_1d are in unit_label of electrons and all converted to electrons / second using the exposure \
554554
time map.
555555
gain : float
556556
The image gain, used for convert from ADUs.
557557
convert_from_adus : bool
558-
If True, the input unblurred_image_1d are in units of adus and all converted to electrons / second using the exposure \
558+
If True, the input unblurred_image_1d are in unit_label of adus and all converted to electrons / second using the exposure \
559559
time map and gain.
560560
"""
561561

@@ -865,7 +865,7 @@ def generate_poisson_noise(image, exposure_time_map, seed=-1):
865865
"""
866866
Generate a two-dimensional poisson noise_maps-mappers from an image.
867867
868-
Values are computed from a Poisson distribution using the image's input values in units of counts.
868+
Values are computed from a Poisson distribution using the image's input values in unit_label of counts.
869869
870870
Parameters
871871
----------
@@ -904,7 +904,7 @@ def load_noise_map(
904904
):
905905
"""Factory for loading the noise-map from a .fits file.
906906
907-
This factory also includes a number of routines for converting the noise-map from from other units (e.g. \
907+
This factory also includes a number of routines for converting the noise-map from from other unit_label (e.g. \
908908
a weight map) or computing the noise-map from other unblurred_image_1d (e.g. the imaging image and background noise-map).
909909
910910
Parameters
@@ -941,12 +941,12 @@ def load_noise_map(
941941
If True, the noise-map is computed from the observed image and background noise-map \
942942
(see NoiseMap.from_image_and_background_noise_map).
943943
convert_from_electrons : bool
944-
If True, the input unblurred_image_1d are in units of electrons and all converted to electrons / second using the exposure \
944+
If True, the input unblurred_image_1d are in unit_label of electrons and all converted to electrons / second using the exposure \
945945
time map.
946946
gain : float
947947
The image gain, used for convert from ADUs.
948948
convert_from_adus : bool
949-
If True, the input unblurred_image_1d are in units of adus and all converted to electrons / second using the exposure \
949+
If True, the input unblurred_image_1d are in unit_label of adus and all converted to electrons / second using the exposure \
950950
time map and gain.
951951
"""
952952
noise_map_options = sum(
@@ -1027,7 +1027,7 @@ def load_background_noise_map(
10271027
):
10281028
"""Factory for loading the background noise-map from a .fits file.
10291029
1030-
This factory also includes a number of routines for converting the background noise-map from from other units (e.g. \
1030+
This factory also includes a number of routines for converting the background noise-map from from other unit_label (e.g. \
10311031
a weight map).
10321032
10331033
Parameters
@@ -1100,7 +1100,7 @@ def load_poisson_noise_map(
11001100
):
11011101
"""Factory for loading the Poisson noise-map from a .fits file.
11021102
1103-
This factory also includes a number of routines for converting the Poisson noise-map from from other units (e.g. \
1103+
This factory also includes a number of routines for converting the Poisson noise-map from from other unit_label (e.g. \
11041104
a weight map) or computing the Poisson noise_map from other unblurred_image_1d (e.g. the imaging image).
11051105
11061106
Parameters
@@ -1127,12 +1127,12 @@ def load_poisson_noise_map(
11271127
exposure_time_map : ndarray
11281128
The exposure-time map, which the Poisson noise-map can be calculated using.
11291129
convert_from_electrons : bool
1130-
If True, the input unblurred_image_1d are in units of electrons and all converted to electrons / second using the exposure \
1130+
If True, the input unblurred_image_1d are in unit_label of electrons and all converted to electrons / second using the exposure \
11311131
time map.
11321132
gain : float
11331133
The image gain, used for convert from ADUs.
11341134
convert_from_adus : bool
1135-
If True, the input unblurred_image_1d are in units of adus and all converted to electrons / second using the exposure \
1135+
If True, the input unblurred_image_1d are in unit_label of adus and all converted to electrons / second using the exposure \
11361136
time map and gain.
11371137
"""
11381138
poisson_noise_map_options = sum(

autoarray/dataset/interferometer.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def from_fits(
132132
"""Factory for loading the interferometer data_type from .fits files, as well as computing properties like the noise-map,
133133
exposure-time map, etc. from the interferometer-data_type.
134134
135-
This factory also includes a number of routines for converting the interferometer-data_type from units not supported by PyAutoLens \
135+
This factory also includes a number of routines for converting the interferometer-data_type from unit_label not supported by PyAutoLens \
136136
(e.g. adus, electrons) to electrons per second.
137137
138138
Parameters
@@ -212,12 +212,12 @@ def from_fits(
212212
background_sky_map_hdu : int
213213
The hdu the background_sky_map is contained in the .fits file specified by *background_sky_map_path*.
214214
convert_from_electrons : bool
215-
If True, the input unblurred_image_1d are in units of electrons and all converted to electrons / second using the exposure \
215+
If True, the input unblurred_image_1d are in unit_label of electrons and all converted to electrons / second using the exposure \
216216
time map.
217217
gain : float
218218
The image gain, used for convert from ADUs.
219219
convert_from_adus : bool
220-
If True, the input unblurred_image_1d are in units of adus and all converted to electrons / second using the exposure \
220+
If True, the input unblurred_image_1d are in unit_label of adus and all converted to electrons / second using the exposure \
221221
time map and gain.
222222
"""
223223

0 commit comments

Comments
 (0)