Skip to content

Commit db0dc30

Browse files
Jammy2211claude
authored andcommitted
fix: drop AdaptImages single-pixelated-galaxy fallback in lens.to_inversion
Replaces the autolens/lens/to_inversion.py:280-290 workaround (search dict keys for has(cls=Pixelization) when galaxies_with_pixelization_list has length 1) with the new AdaptImages.image_for_galaxy helper from PyAutoGalaxy. Per-plane GalaxiesToInversion now passes path_galaxies=tracer.galaxies so the autogalaxy-side positional lookup sees the full galaxy list rather than a per-plane subset. Analysis. fit_from passes galaxies=tracer.galaxies into adapt_images_via_instance_from. Depends on PyAutoGalaxy PR (image_for_galaxy + path_galaxies). Merge order: PyAutoGalaxy first. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent a409055 commit db0dc30

3 files changed

Lines changed: 12 additions & 19 deletions

File tree

autolens/imaging/model/analysis.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ def fit_from(
117117

118118
dataset_model = self.dataset_model_via_instance_from(instance=instance)
119119

120-
adapt_images = self.adapt_images_via_instance_from(instance=instance)
120+
adapt_images = self.adapt_images_via_instance_from(
121+
instance=instance, galaxies=tracer.galaxies
122+
)
121123

122124
return FitImaging(
123125
dataset=self.dataset,

autolens/interferometer/model/analysis.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,9 @@ def fit_from(self, instance: af.ModelInstance) -> FitInterferometer:
180180
instance=instance,
181181
)
182182

183-
adapt_images = self.adapt_images_via_instance_from(instance=instance)
183+
adapt_images = self.adapt_images_via_instance_from(
184+
instance=instance, galaxies=tracer.galaxies
185+
)
184186

185187
return FitInterferometer(
186188
dataset=self.dataset,

autolens/lens/to_inversion.py

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -270,24 +270,12 @@ def adapt_galaxy_image_pg_list(self) -> List[List[np.ndarray]]:
270270
)
271271

272272
for galaxy in galaxies_with_pixelization_list:
273-
try:
274-
image = self.adapt_images.galaxy_image_dict[galaxy]
275-
except (AttributeError, KeyError, TypeError):
273+
if self.adapt_images is None:
276274
image = None
277-
278-
# Bug fix whereby for certain models the galaxy doesnt pair correctly.
279-
280-
if image is None and len(galaxies_with_pixelization_list) == 1:
281-
galaxy_list = self.adapt_images.galaxy_image_dict.keys()
282-
galaxy_with_pixelization = [
283-
galaxy
284-
for galaxy in galaxy_list
285-
if galaxy.has(cls=aa.Pixelization)
286-
][0]
287-
288-
image = self.adapt_images.galaxy_image_dict[
289-
galaxy_with_pixelization
290-
]
275+
else:
276+
image = self.adapt_images.image_for_galaxy(
277+
galaxy, self.tracer.galaxies
278+
)
291279

292280
plane_image_list.append(image)
293281

@@ -330,6 +318,7 @@ def image_plane_mesh_grid_pg_list(self) -> List[List]:
330318
adapt_images=self.adapt_images,
331319
settings=self.settings,
332320
xp=self._xp,
321+
path_galaxies=self.tracer.galaxies,
333322
)
334323

335324
image_plane_mesh_grid_list = to_inversion.image_plane_mesh_grid_list

0 commit comments

Comments
 (0)