Skip to content

Commit dfb6e99

Browse files
committed
Quick fix on path structure of output
1 parent a0a1020 commit dfb6e99

3 files changed

Lines changed: 15 additions & 13 deletions

File tree

autoarray/operators/inversion/inversions.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,9 @@ def mapped_reconstructed_image(self):
216216

217217
@property
218218
def residual_map(self):
219-
return inversion_util.inversion_residual_map_from_pixelization_values_and_reconstructed_data_1d(
219+
return inversion_util.inversion_residual_map_from_pixelization_values_and_data(
220220
pixelization_values=self.reconstruction,
221-
mapped_reconstructed_data=self.image,
221+
data=self.image,
222222
mask_1d_index_for_sub_mask_1d_index=self.mapper.grid.mask.regions._mask_1d_index_for_sub_mask_1d_index,
223223
all_sub_mask_1d_indexes_for_pixelization_1d_index=self.mapper.all_sub_mask_1d_indexes_for_pixelization_1d_index,
224224
)
@@ -365,11 +365,13 @@ def from_data_mapper_and_regularization(
365365

366366
@property
367367
def mapped_reconstructed_image(self):
368-
return inversion_util.mapped_reconstructed_data_from_mapping_matrix_and_reconstruction(
368+
mapped_reconstructed_image = inversion_util.mapped_reconstructed_data_from_mapping_matrix_and_reconstruction(
369369
mapping_matrix=self.mapper.mapping_matrix,
370370
reconstruction=self.reconstruction,
371371
)
372372

373+
return self.mapper.grid.mapping.array_from_array_1d(array_1d=mapped_reconstructed_image)
374+
373375
@property
374376
def mapped_reconstructed_visibilities(self):
375377
real_visibilities = inversion_util.mapped_reconstructed_data_from_mapping_matrix_and_reconstruction(

autoarray/util/inversion_util.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,9 @@ def curvature_matrix_from_transformed_mapping_matrix(
188188
return curvature_matrix
189189

190190

191-
def inversion_residual_map_from_pixelization_values_and_reconstructed_data_1d(
191+
def inversion_residual_map_from_pixelization_values_and_data(
192192
pixelization_values,
193-
mapped_reconstructed_data,
193+
data,
194194
mask_1d_index_for_sub_mask_1d_index,
195195
all_sub_mask_1d_indexes_for_pixelization_1d_index,
196196
):
@@ -207,8 +207,8 @@ def inversion_residual_map_from_pixelization_values_and_reconstructed_data_1d(
207207
sub_mask_total += 1
208208
mask_1d_index = mask_1d_index_for_sub_mask_1d_index[sub_mask_1d_index]
209209
residual = (
210-
mapped_reconstructed_data[mask_1d_index]
211-
- pixelization_values[pix_1_index]
210+
data[mask_1d_index]
211+
- pixelization_values[pix_1_index]
212212
)
213213
residual_map[pix_1_index] += np.abs(residual)
214214

test_autoarray/unit/util/test_inversion_util.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,9 @@ def test__pixelization_perfectly_reconstructed_data__quantities_like_residuals_a
201201
[2, 2, 2],
202202
]
203203

204-
pixelization_residuals = aa.util.inversion.inversion_residual_map_from_pixelization_values_and_reconstructed_data_1d(
204+
pixelization_residuals = aa.util.inversion.inversion_residual_map_from_pixelization_values_and_data(
205205
pixelization_values=pixelization_values,
206-
mapped_reconstructed_data=reconstructed_data_1d,
206+
data=reconstructed_data_1d,
207207
mask_1d_index_for_sub_mask_1d_index=mask_1d_index_for_sub_mask_1d_index,
208208
all_sub_mask_1d_indexes_for_pixelization_1d_index=all_sub_mask_1d_indexes_for_pixelization_1d_index,
209209
)
@@ -221,9 +221,9 @@ def test__pixelization_not_perfect_fit__quantities_like_residuals_non_zero(self)
221221
[6, 7, 8],
222222
]
223223

224-
pixelization_residuals = aa.util.inversion.inversion_residual_map_from_pixelization_values_and_reconstructed_data_1d(
224+
pixelization_residuals = aa.util.inversion.inversion_residual_map_from_pixelization_values_and_data(
225225
pixelization_values=pixelization_values,
226-
mapped_reconstructed_data=reconstructed_data_1d,
226+
data=reconstructed_data_1d,
227227
mask_1d_index_for_sub_mask_1d_index=mask_1d_index_for_sub_mask_1d_index,
228228
all_sub_mask_1d_indexes_for_pixelization_1d_index=all_sub_mask_1d_indexes_for_pixelization_1d_index,
229229
)
@@ -239,9 +239,9 @@ def test__pixelization_not_perfect_fit__quantities_like_residuals_non_zero(self)
239239
[6, 7, 8],
240240
]
241241

242-
pixelization_residuals = aa.util.inversion.inversion_residual_map_from_pixelization_values_and_reconstructed_data_1d(
242+
pixelization_residuals = aa.util.inversion.inversion_residual_map_from_pixelization_values_and_data(
243243
pixelization_values=pixelization_values,
244-
mapped_reconstructed_data=reconstructed_data_1d,
244+
data=reconstructed_data_1d,
245245
mask_1d_index_for_sub_mask_1d_index=mask_1d_index_for_sub_mask_1d_index,
246246
all_sub_mask_1d_indexes_for_pixelization_1d_index=all_sub_mask_1d_indexes_for_pixelization_1d_index,
247247
)

0 commit comments

Comments
 (0)