fix unit tests

Jammy2211 · Mar 24, 2024 · e68d2f9 · e68d2f9
1 parent 6e6c46e
commit e68d2f9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/autolens/__init__.py b/autolens/__init__.py
@@ -47,8 +47,8 @@
 from autoarray.structures.visibilities import VisibilitiesNoiseMap
 
 from autogalaxy import cosmology as cosmo
-from autogalaxy.analysis.adapt_images import AdaptImages
-from autogalaxy.analysis.adapt_images import AdaptImageMaker
+from autogalaxy.analysis.adapt_images.adapt_images import AdaptImages
+from autogalaxy.analysis.adapt_images.adapt_image_maker import AdaptImageMaker
 from autogalaxy.gui.clicker import Clicker
 from autogalaxy.gui.scribbler import Scribbler
 from autogalaxy.galaxy.galaxy import Galaxy

diff --git a/autolens/analysis/analysis.py b/autolens/analysis/analysis.py
@@ -146,7 +146,7 @@ def __init__(
         positions_likelihood: Optional[
             Union[PositionsLHResample, PositionsLHPenalty]
         ] = None,
-        adapt_images: Optional[ag.AdaptImages] = None,
+        adapt_image_maker: Optional[ag.AdaptImageMaker] = None,
         cosmology: ag.cosmo.LensingCosmology = ag.cosmo.Planck15(),
         settings_inversion: aa.SettingsInversion = None,
         raise_inversion_positions_likelihood_exception: bool = True,
@@ -185,7 +185,7 @@ def __init__(
 
         super().__init__(
             dataset=dataset,
-            adapt_images=adapt_images,
+            adapt_image_maker=adapt_image_maker,
             cosmology=cosmology,
             settings_inversion=settings_inversion,
         )

diff --git a/autolens/fixtures.py b/autolens/fixtures.py
@@ -150,18 +150,20 @@ def make_adapt_images_7x7():
 
 
 def make_analysis_imaging_7x7():
-    return al.AnalysisImaging(
+    analysis = al.AnalysisImaging(
         dataset=make_masked_imaging_7x7(),
         settings_inversion=aa.SettingsInversion(use_w_tilde=False),
-        adapt_images=make_adapt_images_7x7(),
     )
+    analysis._adapt_images = make_adapt_images_7x7()
+    return analysis
 
 
 def make_analysis_interferometer_7():
-    return al.AnalysisInterferometer(
-        dataset=make_interferometer_7(), adapt_images=make_adapt_images_7x7()
+    analysis = al.AnalysisInterferometer(
+        dataset=make_interferometer_7(),
     )
-
+    analysis._adapt_images = make_adapt_images_7x7()
+    return analysis
 
 def make_analysis_point_x2():
     return al.AnalysisPoint(

diff --git a/autolens/interferometer/model/analysis.py b/autolens/interferometer/model/analysis.py
@@ -33,7 +33,7 @@ def __init__(
         positions_likelihood: Optional[
             Union[PositionsLHResample, PositionsLHPenalty]
         ] = None,
-        adapt_images: Optional[ag.AdaptImages] = None,
+        adapt_image_maker: Optional[ag.AdaptImageMaker] = None,
         cosmology: ag.cosmo.LensingCosmology = ag.cosmo.Planck15(),
         settings_inversion: aa.SettingsInversion = None,
         raise_inversion_positions_likelihood_exception: bool = True,
@@ -78,7 +78,7 @@ def __init__(
         super().__init__(
             dataset=dataset,
             positions_likelihood=positions_likelihood,
-            adapt_images=adapt_images,
+            adapt_image_maker=adapt_image_maker,
             cosmology=cosmology,
             settings_inversion=settings_inversion,
             raise_inversion_positions_likelihood_exception=raise_inversion_positions_likelihood_exception,

diff --git a/autolens/interferometer/model/result.py b/autolens/interferometer/model/result.py
@@ -3,7 +3,7 @@
 import autoarray as aa
 import autogalaxy as ag
 
-from autogalaxy.analysis.adapt_images import AdaptImages
+from autogalaxy.analysis.adapt_images.adapt_images import AdaptImages
 from autolens.lens.tracer import Tracer
 from autolens.interferometer.fit_interferometer import FitInterferometer
 from autolens.analysis.result import ResultDataset