Skip to content

Commit cd276cd

Browse files
committed
fix test imaging
1 parent 80fc8e8 commit cd276cd

3 files changed

Lines changed: 17 additions & 12 deletions

File tree

autoarray/dataset/imaging/dataset.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,9 @@ def w_tilde(self):
204204
indexes,
205205
lengths,
206206
) = inversion_imaging_util.w_tilde_curvature_preload_imaging_from(
207-
noise_map_native=np.array(self.noise_map.native),
208-
kernel_native=np.array(self.psf.native),
209-
native_index_for_slim_index=self.mask.derive_indexes.native_for_slim,
207+
noise_map_native=np.array(self.noise_map.native.array).astype("float64"),
208+
kernel_native=np.array(self.psf.native.array).astype("float64"),
209+
native_index_for_slim_index=np.array(self.mask.derive_indexes.native_for_slim).astype("int"),
210210
)
211211

212212
return WTildeImaging(
@@ -409,20 +409,20 @@ def apply_noise_scaling(
409409
"""
410410

411411
if signal_to_noise_value is None:
412-
noise_map = self.noise_map.native
413-
noise_map[mask == False] = noise_value
412+
noise_map = np.array(self.noise_map.native.array)
413+
noise_map[mask.array == False] = noise_value
414414
else:
415415
noise_map = np.where(
416416
mask == False,
417-
np.median(self.data.native[mask.derive_mask.edge == False])
417+
np.median(self.data.native.array[mask.derive_mask.edge == False])
418418
/ signal_to_noise_value,
419-
self.noise_map.native,
419+
self.noise_map.native.array,
420420
)
421421

422422
if should_zero_data:
423-
data = np.where(np.invert(mask), 0.0, self.data.native)
423+
data = np.where(np.invert(mask.array), 0.0, self.data.native.array)
424424
else:
425-
data = self.data.native
425+
data = self.data.native.array
426426

427427
data_unmasked = Array2D.no_mask(
428428
values=data,

test_autoarray/dataset/imaging/test_dataset.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ def test__apply_mask(imaging_7x7, mask_2d_7x7, psf_3x3):
139139
== 2.0 * np.ones((7, 7)) * np.invert(mask_2d_7x7)
140140
).all()
141141

142-
assert (masked_imaging_7x7.psf.slim == (1.0 / 3.0) * psf_3x3.slim).all()
142+
assert masked_imaging_7x7.psf.slim == pytest.approx((1.0 / 3.0) * psf_3x3.slim, 1.0e-4)
143143

144144
assert type(masked_imaging_7x7.psf) == aa.Kernel2D
145145
assert masked_imaging_7x7.w_tilde.curvature_preload.shape == (35,)
@@ -244,4 +244,9 @@ def test__noise_map_unmasked_has_zeros_or_negative__raises_exception():
244244
def test__psf_not_odd_x_odd_kernel__raises_error():
245245

246246
with pytest.raises(exc.KernelException):
247-
aa.Kernel2D.no_mask(values=[[0.0, 1.0], [1.0, 2.0]], pixel_scales=1.0)
247+
image = aa.Array2D.ones(shape_native=(3, 3), pixel_scales=1.0)
248+
noise_map = aa.Array2D.ones(shape_native=(3, 3), pixel_scales=1.0)
249+
psf = aa.Kernel2D.no_mask(values=[[0.0, 1.0], [1.0, 2.0]], pixel_scales=1.0)
250+
251+
dataset = aa.Imaging(data=image, noise_map=noise_map, psf=psf, pad_for_psf=False)
252+

test_autoarray/dataset/imaging/test_simulator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def test__via_image_from__psf_off__noise_off_value_is_noise_value(
7070
== np.array([[0.0, 0.0, 0.0], [0.0, 1.0, 0.0], [0.0, 0.0, 0.0]])
7171
).all()
7272

73-
assert np.allclose(dataset.noise_map.native, 0.2 * np.ones((3, 3)))
73+
assert np.allclose(dataset.noise_map.native.array, 0.2 * np.ones((3, 3)))
7474

7575

7676
def test__via_image_from__psf_off__background_sky_on(image_central_delta_3x3):

0 commit comments

Comments
 (0)