From 5e8dcac4175619ce767303a512008aae9d5e352b Mon Sep 17 00:00:00 2001 From: James Nightingale Date: Thu, 13 Mar 2025 18:39:40 +0000 Subject: [PATCH 1/5] updated all save_fits inputs --- autogalaxy/aggregator/__init__.py | 2 +- autogalaxy/aggregator/subplot.py | 4 +++- autogalaxy/analysis/analysis/dataset.py | 10 +++++----- autogalaxy/ellipse/model/analysis.py | 6 +++--- autogalaxy/imaging/model/analysis.py | 4 ++-- autogalaxy/imaging/model/plotter_interface.py | 1 - autogalaxy/interferometer/model/analysis.py | 4 ++-- .../profiles/mass/dark/gnfw_virial_mass_gnfw_conc.py | 10 ++++++++-- autogalaxy/quantity/model/analysis.py | 6 +++--- 9 files changed, 27 insertions(+), 20 deletions(-) diff --git a/autogalaxy/aggregator/__init__.py b/autogalaxy/aggregator/__init__.py index ae5067da9..56c0a6dc7 100644 --- a/autogalaxy/aggregator/__init__.py +++ b/autogalaxy/aggregator/__init__.py @@ -7,4 +7,4 @@ from autogalaxy.aggregator.ellipse.multipoles import MultipolesAgg from autogalaxy.aggregator.ellipse.fit_ellipse import FitEllipseAgg from autogalaxy.aggregator.subplot import SubplotDataset as subplot_dataset -from autogalaxy.aggregator.subplot import SubplotFit as subplot_fit \ No newline at end of file +from autogalaxy.aggregator.subplot import SubplotFit as subplot_fit diff --git a/autogalaxy/aggregator/subplot.py b/autogalaxy/aggregator/subplot.py index 5cf44a7af..72f23f11a 100644 --- a/autogalaxy/aggregator/subplot.py +++ b/autogalaxy/aggregator/subplot.py @@ -1,5 +1,6 @@ from enum import Enum + class SubplotDataset(Enum): """ The subplots that can be extracted from the subplot_fit image. @@ -16,6 +17,7 @@ class SubplotDataset(Enum): over_sample_size_lp = (0, 2) over_sample_Size_pixelization = (1, 2) + class SubplotFit(Enum): """ The subplots that can be extracted from the subplot_fit image. @@ -28,4 +30,4 @@ class SubplotFit(Enum): model_image = (2, 0) normalized_residual_map = (0, 1) normalized_residual_map_one_sigma = (1, 1) - chi_squared_map = (2, 1) \ No newline at end of file + chi_squared_map = (2, 1) diff --git a/autogalaxy/analysis/analysis/dataset.py b/autogalaxy/analysis/analysis/dataset.py index 17a0e6327..ff7a6088b 100644 --- a/autogalaxy/analysis/analysis/dataset.py +++ b/autogalaxy/analysis/analysis/dataset.py @@ -170,22 +170,22 @@ def save_attributes(self, paths: af.DirectoryPaths): """ paths.save_fits( name="data", - hdu=self.dataset.data.hdu_for_output, + fits=self.dataset.data.hdu_for_output, prefix="dataset", ) paths.save_fits( name="noise_map", - hdu=self.dataset.noise_map.hdu_for_output, + fits=self.dataset.noise_map.hdu_for_output, prefix="dataset", ) paths.save_fits( name="over_sample_size_lp", - hdu=self.dataset.grids.lp.over_sample_size.native.hdu_for_output, + fits=self.dataset.grids.lp.over_sample_size.native.hdu_for_output, prefix="dataset", ) paths.save_fits( name="over_sample_size_pixelization", - hdu=self.dataset.grids.pixelization.over_sample_size.native.hdu_for_output, + fits=self.dataset.grids.pixelization.over_sample_size.native.hdu_for_output, prefix="dataset", ) paths.save_json( @@ -209,7 +209,7 @@ def save_attributes(self, paths: af.DirectoryPaths): for name in self.adapt_images.galaxy_name_image_dict.keys(): paths.save_fits( name=name, - hdu=self.adapt_images.galaxy_name_image_dict[name].hdu_for_output, + fits=self.adapt_images.galaxy_name_image_dict[name].hdu_for_output, prefix="adapt_images", ) diff --git a/autogalaxy/ellipse/model/analysis.py b/autogalaxy/ellipse/model/analysis.py index 8437ee0bb..857c570d3 100644 --- a/autogalaxy/ellipse/model/analysis.py +++ b/autogalaxy/ellipse/model/analysis.py @@ -186,17 +186,17 @@ def save_attributes(self, paths: af.DirectoryPaths): """ paths.save_fits( name="data", - hdu=self.dataset.data.hdu_for_output, + fits=self.dataset.data.hdu_for_output, prefix="dataset", ) paths.save_fits( name="noise_map", - hdu=self.dataset.noise_map.hdu_for_output, + fits=self.dataset.noise_map.hdu_for_output, prefix="dataset", ) paths.save_fits( name="mask", - hdu=self.dataset.mask.hdu_for_output, + fits=self.dataset.mask.hdu_for_output, prefix="dataset", ) diff --git a/autogalaxy/imaging/model/analysis.py b/autogalaxy/imaging/model/analysis.py index 135bc091e..8e1d69869 100644 --- a/autogalaxy/imaging/model/analysis.py +++ b/autogalaxy/imaging/model/analysis.py @@ -232,12 +232,12 @@ def save_attributes(self, paths: af.DirectoryPaths): paths.save_fits( name="psf", - hdu=self.dataset.psf.hdu_for_output, + fits=self.dataset.psf.hdu_for_output, prefix="dataset", ) paths.save_fits( name="mask", - hdu=self.dataset.mask.hdu_for_output, + fits=self.dataset.mask.hdu_for_output, prefix="dataset", ) diff --git a/autogalaxy/imaging/model/plotter_interface.py b/autogalaxy/imaging/model/plotter_interface.py index fdcdd0e8c..7074f2b2e 100644 --- a/autogalaxy/imaging/model/plotter_interface.py +++ b/autogalaxy/imaging/model/plotter_interface.py @@ -60,7 +60,6 @@ def fits_to_fits( ) if should_plot("fits_model_galaxy_images"): - multi_plotter = aplt.MultiFigurePlotter( plotter_list=[ aplt.Array2DPlotter(array=image, mat_plot_2d=mat_plot_2d) diff --git a/autogalaxy/interferometer/model/analysis.py b/autogalaxy/interferometer/model/analysis.py index 735a73fab..d4924f2bf 100644 --- a/autogalaxy/interferometer/model/analysis.py +++ b/autogalaxy/interferometer/model/analysis.py @@ -237,10 +237,10 @@ def save_attributes(self, paths: af.DirectoryPaths): hdu = aa.util.array_2d.hdu_for_output_from( array_2d=self.dataset.uv_wavelengths, ) - paths.save_fits(name="uv_wavelengths", hdu=hdu, prefix="dataset") + paths.save_fits(name="uv_wavelengths", fits=hdu, prefix="dataset") paths.save_fits( name="real_space_mask", - hdu=self.dataset.real_space_mask.hdu_for_output, + fits=self.dataset.real_space_mask.hdu_for_output, prefix="dataset", ) paths.save_json( diff --git a/autogalaxy/profiles/mass/dark/gnfw_virial_mass_gnfw_conc.py b/autogalaxy/profiles/mass/dark/gnfw_virial_mass_gnfw_conc.py index df706fa14..ad466df1a 100644 --- a/autogalaxy/profiles/mass/dark/gnfw_virial_mass_gnfw_conc.py +++ b/autogalaxy/profiles/mass/dark/gnfw_virial_mass_gnfw_conc.py @@ -11,7 +11,13 @@ def kappa_s_and_scale_radius( - cosmology, virial_mass, concentration, overdens, redshift_object, redshift_source, inner_slope + cosmology, + virial_mass, + concentration, + overdens, + redshift_object, + redshift_source, + inner_slope, ): # gNFW concentration imported @@ -129,4 +135,4 @@ def __init__( kappa_s=kappa_s, inner_slope=inner_slope, scale_radius=scale_radius, - ) \ No newline at end of file + ) diff --git a/autogalaxy/quantity/model/analysis.py b/autogalaxy/quantity/model/analysis.py index 78ebb372f..9b455200f 100644 --- a/autogalaxy/quantity/model/analysis.py +++ b/autogalaxy/quantity/model/analysis.py @@ -152,17 +152,17 @@ def save_attributes(self, paths: af.DirectoryPaths): """ paths.save_fits( name="data", - hdu=self.dataset.data.hdu_for_output, + fits=self.dataset.data.hdu_for_output, prefix="dataset", ) paths.save_fits( name="noise_map", - hdu=self.dataset.noise_map.hdu_for_output, + fits=self.dataset.noise_map.hdu_for_output, prefix="dataset", ) paths.save_fits( name="mask", - hdu=self.dataset.mask.hdu_for_output, + fits=self.dataset.mask.hdu_for_output, prefix="dataset", ) paths.save_json( From e57f637598aa07fcf982bc61e2c109956825ab66 Mon Sep 17 00:00:00 2001 From: Richard Date: Fri, 14 Mar 2025 12:25:11 +0000 Subject: [PATCH 2/5] fix test -using new fits rather than hdu --- autogalaxy/aggregator/imaging/imaging.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/autogalaxy/aggregator/imaging/imaging.py b/autogalaxy/aggregator/imaging/imaging.py index 461e57c02..c3a472820 100644 --- a/autogalaxy/aggregator/imaging/imaging.py +++ b/autogalaxy/aggregator/imaging/imaging.py @@ -39,15 +39,17 @@ def _imaging_from( dataset_list = [] for fit in fit_list: - data = aa.Array2D.from_primary_hdu(primary_hdu=fit.value(name="dataset.data")) + data = aa.Array2D.from_primary_hdu( + primary_hdu=fit.value(name="dataset.data")[0] + ) noise_map = aa.Array2D.from_primary_hdu( - primary_hdu=fit.value(name="dataset.noise_map") + primary_hdu=fit.value(name="dataset.noise_map")[0] ) try: psf = aa.Kernel2D.from_primary_hdu( - primary_hdu=fit.value(name="dataset.psf") + primary_hdu=fit.value(name="dataset.psf")[0] ) - except AttributeError: + except TypeError: psf = None dataset = aa.Imaging( @@ -57,26 +59,26 @@ def _imaging_from( check_noise_map=False, ) - mask = aa.Mask2D.from_primary_hdu(primary_hdu=fit.value(name="dataset.mask")) + mask = aa.Mask2D.from_primary_hdu(primary_hdu=fit.value(name="dataset.mask")[0]) dataset = dataset.apply_mask(mask=mask) try: over_sample_size_lp = aa.Array2D.from_primary_hdu( - primary_hdu=fit.value(name="dataset.over_sample_size_lp") + primary_hdu=fit.value(name="dataset.over_sample_size_lp")[0] ).native over_sample_size_lp = over_sample_size_lp.apply_mask(mask=mask) - except AttributeError: + except TypeError: over_sample_size_lp = 1 try: over_sample_size_pixelization = aa.Array2D.from_primary_hdu( - primary_hdu=fit.value(name="dataset.over_sample_size_pixelization") + primary_hdu=fit.value(name="dataset.over_sample_size_pixelization")[0] ).native over_sample_size_pixelization = over_sample_size_pixelization.apply_mask( mask=mask ) - except AttributeError: + except TypeError: over_sample_size_pixelization = 1 dataset = dataset.apply_over_sampling( From d0ffcc5c83ff6e52e7e67892faf87fe26a81455d Mon Sep 17 00:00:00 2001 From: Richard Date: Fri, 14 Mar 2025 12:35:06 +0000 Subject: [PATCH 3/5] fix more tesdts --- autogalaxy/aggregator/agg_util.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/autogalaxy/aggregator/agg_util.py b/autogalaxy/aggregator/agg_util.py index 58b818d3e..3476636e1 100644 --- a/autogalaxy/aggregator/agg_util.py +++ b/autogalaxy/aggregator/agg_util.py @@ -38,11 +38,11 @@ def adapt_images_from( for fit in fit_list: try: mask = aa.Mask2D.from_primary_hdu( - primary_hdu=fit.value(name="dataset.mask") + primary_hdu=fit.value(name="dataset.mask")[0] ) except AttributeError: mask = aa.Mask2D.from_primary_hdu( - primary_hdu=fit.value(name="dataset.real_space_mask") + primary_hdu=fit.value(name="dataset.real_space_mask")[0] ) galaxy_name_image_dict = {} @@ -51,7 +51,7 @@ def adapt_images_from( for name in adapt_image_name_list: adapt_image = aa.Array2D.from_primary_hdu( - primary_hdu=fit.value(name=f"adapt_images.{name}") + primary_hdu=fit.value(name=f"adapt_images.{name}")[0] ) adapt_image = adapt_image.apply_mask(mask=mask) galaxy_name_image_dict[name] = adapt_image From c47f0bbcd7882607a5b8dcd078e1299ac3cfcc92 Mon Sep 17 00:00:00 2001 From: Richard Date: Fri, 14 Mar 2025 12:39:36 +0000 Subject: [PATCH 4/5] fixed remaining tests --- autogalaxy/aggregator/agg_util.py | 2 +- autogalaxy/aggregator/interferometer/interferometer.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/autogalaxy/aggregator/agg_util.py b/autogalaxy/aggregator/agg_util.py index 3476636e1..91bf0f57f 100644 --- a/autogalaxy/aggregator/agg_util.py +++ b/autogalaxy/aggregator/agg_util.py @@ -40,7 +40,7 @@ def adapt_images_from( mask = aa.Mask2D.from_primary_hdu( primary_hdu=fit.value(name="dataset.mask")[0] ) - except AttributeError: + except TypeError: mask = aa.Mask2D.from_primary_hdu( primary_hdu=fit.value(name="dataset.real_space_mask")[0] ) diff --git a/autogalaxy/aggregator/interferometer/interferometer.py b/autogalaxy/aggregator/interferometer/interferometer.py index 1408254e4..7bdf2ac2d 100644 --- a/autogalaxy/aggregator/interferometer/interferometer.py +++ b/autogalaxy/aggregator/interferometer/interferometer.py @@ -41,18 +41,18 @@ def _interferometer_from( for fit in fit_list: data = aa.Visibilities( - visibilities=fit.value(name="dataset.data").data.astype("float") + visibilities=fit.value(name="dataset.data")[0].data.astype("float") ) noise_map = aa.VisibilitiesNoiseMap( - fit.value(name="dataset.noise_map").data.astype("float") + fit.value(name="dataset.noise_map")[0].data.astype("float") ) - uv_wavelengths = fit.value(name="dataset.uv_wavelengths").data + uv_wavelengths = fit.value(name="dataset.uv_wavelengths")[0].data real_space_mask = ( real_space_mask if real_space_mask is not None else aa.Mask2D.from_primary_hdu( - primary_hdu=fit.value(name="dataset.real_space_mask") + primary_hdu=fit.value(name="dataset.real_space_mask")[0] ) ) From 7fdff77ecb97d7f75d48943c1a747a5c710f0318 Mon Sep 17 00:00:00 2001 From: Richard Date: Fri, 14 Mar 2025 12:42:17 +0000 Subject: [PATCH 5/5] bump actions/cache version --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ede250ca5..bfd5837db 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,7 +32,7 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 id: cache-pip with: path: ~/.cache/pip