fix unit tests

Jammy2211 · May 3, 2024 · 702f574 · 702f574
1 parent 93642b2
commit 702f574
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/autocti/charge_injection/plot/fit_ci_plotters.py b/autocti/charge_injection/plot/fit_ci_plotters.py
@@ -265,7 +265,7 @@ def figures_1d(
             )
 
         if noise_map:
-            y = self.extract_region_from(array=self.fit.image, region=region)
+            y = self.extract_region_from(array=self.fit.data, region=region)
 
             self.mat_plot_1d.plot_yx(
                 y=y,

diff --git a/autocti/model/analysis.py b/autocti/model/analysis.py
@@ -75,6 +75,9 @@ def save_results_combined(self, paths: af.DirectoryPaths, result: ResultImagingC
             The result of a model fit, including the non-linear search and samples.
         """
 
+        if result.samples is None:
+            return
+
         weight_list = []
         delta_ellipticity_list = []
 

diff --git a/docs/api/data.rst b/docs/api/data.rst
@@ -18,7 +18,6 @@ grids of (y,x) Cartesian coordinates.
    Mask2D
    Array2D
    Grid2D
-   Grid2DIterate
    Grid2DIrregular
 
 Charge Injection Imaging

diff --git a/test_autocti/aggregator/conftest.py b/test_autocti/aggregator/conftest.py
@@ -6,6 +6,7 @@
 from autoconf import conf
 import autofit as af
 import autocti as ac
+from autoconf.conf import with_config
 from autofit.non_linear.samples import Sample
 
 
@@ -28,6 +29,12 @@ def clean(database_file):
         shutil.rmtree(result_path)
 
 
+@with_config(
+    "general",
+    "output",
+    "samples_to_csv",
+    value=True,
+)
 def aggregator_from(database_file, analysis, model, samples):
     result_path = path.join(conf.instance.output_path, database_file)
 

diff --git a/test_autocti/charge_injection/model/test_analysis_ci.py b/test_autocti/charge_injection/model/test_analysis_ci.py
@@ -212,7 +212,7 @@ def test__full_and_extracted_fits_from_instance_and_imaging_ci(
 
     fit = ac.FitImagingCI(dataset=masked_dataset, post_cti_data=post_cti_data)
 
-    assert fit.image.shape == (7, 1)
+    assert fit.data.shape == (7, 1)
     assert fit_analysis.log_likelihood == pytest.approx(fit.log_likelihood)
 
     fit_full_analysis = analysis.fit_via_instance_and_dataset_from(
@@ -221,7 +221,7 @@ def test__full_and_extracted_fits_from_instance_and_imaging_ci(
 
     fit = ac.FitImagingCI(dataset=imaging_ci_7x7, post_cti_data=post_cti_data)
 
-    assert fit.image.shape == (7, 7)
+    assert fit.data.shape == (7, 7)
     assert fit_full_analysis.log_likelihood == pytest.approx(fit.log_likelihood)
 
 
@@ -273,7 +273,7 @@ def test__extracted_fits_from_instance_and_imaging_ci__include_noise_scaling(
         },
     )
 
-    assert fit.image.shape == (7, 1)
+    assert fit.data.shape == (7, 1)
     assert fit.log_likelihood == pytest.approx(fit_analysis.log_likelihood, 1.0e-4)
 
     fit = ac.FitImagingCI(
@@ -300,7 +300,7 @@ def test__extracted_fits_from_instance_and_imaging_ci__include_noise_scaling(
         },
     )
 
-    assert fit.image.shape == (7, 7)
+    assert fit.data.shape == (7, 7)
     assert fit.log_likelihood == pytest.approx(fit_full_analysis.log_likelihood, 1.0e-4)
 
     fit = ac.FitImagingCI(