Skip to content

Commit 925fb32

Browse files
Jammy2211Jammy2211
committed
combined different fit plotters into imaging_fit_plotter module with
all tests now passing.
1 parent b3fc84b commit 925fb32

5 files changed

Lines changed: 35 additions & 35 deletions

File tree

‎autoarray/plotters/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
from .quantity_radii_plotters import plot_quantity_as_function_of_radius as quantity_as_function_of_radius
55
from autoarray.plotters import imaging_plotters as imaging
66
from autoarray.plotters import interferometer_plotters as interferometer
7-
from autoarray.plotters import fit_plotters as fit
7+
from autoarray.plotters import imaging_fit_plotters as imaging_fit
88
from autoarray.plotters import mapper_plotters as mapper
99
from autoarray.plotters import inversion_plotters as inversion

‎autoarray/plotters/array_plotters.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def plot_array(
4545
xlabelsize=16,
4646
ylabelsize=16,
4747
xyticksize=16,
48-
mask_pointsize=10,
48+
mask_overlay_pointsize=10,
4949
border_pointsize=2,
5050
position_pointsize=30,
5151
grid_pointsize=1,
@@ -115,7 +115,7 @@ def plot_array(
115115
The fontsize of the y axes label.
116116
xyticksize : int
117117
The font size of the x and y ticks on the figure axes.
118-
mask_pointsize : int
118+
mask_overlay_pointsize : int
119119
The size of the points plotted to show the mask.
120120
border_pointsize : int
121121
The size of the points plotted to show the borders.
@@ -150,7 +150,7 @@ def plot_array(
150150
cmap='jet', norm='linear, norm_min=None, norm_max=None, linthresh=None, linscale=None,
151151
cb_ticksize=10, cb_fraction=0.047, cb_pad=0.01, cb_tick_values=None, cb_tick_labels=None,
152152
title='Image', titlesize=16, xlabelsize=16, ylabelsize=16, xyticksize=16,
153-
mask_pointsize=10, border_pointsize=2, position_pointsize=10, grid_pointsize=10,
153+
mask_overlay_pointsize=10, border_pointsize=2, position_pointsize=10, grid_pointsize=10,
154154
xticks_manual=None, yticks_manual=None,
155155
output_path='/path/to/output', output_format='png', output_filename='image')
156156
"""
@@ -218,7 +218,7 @@ def plot_array(
218218
mask=mask_overlay,
219219
units=units,
220220
kpc_per_arcsec=kpc_per_arcsec,
221-
pointsize=mask_pointsize,
221+
pointsize=mask_overlay_pointsize,
222222
zoom_offset_pixels=zoom_offset_pixels,
223223
)
224224
plotter_util.plot_lines(line_lists=lines)

autoarray/plotters/fit_plotters.py renamed to autoarray/plotters/imaging_fit_plotters.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def image(
2828
ylabelsize=16,
2929
xyticksize=16,
3030
grid_pointsize=1,
31-
mask_pointsize=10,
31+
mask_overlay_pointsize=10,
3232
position_pointsize=10,
3333
output_path=None,
3434
output_format="show",
@@ -72,7 +72,7 @@ def image(
7272
ylabelsize=ylabelsize,
7373
xyticksize=xyticksize,
7474
grid_pointsize=grid_pointsize,
75-
mask_pointsize=mask_pointsize,
75+
mask_overlay_pointsize=mask_overlay_pointsize,
7676
position_pointsize=position_pointsize,
7777
output_path=output_path,
7878
output_format=output_format,
@@ -105,7 +105,7 @@ def noise_map(
105105
xlabelsize=16,
106106
ylabelsize=16,
107107
xyticksize=16,
108-
mask_pointsize=10,
108+
mask_overlay_pointsize=10,
109109
position_pointsize=10,
110110
output_path=None,
111111
output_format="show",
@@ -147,7 +147,7 @@ def noise_map(
147147
xlabelsize=xlabelsize,
148148
ylabelsize=ylabelsize,
149149
xyticksize=xyticksize,
150-
mask_pointsize=mask_pointsize,
150+
mask_overlay_pointsize=mask_overlay_pointsize,
151151
position_pointsize=position_pointsize,
152152
output_path=output_path,
153153
output_format=output_format,
@@ -180,7 +180,7 @@ def signal_to_noise_map(
180180
xlabelsize=16,
181181
ylabelsize=16,
182182
xyticksize=16,
183-
mask_pointsize=10,
183+
mask_overlay_pointsize=10,
184184
position_pointsize=10,
185185
output_path=None,
186186
output_format="show",
@@ -222,7 +222,7 @@ def signal_to_noise_map(
222222
xlabelsize=xlabelsize,
223223
ylabelsize=ylabelsize,
224224
xyticksize=xyticksize,
225-
mask_pointsize=mask_pointsize,
225+
mask_overlay_pointsize=mask_overlay_pointsize,
226226
position_pointsize=position_pointsize,
227227
output_path=output_path,
228228
output_format=output_format,
@@ -255,7 +255,7 @@ def model_image(
255255
xlabelsize=16,
256256
ylabelsize=16,
257257
xyticksize=16,
258-
mask_pointsize=10,
258+
mask_overlay_pointsize=10,
259259
position_pointsize=10,
260260
output_path=None,
261261
output_format="show",
@@ -297,7 +297,7 @@ def model_image(
297297
xlabelsize=xlabelsize,
298298
ylabelsize=ylabelsize,
299299
xyticksize=xyticksize,
300-
mask_pointsize=mask_pointsize,
300+
mask_overlay_pointsize=mask_overlay_pointsize,
301301
position_pointsize=position_pointsize,
302302
output_path=output_path,
303303
output_format=output_format,
@@ -330,7 +330,7 @@ def residual_map(
330330
xlabelsize=16,
331331
ylabelsize=16,
332332
xyticksize=16,
333-
mask_pointsize=10,
333+
mask_overlay_pointsize=10,
334334
position_pointsize=10,
335335
output_path=None,
336336
output_format="show",
@@ -372,7 +372,7 @@ def residual_map(
372372
xlabelsize=xlabelsize,
373373
ylabelsize=ylabelsize,
374374
xyticksize=xyticksize,
375-
mask_pointsize=mask_pointsize,
375+
mask_overlay_pointsize=mask_overlay_pointsize,
376376
position_pointsize=position_pointsize,
377377
output_path=output_path,
378378
output_format=output_format,
@@ -405,7 +405,7 @@ def normalized_residual_map(
405405
xlabelsize=16,
406406
ylabelsize=16,
407407
xyticksize=16,
408-
mask_pointsize=10,
408+
mask_overlay_pointsize=10,
409409
position_pointsize=10,
410410
output_path=None,
411411
output_format="show",
@@ -447,7 +447,7 @@ def normalized_residual_map(
447447
xlabelsize=xlabelsize,
448448
ylabelsize=ylabelsize,
449449
xyticksize=xyticksize,
450-
mask_pointsize=mask_pointsize,
450+
mask_overlay_pointsize=mask_overlay_pointsize,
451451
position_pointsize=position_pointsize,
452452
output_path=output_path,
453453
output_format=output_format,
@@ -480,7 +480,7 @@ def chi_squared_map(
480480
xlabelsize=16,
481481
ylabelsize=16,
482482
xyticksize=16,
483-
mask_pointsize=10,
483+
mask_overlay_pointsize=10,
484484
position_pointsize=10,
485485
output_path=None,
486486
output_format="show",
@@ -522,7 +522,7 @@ def chi_squared_map(
522522
xlabelsize=xlabelsize,
523523
ylabelsize=ylabelsize,
524524
xyticksize=xyticksize,
525-
mask_pointsize=mask_pointsize,
525+
mask_overlay_pointsize=mask_overlay_pointsize,
526526
position_pointsize=position_pointsize,
527527
output_path=output_path,
528528
output_format=output_format,

‎autoarray/plotters/imaging_plotters.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def subplot(
3333
xlabelsize=10,
3434
ylabelsize=10,
3535
xyticksize=10,
36-
mask_pointsize=10,
36+
mask_overlay_pointsize=10,
3737
position_pointsize=30,
3838
grid_pointsize=1,
3939
output_path=None,
@@ -95,7 +95,7 @@ def subplot(
9595
xlabelsize=xlabelsize,
9696
ylabelsize=ylabelsize,
9797
xyticksize=xyticksize,
98-
mask_pointsize=mask_pointsize,
98+
mask_overlay_pointsize=mask_overlay_pointsize,
9999
position_pointsize=position_pointsize,
100100
grid_pointsize=grid_pointsize,
101101
output_path=output_path,
@@ -128,7 +128,7 @@ def subplot(
128128
xlabelsize=xlabelsize,
129129
ylabelsize=ylabelsize,
130130
xyticksize=xyticksize,
131-
mask_pointsize=mask_pointsize,
131+
mask_overlay_pointsize=mask_overlay_pointsize,
132132
output_path=output_path,
133133
output_format=output_format,
134134
)
@@ -187,7 +187,7 @@ def subplot(
187187
xlabelsize=xlabelsize,
188188
ylabelsize=ylabelsize,
189189
xyticksize=xyticksize,
190-
mask_pointsize=mask_pointsize,
190+
mask_overlay_pointsize=mask_overlay_pointsize,
191191
output_path=output_path,
192192
output_format=output_format,
193193
)
@@ -218,7 +218,7 @@ def subplot(
218218
xlabelsize=xlabelsize,
219219
ylabelsize=ylabelsize,
220220
xyticksize=xyticksize,
221-
mask_pointsize=mask_pointsize,
221+
mask_overlay_pointsize=mask_overlay_pointsize,
222222
output_path=output_path,
223223
output_format=output_format,
224224
)
@@ -249,7 +249,7 @@ def subplot(
249249
xlabelsize=xlabelsize,
250250
ylabelsize=ylabelsize,
251251
xyticksize=xyticksize,
252-
mask_pointsize=mask_pointsize,
252+
mask_overlay_pointsize=mask_overlay_pointsize,
253253
output_path=output_path,
254254
output_format=output_format,
255255
)
@@ -385,7 +385,7 @@ def image(
385385
xlabelsize=16,
386386
ylabelsize=16,
387387
xyticksize=16,
388-
mask_pointsize=10,
388+
mask_overlay_pointsize=10,
389389
position_pointsize=30,
390390
grid_pointsize=1,
391391
output_path=None,
@@ -434,7 +434,7 @@ def image(
434434
xlabelsize=xlabelsize,
435435
ylabelsize=ylabelsize,
436436
xyticksize=xyticksize,
437-
mask_pointsize=mask_pointsize,
437+
mask_overlay_pointsize=mask_overlay_pointsize,
438438
position_pointsize=position_pointsize,
439439
grid_pointsize=grid_pointsize,
440440
output_path=output_path,
@@ -468,7 +468,7 @@ def noise_map(
468468
xlabelsize=16,
469469
ylabelsize=16,
470470
xyticksize=16,
471-
mask_pointsize=10,
471+
mask_overlay_pointsize=10,
472472
output_path=None,
473473
output_format="show",
474474
output_filename="imaging_noise_map",
@@ -510,7 +510,7 @@ def noise_map(
510510
xlabelsize=xlabelsize,
511511
ylabelsize=ylabelsize,
512512
xyticksize=xyticksize,
513-
mask_pointsize=mask_pointsize,
513+
mask_overlay_pointsize=mask_overlay_pointsize,
514514
output_path=output_path,
515515
output_format=output_format,
516516
output_filename=output_filename,
@@ -612,7 +612,7 @@ def signal_to_noise_map(
612612
xlabelsize=16,
613613
ylabelsize=16,
614614
xyticksize=16,
615-
mask_pointsize=10,
615+
mask_overlay_pointsize=10,
616616
output_path=None,
617617
output_format="show",
618618
output_filename="imaging_signal_to_noise_map",
@@ -654,7 +654,7 @@ def signal_to_noise_map(
654654
xlabelsize=xlabelsize,
655655
ylabelsize=ylabelsize,
656656
xyticksize=xyticksize,
657-
mask_pointsize=mask_pointsize,
657+
mask_overlay_pointsize=mask_overlay_pointsize,
658658
output_path=output_path,
659659
output_format=output_format,
660660
output_filename=output_filename,
@@ -685,7 +685,7 @@ def absolute_signal_to_noise_map(
685685
xlabelsize=16,
686686
ylabelsize=16,
687687
xyticksize=16,
688-
mask_pointsize=10,
688+
mask_overlay_pointsize=10,
689689
output_path=None,
690690
output_format="show",
691691
output_filename="imaging_absolute_signal_to_noise_map",
@@ -727,7 +727,7 @@ def absolute_signal_to_noise_map(
727727
xlabelsize=xlabelsize,
728728
ylabelsize=ylabelsize,
729729
xyticksize=xyticksize,
730-
mask_pointsize=mask_pointsize,
730+
mask_overlay_pointsize=mask_overlay_pointsize,
731731
output_path=output_path,
732732
output_format=output_format,
733733
output_filename=output_filename,
@@ -758,7 +758,7 @@ def potential_chi_squared_map(
758758
xlabelsize=16,
759759
ylabelsize=16,
760760
xyticksize=16,
761-
mask_pointsize=10,
761+
mask_overlay_pointsize=10,
762762
output_path=None,
763763
output_format="show",
764764
output_filename="imaging_potential_chi_squared_map",
@@ -800,7 +800,7 @@ def potential_chi_squared_map(
800800
xlabelsize=xlabelsize,
801801
ylabelsize=ylabelsize,
802802
xyticksize=xyticksize,
803-
mask_pointsize=mask_pointsize,
803+
mask_overlay_pointsize=mask_overlay_pointsize,
804804
output_path=output_path,
805805
output_format=output_format,
806806
output_filename=output_filename,

test_autoarray/unit/plotters/test_fit_plotters.py renamed to test_autoarray/unit/plotters/imaging_test_fit_plotters.py

File renamed without changes.

0 commit comments

Comments
 (0)