@@ -290,66 +290,7 @@ def test__from_as_gaussian_via_alma_fits_header_parameters__identical_to_astropy
290290 assert kernel_astropy == pytest .approx (kernel_2d .native ._array , abs = 1e-4 )
291291
292292
293- def test__convolved_array_from ():
294-
295- array_2d = aa .Array2D .no_mask (
296- [
297- [0.0 , 0.0 , 0.0 , 0.0 ],
298- [1.0 , 0.0 , 0.0 , 0.0 ],
299- [0.0 , 0.0 , 0.0 , 1.0 ],
300- [0.0 , 0.0 , 0.0 , 0.0 ],
301- ],
302- pixel_scales = 1.0 ,
303- )
304-
305- kernel_2d = aa .Kernel2D .no_mask (
306- values = [[1.0 , 1.0 , 1.0 ], [2.0 , 2.0 , 1.0 ], [1.0 , 3.0 , 3.0 ]], pixel_scales = 1.0
307- )
308-
309- blurred_array_2d = kernel_2d .convolved_array_from (array_2d )
310-
311- assert (
312- blurred_array_2d .native
313- == np .array (
314- [
315- [1.0 , 1.0 , 0.0 , 0.0 ],
316- [2.0 , 1.0 , 1.0 , 1.0 ],
317- [3.0 , 3.0 , 2.0 , 2.0 ],
318- [0.0 , 0.0 , 1.0 , 3.0 ],
319- ]
320- )
321- ).all ()
322-
323- array_2d = aa .Array2D .no_mask (
324- values = [
325- [1.0 , 0.0 , 0.0 , 0.0 ],
326- [0.0 , 0.0 , 0.0 , 0.0 ],
327- [0.0 , 0.0 , 0.0 , 0.0 ],
328- [0.0 , 0.0 , 0.0 , 1.0 ],
329- ],
330- pixel_scales = 1.0 ,
331- )
332-
333- kernel_2d = aa .Kernel2D .no_mask (
334- values = [[1.0 , 1.0 , 1.0 ], [2.0 , 2.0 , 1.0 ], [1.0 , 3.0 , 3.0 ]], pixel_scales = 1.0
335- )
336-
337- blurred_array_2d = kernel_2d .convolved_array_from (array_2d )
338-
339- assert (
340- blurred_array_2d .native
341- == np .array (
342- [
343- [2.0 , 1.0 , 0.0 , 0.0 ],
344- [3.0 , 3.0 , 0.0 , 0.0 ],
345- [0.0 , 0.0 , 1.0 , 1.0 ],
346- [0.0 , 0.0 , 2.0 , 2.0 ],
347- ]
348- )
349- ).all ()
350-
351-
352- def test__convolve_image ():
293+ def test__convolved_image_from ():
353294
354295 mask = aa .Mask2D .circular (
355296 shape_native = (30 , 30 ), pixel_scales = (1.0 , 1.0 ), radius = 4.0
@@ -390,7 +331,7 @@ def test__convolve_image():
390331 )
391332
392333
393- def test__convolve_image_no_blurring ():
334+ def test__convolve_imaged_from__no_blurring ():
394335 # Setup a blurred data, using the PSF to perform the convolution in 2D, then masks it to make a 1d array.
395336
396337 mask = aa .Mask2D .circular (
@@ -429,7 +370,7 @@ def test__convolve_image_no_blurring():
429370 )
430371
431372
432- def test__convolve_mapping_matrix ():
373+ def test__convolved_mapping_matrix_from ():
433374 mask = aa .Mask2D (
434375 mask = np .array (
435376 [
@@ -558,7 +499,7 @@ def test__convolve_mapping_matrix():
558499 )
559500
560501
561- def test__convolve_image__via_fft__sizes_not_precomputed__compare_numerical_value ():
502+ def test__convolve_imaged_from__via_fft__sizes_not_precomputed__compare_numerical_value ():
562503
563504 # -------------------------------
564505 # Case 1: direct image convolution
0 commit comments