Skip to content

Commit 30e20e0

Browse files
Jammy2211Jammy2211
authored andcommitted
fix fixtures
1 parent c02f988 commit 30e20e0

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

autoarray/dataset/imaging/dataset.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ def apply_sparse_operator(
433433
inversion_imaging_util.ImagingSparseOperator.from_noise_map_and_psf(
434434
data=self.data,
435435
noise_map=self.noise_map,
436-
psf=self.psf.native,
436+
psf=self.psf.kernel.native,
437437
batch_size=batch_size,
438438
)
439439
)
@@ -491,7 +491,7 @@ def apply_sparse_operator_cpu(
491491
lengths,
492492
) = inversion_imaging_numba_util.psf_precision_operator_sparse_from(
493493
noise_map_native=np.array(self.noise_map.native.array).astype("float64"),
494-
kernel_native=np.array(self.psf.native.array).astype("float64"),
494+
kernel_native=np.array(self.psf.kernel.native.array).astype("float64"),
495495
native_index_for_slim_index=np.array(
496496
self.mask.derive_indexes.native_for_slim
497497
).astype("int"),

autoarray/fixtures.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ def make_image_7x7():
119119

120120

121121
def make_psf_3x3():
122-
psf = np.array([[0.0, 0.5, 0.0], [0.5, 1.0, 0.5], [0.0, 0.5, 0.0]])
122+
psf = aa.Array2D.no_mask(values=[[0.0, 0.5, 0.0], [0.5, 1.0, 0.5], [0.0, 0.5, 0.0]], pixel_scales=(1.0, 1.0))
123123

124-
return aa.Convolver.no_mask(values=psf, pixel_scales=(1.0, 1.0))
124+
return aa.Convolver(kernel=psf)
125125

126126

127127
def make_psf_3x3_no_blur():

autoarray/inversion/inversion/imaging/abstract.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ def data_linear_func_matrix_dict(self):
229229
data_linear_func_matrix = (
230230
inversion_imaging_util.data_linear_func_matrix_from(
231231
curvature_weights_matrix=curvature_weights,
232-
kernel_native=self.psf.native,
232+
kernel_native=self.psf.kernel.native,
233233
mask=self.mask,
234234
)
235235
)

autoarray/inversion/inversion/imaging_numba/inversion_imaging_numba_util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,7 @@ def psf_precision_operator(self):
873873

874874
return psf_precision_operator_from(
875875
noise_map_native=self.noise_map.native.array,
876-
kernel_native=self.psf.native.array,
876+
kernel_native=self.psf.kernel.native.array,
877877
native_index_for_slim_index=np.array(
878878
self.mask.derive_indexes.native_for_slim
879879
).astype("int"),

autoarray/inversion/inversion/imaging_numba/sparse.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def psf_weighted_data(self):
6262
return inversion_imaging_numba_util.psf_weighted_data_from(
6363
image_native=np.array(self.data.native.array),
6464
noise_map_native=self.noise_map.native.array,
65-
kernel_native=self.psf.native.array,
65+
kernel_native=self.psf.kernel.native.array,
6666
native_index_for_slim_index=self.data.mask.derive_indexes.native_for_slim,
6767
)
6868

@@ -430,7 +430,7 @@ def _curvature_matrix_func_list_and_mapper(self) -> np.ndarray:
430430
pix_pixels=mapper.params,
431431
curvature_weights=np.array(data_linear_func_matrix),
432432
mask=self.mask.array,
433-
psf_kernel=self.psf.native.array,
433+
psf_kernel=self.psf.kernel.native.array,
434434
)
435435

436436
curvature_matrix[

0 commit comments

Comments
 (0)