diff --git a/autogalaxy/__init__.py b/autogalaxy/__init__.py index 36aefc314..d83682c2e 100644 --- a/autogalaxy/__init__.py +++ b/autogalaxy/__init__.py @@ -1,3 +1,8 @@ +from autoconf.dictable import register_parser +from autofit import conf + +conf.instance.register(__file__) + from autoconf.dictable import from_dict, from_json, output_to_json, to_dict from autoarray.dataset import preprocess # noqa from autoarray.dataset.imaging.dataset import Imaging # noqa @@ -112,6 +117,4 @@ from autoconf.fitsable import output_to_fits from autoconf.fitsable import hdu_list_for_output_from -conf.instance.register(__file__) - __version__ = "2025.5.10.1" diff --git a/autogalaxy/aggregator/agg_util.py b/autogalaxy/aggregator/agg_util.py index 78b88eec6..de6e641a4 100644 --- a/autogalaxy/aggregator/agg_util.py +++ b/autogalaxy/aggregator/agg_util.py @@ -140,7 +140,7 @@ def adapt_images_from( galaxy_name_image_dict[value.header["EXTNAME"].lower()] = adapt_image - instance = fit.model.instance_from_prior_medians(ignore_prior_limits=True) + instance = fit.model.instance_from_prior_medians(ignore_assertions=True) adapt_images = AdaptImages(galaxy_name_image_dict=galaxy_name_image_dict) diff --git a/autogalaxy/analysis/analysis/analysis.py b/autogalaxy/analysis/analysis/analysis.py index 084af3104..13160cc4a 100644 --- a/autogalaxy/analysis/analysis/analysis.py +++ b/autogalaxy/analysis/analysis/analysis.py @@ -37,7 +37,8 @@ def __init__(self, cosmology: LensingCosmology = Planck15): self.cosmology = cosmology def galaxies_via_instance_from( - self, instance: af.ModelInstance, run_time_dict: Optional[Dict] = None + self, + instance: af.ModelInstance, ) -> List[Galaxy]: """ Create a list of galaxies from a model instance, which is used to fit the dataset. @@ -60,10 +61,9 @@ def galaxies_via_instance_from( if getattr(instance, "extra_galaxies", None) is not None: return Galaxies( galaxies=instance.galaxies + instance.extra_galaxies, - run_time_dict=run_time_dict, ) - return Galaxies(galaxies=instance.galaxies, run_time_dict=run_time_dict) + return Galaxies(galaxies=instance.galaxies) def dataset_model_via_instance_from( self, instance: af.ModelInstance @@ -126,135 +126,3 @@ def make_result( search_internal=search_internal, analysis=self, ) - - def profile_log_likelihood_function( - self, instance: af.ModelInstance, paths: Optional[af.DirectoryPaths] = None - ) -> Tuple[Dict, Dict]: - """ - This function is optionally called throughout a model-fit to profile the log likelihood function. - - All function calls inside the `log_likelihood_function` that are decorated with the `profile_func` are timed - with their times stored in a dictionary called the `run_time_dict`. - - An `info_dict` is also created which stores information on aspects of the model and dataset that dictate - run times, so the profiled times can be interpreted with this context. - - The results of this profiling are then output to hard-disk in the `profiling` folder of the model-fit results, - which they can be inspected to ensure run-times are as expected. - - Parameters - ---------- - instance - An instance of the model that is being fitted to the data by this analysis (whose parameters have been set - via a non-linear search). - paths - The paths object which manages all paths, e.g. where the non-linear search outputs are stored, - visualization and the pickled objects used by the aggregator output by this function. - - Returns - ------- - Two dictionaries, the profiling dictionary and info dictionary, which contain the profiling times of the - `log_likelihood_function` and information on the model and dataset used to perform the profiling. - """ - - if isinstance(paths, af.DatabasePaths): - return - - run_time_dict = {} - info_dict = {} - - repeats = conf.instance["general"]["profiling"]["repeats"] - info_dict["repeats"] = repeats - - # Ensure numba functions are compiled before profiling begins. - - fit = self.fit_from(instance=instance) - fit.figure_of_merit - - start = time.time() - - for _ in range(repeats): - try: - fit = self.fit_from(instance=instance) - fit.figure_of_merit - except Exception: - logger.info( - "Profiling failed. Returning without outputting information." - ) - return - - fit_time = (time.time() - start) / repeats - - run_time_dict["fit_time"] = fit_time - - fit = self.fit_from(instance=instance, run_time_dict=run_time_dict) - fit.figure_of_merit - - try: - info_dict["image_pixels"] = self.dataset.grids.lp.shape_slim - info_dict["sub_total_light_profiles"] = ( - self.dataset.grids.lp.over_sampler.sub_total - ) - except AttributeError: - pass - - if fit.model_obj.has(cls=aa.Pixelization): - info_dict["use_w_tilde"] = fit.inversion.settings.use_w_tilde - try: - info_dict["sub_total_pixelization"] = ( - self.dataset.grids.pixelization.over_sampler.sub_total - ) - except AttributeError: - pass - info_dict["use_positive_only_solver"] = ( - fit.inversion.settings.use_positive_only_solver - ) - info_dict["force_edge_pixels_to_zeros"] = ( - fit.inversion.settings.force_edge_pixels_to_zeros - ) - info_dict["use_w_tilde_numpy"] = fit.inversion.settings.use_w_tilde_numpy - info_dict["source_pixels"] = len(fit.inversion.reconstruction) - - if hasattr(fit.inversion, "w_tilde"): - info_dict["w_tilde_curvature_preload_size"] = ( - fit.inversion.w_tilde.curvature_preload.shape[0] - ) - - self.output_profiling_info( - paths=paths, run_time_dict=run_time_dict, info_dict=info_dict - ) - - return run_time_dict, info_dict - - def output_profiling_info( - self, paths: Optional[af.DirectoryPaths], run_time_dict: Dict, info_dict: Dict - ): - """ - Output the log likelihood function profiling information to hard-disk as a json file. - - This function is separate from the `profile_log_likelihood_function` function above such that it can be - called by children `Analysis` classes that profile additional aspects of the model-fit and therefore add - extra information to the `run_time_dict` and `info_dict`. - - Parameters - ---------- - paths - The paths object which manages all paths, e.g. where the non-linear search outputs are stored, - visualization and the pickled objects used by the aggregator output by this function. - run_time_dict - A dictionary containing the profiling times of the functions called by the `log_likelihood_function`. - info_dict - A dictionary containing information on the model and dataset used to perform the profiling, where these - settings typically control the overall run-time. - """ - - if paths is None: - return - - os.makedirs(paths.profile_path, exist_ok=True) - - with open(path.join(paths.profile_path, "run_time_dict.json"), "w+") as f: - json.dump(run_time_dict, f, indent=4) - - with open(path.join(paths.profile_path, "info_dict.json"), "w+") as f: - json.dump(info_dict, f, indent=4) diff --git a/autogalaxy/config/general.yaml b/autogalaxy/config/general.yaml index 361abe732..fa2fecc9f 100644 --- a/autogalaxy/config/general.yaml +++ b/autogalaxy/config/general.yaml @@ -1,3 +1,5 @@ +jax: + use_jax: true # If True, uses JAX internally, whereas False uses normal Numpy. fits: flip_for_ds9: true grid: diff --git a/autogalaxy/config/priors/README.rst b/autogalaxy/config/priors/README.rst index 27bd5ebd9..0b492084a 100644 --- a/autogalaxy/config/priors/README.rst +++ b/autogalaxy/config/priors/README.rst @@ -13,7 +13,7 @@ They appear as follows: width_modifier: type: Absolute value: 20.0 - gaussian_limits: + limits: lower: -inf upper: inf @@ -27,9 +27,9 @@ The sections of this example config set the following: width_modifier When the results of a search are passed to a subsequent search to set up the priors of its non-linear search, this entry describes how the Prior is passed. - gaussian_limits + limits When the results of a search are passed to a subsequent search, they are passed using a GaussianPrior. The - gaussian_limits set the physical lower and upper limits of this GaussianPrior, such that parameter samples + limits set the physical lower and upper limits of this GaussianPrior, such that parameter samples can not go beyond these limits. The files ``template_module.yaml`` and ``TemplateObject.yaml`` give templates one can use to set up prior default diff --git a/autogalaxy/config/priors/ellipse/ellipse.yaml b/autogalaxy/config/priors/ellipse/ellipse.yaml index 631c14b93..471d2ca98 100644 --- a/autogalaxy/config/priors/ellipse/ellipse.yaml +++ b/autogalaxy/config/priors/ellipse/ellipse.yaml @@ -3,47 +3,39 @@ Ellipse: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf ell_comps_0: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -1.0 - upper_limit: 1.0 width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -1.0 - upper_limit: 1.0 width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 diff --git a/autogalaxy/config/priors/ellipse/ellipse_multipole.yaml b/autogalaxy/config/priors/ellipse/ellipse_multipole.yaml index 232ea447e..3f5d34739 100644 --- a/autogalaxy/config/priors/ellipse/ellipse_multipole.yaml +++ b/autogalaxy/config/priors/ellipse/ellipse_multipole.yaml @@ -6,7 +6,7 @@ EllipseMultipole: width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf multipole_comps_1: @@ -16,6 +16,6 @@ EllipseMultipole: width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf diff --git a/autogalaxy/config/priors/galaxy/redshift.yaml b/autogalaxy/config/priors/galaxy/redshift.yaml index 7fac1b0e7..1938e8a22 100644 --- a/autogalaxy/config/priors/galaxy/redshift.yaml +++ b/autogalaxy/config/priors/galaxy/redshift.yaml @@ -6,6 +6,6 @@ Redshift: width_modifier: type: Absolute value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf \ No newline at end of file diff --git a/autogalaxy/config/priors/image_mesh/hilbert.yaml b/autogalaxy/config/priors/image_mesh/hilbert.yaml index 8f773ecb3..038fc4d85 100644 --- a/autogalaxy/config/priors/image_mesh/hilbert.yaml +++ b/autogalaxy/config/priors/image_mesh/hilbert.yaml @@ -6,7 +6,7 @@ Hilbert: width_modifier: type: Absolute value: 100.0 - gaussian_limits: + limits: lower: 50.0 upper: inf weight_floor: @@ -16,7 +16,7 @@ Hilbert: width_modifier: type: Absolute value: 0.1 - gaussian_limits: + limits: lower: 0.0 upper: inf weight_power: @@ -26,6 +26,6 @@ Hilbert: width_modifier: type: Absolute value: 5.0 - gaussian_limits: + limits: lower: 0.0 upper: inf \ No newline at end of file diff --git a/autogalaxy/config/priors/image_mesh/kmeans.yaml b/autogalaxy/config/priors/image_mesh/kmeans.yaml index 31bb2ee4a..ece8c704e 100644 --- a/autogalaxy/config/priors/image_mesh/kmeans.yaml +++ b/autogalaxy/config/priors/image_mesh/kmeans.yaml @@ -6,7 +6,7 @@ KMeans: width_modifier: type: Absolute value: 100.0 - gaussian_limits: + limits: lower: 50.0 upper: inf weight_floor: @@ -16,7 +16,7 @@ KMeans: width_modifier: type: Absolute value: 0.1 - gaussian_limits: + limits: lower: 0.0 upper: inf weight_power: @@ -26,6 +26,6 @@ KMeans: width_modifier: type: Absolute value: 5.0 - gaussian_limits: + limits: lower: 0.0 upper: inf \ No newline at end of file diff --git a/autogalaxy/config/priors/image_mesh/overlay.yaml b/autogalaxy/config/priors/image_mesh/overlay.yaml index ac4e334bf..17c283ab0 100644 --- a/autogalaxy/config/priors/image_mesh/overlay.yaml +++ b/autogalaxy/config/priors/image_mesh/overlay.yaml @@ -6,7 +6,7 @@ Overlay: width_modifier: type: Absolute value: 8.0 - gaussian_limits: + limits: lower: 3.0 upper: inf shape_1: @@ -16,6 +16,6 @@ Overlay: width_modifier: type: Absolute value: 8.0 - gaussian_limits: + limits: lower: 3.0 upper: inf \ No newline at end of file diff --git a/autogalaxy/config/priors/light/linear/chameleon.yaml b/autogalaxy/config/priors/light/linear/chameleon.yaml index c6fc9d5ef..972e029d6 100644 --- a/autogalaxy/config/priors/light/linear/chameleon.yaml +++ b/autogalaxy/config/priors/light/linear/chameleon.yaml @@ -3,24 +3,20 @@ Chameleon: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf core_radius_0: @@ -30,7 +26,7 @@ Chameleon: width_modifier: type: Absolute value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf core_radius_1: @@ -40,11 +36,11 @@ Chameleon: width_modifier: type: Absolute value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -52,11 +48,11 @@ Chameleon: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -64,7 +60,7 @@ Chameleon: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ChameleonSph: @@ -72,24 +68,20 @@ ChameleonSph: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf core_radius_0: @@ -99,7 +91,7 @@ ChameleonSph: width_modifier: type: Absolute value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf core_radius_1: @@ -109,6 +101,6 @@ ChameleonSph: width_modifier: type: Absolute value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/light/linear/dev_vaucouleurs.yaml b/autogalaxy/config/priors/light/linear/dev_vaucouleurs.yaml index e6b47b4fb..8283aea4c 100644 --- a/autogalaxy/config/priors/light/linear/dev_vaucouleurs.yaml +++ b/autogalaxy/config/priors/light/linear/dev_vaucouleurs.yaml @@ -3,24 +3,20 @@ DevVaucouleurs: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -30,11 +26,11 @@ DevVaucouleurs: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -42,11 +38,11 @@ DevVaucouleurs: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -54,7 +50,7 @@ DevVaucouleurs: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 DevVaucouleursSph: @@ -62,24 +58,20 @@ DevVaucouleursSph: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -89,6 +81,6 @@ DevVaucouleursSph: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/light/linear/eff.yaml b/autogalaxy/config/priors/light/linear/eff.yaml index 7a2847408..a3664c44c 100644 --- a/autogalaxy/config/priors/light/linear/eff.yaml +++ b/autogalaxy/config/priors/light/linear/eff.yaml @@ -3,24 +3,20 @@ ElsonFreeFall: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -30,11 +26,11 @@ ElsonFreeFall: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -42,11 +38,11 @@ ElsonFreeFall: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -54,7 +50,7 @@ ElsonFreeFall: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 eta: @@ -64,7 +60,7 @@ ElsonFreeFall: width_modifier: type: Absolute value: 1.5 - gaussian_limits: + limits: lower: 0.0 upper: 5.0 ElsonFreeFallSph: @@ -72,24 +68,20 @@ ElsonFreeFallSph: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -99,7 +91,7 @@ ElsonFreeFallSph: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf eta: @@ -109,6 +101,6 @@ ElsonFreeFallSph: width_modifier: type: Absolute value: 1.5 - gaussian_limits: + limits: lower: 0.0 upper: 5.0 diff --git a/autogalaxy/config/priors/light/linear/exponential.yaml b/autogalaxy/config/priors/light/linear/exponential.yaml index 1c840c800..c75a8aea7 100644 --- a/autogalaxy/config/priors/light/linear/exponential.yaml +++ b/autogalaxy/config/priors/light/linear/exponential.yaml @@ -3,24 +3,20 @@ Exponential: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -30,11 +26,11 @@ Exponential: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -42,11 +38,11 @@ Exponential: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -54,7 +50,7 @@ Exponential: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ExponentialSph: @@ -62,24 +58,20 @@ ExponentialSph: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -89,6 +81,6 @@ ExponentialSph: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/light/linear/exponential_core.yaml b/autogalaxy/config/priors/light/linear/exponential_core.yaml index f0f0845bb..8591d4e35 100644 --- a/autogalaxy/config/priors/light/linear/exponential_core.yaml +++ b/autogalaxy/config/priors/light/linear/exponential_core.yaml @@ -3,24 +3,20 @@ ExponentialCore: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -30,11 +26,11 @@ ExponentialCore: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -42,11 +38,11 @@ ExponentialCore: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -54,7 +50,7 @@ ExponentialCore: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 alpha: @@ -74,24 +70,20 @@ ExponentialCoreSph: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -101,7 +93,7 @@ ExponentialCoreSph: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf gamma: diff --git a/autogalaxy/config/priors/light/linear/gaussian.yaml b/autogalaxy/config/priors/light/linear/gaussian.yaml index ffe10a146..a2a46cdbf 100644 --- a/autogalaxy/config/priors/light/linear/gaussian.yaml +++ b/autogalaxy/config/priors/light/linear/gaussian.yaml @@ -6,35 +6,31 @@ Gaussian: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf centre_0: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -42,11 +38,11 @@ Gaussian: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -54,7 +50,7 @@ Gaussian: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 GaussianSph: @@ -65,30 +61,26 @@ GaussianSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf centre_0: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf diff --git a/autogalaxy/config/priors/light/linear/moffat.yaml b/autogalaxy/config/priors/light/linear/moffat.yaml index 35f6e0740..1df948f58 100644 --- a/autogalaxy/config/priors/light/linear/moffat.yaml +++ b/autogalaxy/config/priors/light/linear/moffat.yaml @@ -6,7 +6,7 @@ Moffat: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf beta: @@ -16,35 +16,31 @@ Moffat: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf centre_0: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -52,11 +48,11 @@ Moffat: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -64,7 +60,7 @@ Moffat: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 MoffatSph: @@ -75,7 +71,7 @@ MoffatSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf beta: @@ -85,30 +81,26 @@ MoffatSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf centre_0: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf diff --git a/autogalaxy/config/priors/light/linear/sersic.yaml b/autogalaxy/config/priors/light/linear/sersic.yaml index 4ad9e921e..5d8ce0645 100644 --- a/autogalaxy/config/priors/light/linear/sersic.yaml +++ b/autogalaxy/config/priors/light/linear/sersic.yaml @@ -3,24 +3,20 @@ Sersic: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -30,11 +26,11 @@ Sersic: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -42,11 +38,11 @@ Sersic: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -54,7 +50,7 @@ Sersic: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 sersic_index: @@ -64,7 +60,7 @@ Sersic: width_modifier: type: Absolute value: 1.5 - gaussian_limits: + limits: lower: 0.8 upper: 5.0 SersicSph: @@ -72,24 +68,20 @@ SersicSph: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -99,7 +91,7 @@ SersicSph: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf sersic_index: @@ -109,6 +101,6 @@ SersicSph: width_modifier: type: Absolute value: 1.5 - gaussian_limits: + limits: lower: 0.8 upper: 5.0 diff --git a/autogalaxy/config/priors/light/linear/sersic_core.yaml b/autogalaxy/config/priors/light/linear/sersic_core.yaml index 7d3f4cd84..fc85243d6 100644 --- a/autogalaxy/config/priors/light/linear/sersic_core.yaml +++ b/autogalaxy/config/priors/light/linear/sersic_core.yaml @@ -3,24 +3,20 @@ SersicCore: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -30,11 +26,11 @@ SersicCore: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -42,11 +38,11 @@ SersicCore: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -54,7 +50,7 @@ SersicCore: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 sersic_index: @@ -64,7 +60,7 @@ SersicCore: width_modifier: type: Absolute value: 1.5 - gaussian_limits: + limits: lower: 0.8 upper: 5.0 alpha: @@ -81,24 +77,20 @@ SersicCoreSph: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -108,7 +100,7 @@ SersicCoreSph: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf sersic_index: @@ -118,7 +110,7 @@ SersicCoreSph: width_modifier: type: Absolute value: 1.5 - gaussian_limits: + limits: lower: 0.8 upper: 5.0 alpha: diff --git a/autogalaxy/config/priors/light/linear/shapelets/cartesian.yaml b/autogalaxy/config/priors/light/linear/shapelets/cartesian.yaml index 4ac1c996b..2894442dd 100644 --- a/autogalaxy/config/priors/light/linear/shapelets/cartesian.yaml +++ b/autogalaxy/config/priors/light/linear/shapelets/cartesian.yaml @@ -3,24 +3,20 @@ ShapeletCartesianSph: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf beta: @@ -30,7 +26,7 @@ ShapeletCartesianSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf ShapeletCartesian: @@ -38,28 +34,24 @@ ShapeletCartesian: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -67,11 +59,11 @@ ShapeletCartesian: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -79,7 +71,7 @@ ShapeletCartesian: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 beta: @@ -89,6 +81,6 @@ ShapeletCartesian: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/light/linear/shapelets/exponential.yaml b/autogalaxy/config/priors/light/linear/shapelets/exponential.yaml index ffec6b5bb..5c6b8ad24 100644 --- a/autogalaxy/config/priors/light/linear/shapelets/exponential.yaml +++ b/autogalaxy/config/priors/light/linear/shapelets/exponential.yaml @@ -3,24 +3,20 @@ ShapeletExponentialSph: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf beta: @@ -30,7 +26,7 @@ ShapeletExponentialSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf ShapeletExponential: @@ -38,28 +34,24 @@ ShapeletExponential: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -67,11 +59,11 @@ ShapeletExponential: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -79,7 +71,7 @@ ShapeletExponential: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 beta: @@ -89,6 +81,6 @@ ShapeletExponential: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/light/linear/shapelets/polar.yaml b/autogalaxy/config/priors/light/linear/shapelets/polar.yaml index f8c93e235..fb32f83f0 100644 --- a/autogalaxy/config/priors/light/linear/shapelets/polar.yaml +++ b/autogalaxy/config/priors/light/linear/shapelets/polar.yaml @@ -3,24 +3,20 @@ ShapeletPolarSph: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf beta: @@ -30,7 +26,7 @@ ShapeletPolarSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf ShapeletPolar: @@ -38,28 +34,24 @@ ShapeletPolar: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -67,11 +59,11 @@ ShapeletPolar: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -79,7 +71,7 @@ ShapeletPolar: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 beta: @@ -89,6 +81,6 @@ ShapeletPolar: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/light/linear_operated/gaussian.yaml b/autogalaxy/config/priors/light/linear_operated/gaussian.yaml index 37db03afa..edc467704 100644 --- a/autogalaxy/config/priors/light/linear_operated/gaussian.yaml +++ b/autogalaxy/config/priors/light/linear_operated/gaussian.yaml @@ -6,35 +6,31 @@ Gaussian: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf centre_0: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -42,11 +38,11 @@ Gaussian: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -54,7 +50,7 @@ Gaussian: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 intensity: @@ -64,6 +60,6 @@ Gaussian: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/light/linear_operated/moffat.yaml b/autogalaxy/config/priors/light/linear_operated/moffat.yaml index 526ea7765..725f85416 100644 --- a/autogalaxy/config/priors/light/linear_operated/moffat.yaml +++ b/autogalaxy/config/priors/light/linear_operated/moffat.yaml @@ -6,7 +6,7 @@ Moffat: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf beta: @@ -16,35 +16,31 @@ Moffat: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf centre_0: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -52,11 +48,11 @@ Moffat: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -64,6 +60,6 @@ Moffat: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 diff --git a/autogalaxy/config/priors/light/operated/gaussian.yaml b/autogalaxy/config/priors/light/operated/gaussian.yaml index 37db03afa..edc467704 100644 --- a/autogalaxy/config/priors/light/operated/gaussian.yaml +++ b/autogalaxy/config/priors/light/operated/gaussian.yaml @@ -6,35 +6,31 @@ Gaussian: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf centre_0: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -42,11 +38,11 @@ Gaussian: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -54,7 +50,7 @@ Gaussian: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 intensity: @@ -64,6 +60,6 @@ Gaussian: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/light/operated/moffat.yaml b/autogalaxy/config/priors/light/operated/moffat.yaml index 34d6185fc..54c71c06a 100644 --- a/autogalaxy/config/priors/light/operated/moffat.yaml +++ b/autogalaxy/config/priors/light/operated/moffat.yaml @@ -6,7 +6,7 @@ Moffat: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf beta: @@ -16,35 +16,31 @@ Moffat: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf centre_0: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -52,11 +48,11 @@ Moffat: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -64,7 +60,7 @@ Moffat: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 intensity: @@ -74,6 +70,6 @@ Moffat: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/light/operated/sersic.yaml b/autogalaxy/config/priors/light/operated/sersic.yaml index d53a170e4..6506de47b 100644 --- a/autogalaxy/config/priors/light/operated/sersic.yaml +++ b/autogalaxy/config/priors/light/operated/sersic.yaml @@ -3,24 +3,20 @@ ersic: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -30,11 +26,11 @@ ersic: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -42,11 +38,11 @@ ersic: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -54,7 +50,7 @@ ersic: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 intensity: @@ -64,7 +60,7 @@ ersic: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf sersic_index: @@ -74,6 +70,6 @@ ersic: width_modifier: type: Absolute value: 1.5 - gaussian_limits: + limits: lower: 0.8 upper: 5.0 diff --git a/autogalaxy/config/priors/light/standard/chameleon.yaml b/autogalaxy/config/priors/light/standard/chameleon.yaml index d5d25af83..0e2abcaec 100644 --- a/autogalaxy/config/priors/light/standard/chameleon.yaml +++ b/autogalaxy/config/priors/light/standard/chameleon.yaml @@ -3,24 +3,20 @@ Chameleon: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf core_radius_0: @@ -30,7 +26,7 @@ Chameleon: width_modifier: type: Absolute value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf core_radius_1: @@ -40,11 +36,11 @@ Chameleon: width_modifier: type: Absolute value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -52,11 +48,11 @@ Chameleon: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -64,7 +60,7 @@ Chameleon: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 intensity: @@ -74,7 +70,7 @@ Chameleon: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf ChameleonSph: @@ -82,24 +78,20 @@ ChameleonSph: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf core_radius_0: @@ -109,7 +101,7 @@ ChameleonSph: width_modifier: type: Absolute value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf core_radius_1: @@ -119,7 +111,7 @@ ChameleonSph: width_modifier: type: Absolute value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf intensity: @@ -129,6 +121,6 @@ ChameleonSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/light/standard/dev_vaucouleurs.yaml b/autogalaxy/config/priors/light/standard/dev_vaucouleurs.yaml index 4a8b8e391..957965594 100644 --- a/autogalaxy/config/priors/light/standard/dev_vaucouleurs.yaml +++ b/autogalaxy/config/priors/light/standard/dev_vaucouleurs.yaml @@ -3,24 +3,20 @@ DevVaucouleurs: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -30,11 +26,11 @@ DevVaucouleurs: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -42,11 +38,11 @@ DevVaucouleurs: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -54,7 +50,7 @@ DevVaucouleurs: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 intensity: @@ -64,7 +60,7 @@ DevVaucouleurs: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf DevVaucouleursSph: @@ -72,24 +68,20 @@ DevVaucouleursSph: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -99,7 +91,7 @@ DevVaucouleursSph: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf intensity: @@ -109,6 +101,6 @@ DevVaucouleursSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/light/standard/eff.yaml b/autogalaxy/config/priors/light/standard/eff.yaml index 9e0819937..591e2211e 100644 --- a/autogalaxy/config/priors/light/standard/eff.yaml +++ b/autogalaxy/config/priors/light/standard/eff.yaml @@ -3,24 +3,20 @@ ElsonFreeFall: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -30,11 +26,11 @@ ElsonFreeFall: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -42,11 +38,11 @@ ElsonFreeFall: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -54,7 +50,7 @@ ElsonFreeFall: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 eta: @@ -64,7 +60,7 @@ ElsonFreeFall: width_modifier: type: Absolute value: 1.5 - gaussian_limits: + limits: lower: 0.0 upper: 5.0 intensity: @@ -74,7 +70,7 @@ ElsonFreeFall: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf ElsonFreeFallSph: @@ -82,24 +78,20 @@ ElsonFreeFallSph: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -109,7 +101,7 @@ ElsonFreeFallSph: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf eta: @@ -119,7 +111,7 @@ ElsonFreeFallSph: width_modifier: type: Absolute value: 1.5 - gaussian_limits: + limits: lower: 0.0 upper: 5.0 intensity: @@ -129,6 +121,6 @@ ElsonFreeFallSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/light/standard/exponential.yaml b/autogalaxy/config/priors/light/standard/exponential.yaml index 820fec183..3048fb01b 100644 --- a/autogalaxy/config/priors/light/standard/exponential.yaml +++ b/autogalaxy/config/priors/light/standard/exponential.yaml @@ -3,24 +3,20 @@ Exponential: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -30,11 +26,11 @@ Exponential: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -42,11 +38,11 @@ Exponential: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -54,7 +50,7 @@ Exponential: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 intensity: @@ -64,7 +60,7 @@ Exponential: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf ExponentialSph: @@ -72,24 +68,20 @@ ExponentialSph: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -99,7 +91,7 @@ ExponentialSph: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf intensity: @@ -109,6 +101,6 @@ ExponentialSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/light/standard/exponential_core.yaml b/autogalaxy/config/priors/light/standard/exponential_core.yaml index 8d4597f47..3f5ea7cf4 100644 --- a/autogalaxy/config/priors/light/standard/exponential_core.yaml +++ b/autogalaxy/config/priors/light/standard/exponential_core.yaml @@ -3,24 +3,20 @@ ExponentialCore: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -30,11 +26,11 @@ ExponentialCore: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -42,11 +38,11 @@ ExponentialCore: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -54,7 +50,7 @@ ExponentialCore: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 intensity: @@ -64,7 +60,7 @@ ExponentialCore: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf alpha: @@ -81,24 +77,20 @@ ExponentialCoreSph: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -108,7 +100,7 @@ ExponentialCoreSph: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf intensity: @@ -118,7 +110,7 @@ ExponentialCoreSph: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf alpha: diff --git a/autogalaxy/config/priors/light/standard/gaussian.yaml b/autogalaxy/config/priors/light/standard/gaussian.yaml index 09cdaf30e..d19093815 100644 --- a/autogalaxy/config/priors/light/standard/gaussian.yaml +++ b/autogalaxy/config/priors/light/standard/gaussian.yaml @@ -6,35 +6,31 @@ Gaussian: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf centre_0: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -42,11 +38,11 @@ Gaussian: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -54,7 +50,7 @@ Gaussian: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 intensity: @@ -64,7 +60,7 @@ Gaussian: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf GaussianSph: @@ -75,31 +71,27 @@ GaussianSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf centre_0: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf intensity: @@ -109,6 +101,6 @@ GaussianSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/light/standard/moffat.yaml b/autogalaxy/config/priors/light/standard/moffat.yaml index 77dfa3353..dd13d3e69 100644 --- a/autogalaxy/config/priors/light/standard/moffat.yaml +++ b/autogalaxy/config/priors/light/standard/moffat.yaml @@ -6,7 +6,7 @@ Moffat: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf beta: @@ -16,35 +16,31 @@ Moffat: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf centre_0: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -52,11 +48,11 @@ Moffat: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -64,7 +60,7 @@ Moffat: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 intensity: @@ -74,7 +70,7 @@ Moffat: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf MoffatSph: @@ -85,7 +81,7 @@ MoffatSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf beta: @@ -95,31 +91,27 @@ MoffatSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf centre_0: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf intensity: @@ -129,6 +121,6 @@ MoffatSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/light/standard/sersic.yaml b/autogalaxy/config/priors/light/standard/sersic.yaml index 660c3ebfd..78263470d 100644 --- a/autogalaxy/config/priors/light/standard/sersic.yaml +++ b/autogalaxy/config/priors/light/standard/sersic.yaml @@ -3,24 +3,20 @@ Sersic: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -30,33 +26,29 @@ Sersic: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + limits: + lower: -1.0 + upper: 1.0 mean: 0.0 sigma: 0.3 - lower_limit: -1.0 - upper_limit: 1.0 + type: Gaussian width_modifier: type: Absolute value: 0.2 - gaussian_limits: + ell_comps_1: + limits: lower: -1.0 upper: 1.0 - ell_comps_1: - type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -1.0 - upper_limit: 1.0 + type: Gaussian width_modifier: type: Absolute value: 0.2 - gaussian_limits: - lower: -1.0 - upper: 1.0 intensity: type: LogUniform lower_limit: 1.0e-06 @@ -64,7 +56,7 @@ Sersic: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf sersic_index: @@ -74,7 +66,7 @@ Sersic: width_modifier: type: Absolute value: 1.5 - gaussian_limits: + limits: lower: 0.8 upper: 5.0 SersicSph: @@ -82,24 +74,20 @@ SersicSph: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -109,7 +97,7 @@ SersicSph: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf intensity: @@ -119,7 +107,7 @@ SersicSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf sersic_index: @@ -129,6 +117,6 @@ SersicSph: width_modifier: type: Absolute value: 1.5 - gaussian_limits: + limits: lower: 0.8 upper: 5.0 diff --git a/autogalaxy/config/priors/light/standard/sersic_core.yaml b/autogalaxy/config/priors/light/standard/sersic_core.yaml index ad0b2f31c..0ff7a733a 100644 --- a/autogalaxy/config/priors/light/standard/sersic_core.yaml +++ b/autogalaxy/config/priors/light/standard/sersic_core.yaml @@ -3,24 +3,20 @@ SersicCore: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -30,11 +26,11 @@ SersicCore: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -42,11 +38,11 @@ SersicCore: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -54,7 +50,7 @@ SersicCore: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 intensity: @@ -64,7 +60,7 @@ SersicCore: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf sersic_index: @@ -74,7 +70,7 @@ SersicCore: width_modifier: type: Absolute value: 1.5 - gaussian_limits: + limits: lower: 0.8 upper: 5.0 alpha: @@ -91,24 +87,20 @@ SersicCoreSph: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -118,7 +110,7 @@ SersicCoreSph: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf intensity: @@ -128,7 +120,7 @@ SersicCoreSph: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf sersic_index: @@ -138,7 +130,7 @@ SersicCoreSph: width_modifier: type: Absolute value: 1.5 - gaussian_limits: + limits: lower: 0.8 upper: 5.0 alpha: diff --git a/autogalaxy/config/priors/mass/dark/gnfw.yaml b/autogalaxy/config/priors/mass/dark/gnfw.yaml index de3949a02..44630a34c 100644 --- a/autogalaxy/config/priors/mass/dark/gnfw.yaml +++ b/autogalaxy/config/priors/mass/dark/gnfw.yaml @@ -3,28 +3,24 @@ gNFW: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -32,11 +28,11 @@ gNFW: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -44,7 +40,7 @@ gNFW: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 inner_slope: @@ -54,7 +50,7 @@ gNFW: width_modifier: type: Absolute value: 0.3 - gaussian_limits: + limits: lower: -1.0 upper: 3.0 kappa_s: @@ -64,7 +60,7 @@ gNFW: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf scale_radius: @@ -74,7 +70,7 @@ gNFW: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf gNFWSph: @@ -82,24 +78,20 @@ gNFWSph: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf inner_slope: @@ -109,7 +101,7 @@ gNFWSph: width_modifier: type: Absolute value: 0.3 - gaussian_limits: + limits: lower: -1.0 upper: 3.0 kappa_s: @@ -119,7 +111,7 @@ gNFWSph: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf scale_radius: @@ -129,6 +121,6 @@ gNFWSph: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/mass/dark/gnfw_mcr.yaml b/autogalaxy/config/priors/mass/dark/gnfw_mcr.yaml index 976821ec4..2c2da24f6 100644 --- a/autogalaxy/config/priors/mass/dark/gnfw_mcr.yaml +++ b/autogalaxy/config/priors/mass/dark/gnfw_mcr.yaml @@ -3,28 +3,24 @@ gNFWMCRLudlow: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -32,11 +28,11 @@ gNFWMCRLudlow: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -44,7 +40,7 @@ gNFWMCRLudlow: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 inner_slope: @@ -54,7 +50,7 @@ gNFWMCRLudlow: width_modifier: type: Absolute value: 0.3 - gaussian_limits: + limits: lower: -1.0 upper: 3.0 mass_at_200: @@ -64,7 +60,7 @@ gNFWMCRLudlow: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf redshift_object: @@ -74,7 +70,7 @@ gNFWMCRLudlow: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf redshift_source: @@ -84,6 +80,6 @@ gNFWMCRLudlow: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/mass/dark/gnfw_virial_mass_conc.yaml b/autogalaxy/config/priors/mass/dark/gnfw_virial_mass_conc.yaml index 20956f214..a59654dd6 100644 --- a/autogalaxy/config/priors/mass/dark/gnfw_virial_mass_conc.yaml +++ b/autogalaxy/config/priors/mass/dark/gnfw_virial_mass_conc.yaml @@ -3,24 +3,20 @@ gNFWVirialMassConcSph: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf log10m_vir: @@ -30,7 +26,7 @@ gNFWVirialMassConcSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf c_2: @@ -40,7 +36,7 @@ gNFWVirialMassConcSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf overdens: @@ -50,7 +46,7 @@ gNFWVirialMassConcSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf redshift_object: @@ -60,7 +56,7 @@ gNFWVirialMassConcSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf redshift_source: @@ -70,7 +66,7 @@ gNFWVirialMassConcSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf inner_slope: @@ -80,6 +76,6 @@ gNFWVirialMassConcSph: width_modifier: type: Absolute value: 0.3 - gaussian_limits: + limits: lower: -1.0 upper: 3.0 \ No newline at end of file diff --git a/autogalaxy/config/priors/mass/dark/nfw.yaml b/autogalaxy/config/priors/mass/dark/nfw.yaml index a6790a099..b351b0743 100644 --- a/autogalaxy/config/priors/mass/dark/nfw.yaml +++ b/autogalaxy/config/priors/mass/dark/nfw.yaml @@ -3,28 +3,24 @@ NFW: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -32,11 +28,11 @@ NFW: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -44,7 +40,7 @@ NFW: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 kappa_s: @@ -54,7 +50,7 @@ NFW: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf scale_radius: @@ -64,7 +60,7 @@ NFW: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf NFWSph: @@ -72,24 +68,20 @@ NFWSph: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf kappa_s: @@ -99,7 +91,7 @@ NFWSph: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf scale_radius: @@ -109,6 +101,6 @@ NFWSph: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/mass/dark/nfw_mcr.yaml b/autogalaxy/config/priors/mass/dark/nfw_mcr.yaml index bb45526b1..3e2a381ca 100644 --- a/autogalaxy/config/priors/mass/dark/nfw_mcr.yaml +++ b/autogalaxy/config/priors/mass/dark/nfw_mcr.yaml @@ -3,24 +3,20 @@ NFWMCRDuffySph: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf mass_at_200: @@ -30,7 +26,7 @@ NFWMCRDuffySph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf redshift_object: @@ -40,7 +36,7 @@ NFWMCRDuffySph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf redshift_source: @@ -50,7 +46,7 @@ NFWMCRDuffySph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf NFWMCRLudlow: @@ -58,28 +54,24 @@ NFWMCRLudlow: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -87,11 +79,11 @@ NFWMCRLudlow: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -99,7 +91,7 @@ NFWMCRLudlow: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 mass_at_200: @@ -109,7 +101,7 @@ NFWMCRLudlow: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf redshift_object: @@ -119,7 +111,7 @@ NFWMCRLudlow: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf redshift_source: @@ -129,7 +121,7 @@ NFWMCRLudlow: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf NFWMCRLudlowSph: @@ -137,24 +129,20 @@ NFWMCRLudlowSph: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf mass_at_200: @@ -164,7 +152,7 @@ NFWMCRLudlowSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf redshift_object: @@ -174,7 +162,7 @@ NFWMCRLudlowSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf redshift_source: @@ -184,6 +172,6 @@ NFWMCRLudlowSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/mass/dark/nfw_mcr_scatter.yaml b/autogalaxy/config/priors/mass/dark/nfw_mcr_scatter.yaml index b46e2c8f0..d01feb8ff 100644 --- a/autogalaxy/config/priors/mass/dark/nfw_mcr_scatter.yaml +++ b/autogalaxy/config/priors/mass/dark/nfw_mcr_scatter.yaml @@ -3,24 +3,20 @@ NFWMCRScatterLudlowSph: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf mass_at_200: @@ -30,7 +26,7 @@ NFWMCRScatterLudlowSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf redshift_object: @@ -40,7 +36,7 @@ NFWMCRScatterLudlowSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf redshift_source: @@ -50,18 +46,16 @@ NFWMCRScatterLudlowSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf scatter: type: Gaussian mean: 0.0 sigma: 3.0 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 1.0 - gaussian_limits: + limits: lower: -inf upper: inf diff --git a/autogalaxy/config/priors/mass/dark/nfw_truncated.yaml b/autogalaxy/config/priors/mass/dark/nfw_truncated.yaml index 95368e812..f123940e2 100644 --- a/autogalaxy/config/priors/mass/dark/nfw_truncated.yaml +++ b/autogalaxy/config/priors/mass/dark/nfw_truncated.yaml @@ -3,24 +3,20 @@ NFWTruncatedSph: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf kappa_s: @@ -30,7 +26,7 @@ NFWTruncatedSph: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf scale_radius: @@ -40,7 +36,7 @@ NFWTruncatedSph: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf truncation_radius: @@ -50,6 +46,6 @@ NFWTruncatedSph: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/mass/dark/nfw_truncated_mcr.yaml b/autogalaxy/config/priors/mass/dark/nfw_truncated_mcr.yaml index 825f83cd0..13c1a813f 100644 --- a/autogalaxy/config/priors/mass/dark/nfw_truncated_mcr.yaml +++ b/autogalaxy/config/priors/mass/dark/nfw_truncated_mcr.yaml @@ -3,24 +3,20 @@ NFWTruncatedMCRDuffySph: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf mass_at_200: @@ -30,7 +26,7 @@ NFWTruncatedMCRDuffySph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf redshift_object: @@ -40,7 +36,7 @@ NFWTruncatedMCRDuffySph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf redshift_source: @@ -50,7 +46,7 @@ NFWTruncatedMCRDuffySph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf NFWTruncatedMCRLudlowSph: @@ -58,24 +54,20 @@ NFWTruncatedMCRLudlowSph: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf mass_at_200: @@ -85,7 +77,7 @@ NFWTruncatedMCRLudlowSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf redshift_object: @@ -95,7 +87,7 @@ NFWTruncatedMCRLudlowSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf redshift_source: @@ -105,7 +97,7 @@ NFWTruncatedMCRLudlowSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf NFWTruncatedMCRScatterLudlowSph: @@ -113,24 +105,20 @@ NFWTruncatedMCRScatterLudlowSph: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf mass_at_200: @@ -140,7 +128,7 @@ NFWTruncatedMCRScatterLudlowSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf redshift_object: @@ -150,7 +138,7 @@ NFWTruncatedMCRScatterLudlowSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf redshift_source: @@ -160,18 +148,16 @@ NFWTruncatedMCRScatterLudlowSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf scatter: type: Gaussian mean: 0.0 sigma: 3.0 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 1.0 - gaussian_limits: + limits: lower: -inf upper: inf diff --git a/autogalaxy/config/priors/mass/dark/nfw_virial_mass_conc.yaml b/autogalaxy/config/priors/mass/dark/nfw_virial_mass_conc.yaml index 5dfc209ac..cff238db0 100644 --- a/autogalaxy/config/priors/mass/dark/nfw_virial_mass_conc.yaml +++ b/autogalaxy/config/priors/mass/dark/nfw_virial_mass_conc.yaml @@ -3,24 +3,20 @@ NFWVirialMassConcSph: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf virial_mass: @@ -30,7 +26,7 @@ NFWVirialMassConcSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf concentration: @@ -40,7 +36,7 @@ NFWVirialMassConcSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf virial_overdens: @@ -50,7 +46,7 @@ NFWVirialMassConcSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf redshift_object: @@ -60,7 +56,7 @@ NFWVirialMassConcSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf redshift_source: @@ -70,6 +66,6 @@ NFWVirialMassConcSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/mass/point/point.yaml b/autogalaxy/config/priors/mass/point/point.yaml index ec2710898..328a5a465 100644 --- a/autogalaxy/config/priors/mass/point/point.yaml +++ b/autogalaxy/config/priors/mass/point/point.yaml @@ -3,24 +3,20 @@ PointMass: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf einstein_radius: @@ -30,6 +26,6 @@ PointMass: width_modifier: type: Relative value: 0.25 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/mass/point/smbh.yaml b/autogalaxy/config/priors/mass/point/smbh.yaml index 74319aa7d..ef3c231ad 100644 --- a/autogalaxy/config/priors/mass/point/smbh.yaml +++ b/autogalaxy/config/priors/mass/point/smbh.yaml @@ -3,24 +3,20 @@ SMBH: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf mass: @@ -30,7 +26,7 @@ SMBH: width_modifier: type: Relative value: 0.25 - gaussian_limits: + limits: lower: 0.0 upper: inf redshift_object: @@ -40,7 +36,7 @@ SMBH: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf redshift_source: @@ -50,6 +46,6 @@ SMBH: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf \ No newline at end of file diff --git a/autogalaxy/config/priors/mass/point/smbh_binary.yaml b/autogalaxy/config/priors/mass/point/smbh_binary.yaml index c87bf0e71..9e3f73668 100644 --- a/autogalaxy/config/priors/mass/point/smbh_binary.yaml +++ b/autogalaxy/config/priors/mass/point/smbh_binary.yaml @@ -3,24 +3,20 @@ SMBHBinary: type: Gaussian mean: 0.0 sigma: 1.0 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 1.0 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf separation: @@ -30,7 +26,7 @@ SMBHBinary: width_modifier: type: Relative value: 0.25 - gaussian_limits: + limits: lower: 0.0 upper: inf angle_binary: @@ -40,7 +36,7 @@ SMBHBinary: width_modifier: type: Relative value: 0.25 - gaussian_limits: + limits: lower: 0.0 upper: inf mass: @@ -50,7 +46,7 @@ SMBHBinary: width_modifier: type: Relative value: 0.25 - gaussian_limits: + limits: lower: 0.0 upper: inf mass_ratio: @@ -60,7 +56,7 @@ SMBHBinary: width_modifier: type: Relative value: 0.25 - gaussian_limits: + limits: lower: 0.0 upper: inf redshift_object: @@ -70,7 +66,7 @@ SMBHBinary: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf redshift_source: @@ -80,6 +76,6 @@ SMBHBinary: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf \ No newline at end of file diff --git a/autogalaxy/config/priors/mass/sheets/external_shear.yaml b/autogalaxy/config/priors/mass/sheets/external_shear.yaml index e55c841d8..b77dd285d 100644 --- a/autogalaxy/config/priors/mass/sheets/external_shear.yaml +++ b/autogalaxy/config/priors/mass/sheets/external_shear.yaml @@ -6,7 +6,7 @@ ExternalShear: width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf gamma_2: @@ -16,6 +16,6 @@ ExternalShear: width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf diff --git a/autogalaxy/config/priors/mass/sheets/mass_sheet.yaml b/autogalaxy/config/priors/mass/sheets/mass_sheet.yaml index e71a8d435..9e8aae636 100644 --- a/autogalaxy/config/priors/mass/sheets/mass_sheet.yaml +++ b/autogalaxy/config/priors/mass/sheets/mass_sheet.yaml @@ -3,24 +3,20 @@ MassSheet: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf kappa: @@ -30,6 +26,6 @@ MassSheet: width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf diff --git a/autogalaxy/config/priors/mass/stellar/chameleon.yaml b/autogalaxy/config/priors/mass/stellar/chameleon.yaml index 11694d7ce..41d6a32eb 100644 --- a/autogalaxy/config/priors/mass/stellar/chameleon.yaml +++ b/autogalaxy/config/priors/mass/stellar/chameleon.yaml @@ -3,24 +3,20 @@ Chameleon: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf core_radius_0: @@ -30,7 +26,7 @@ Chameleon: width_modifier: type: Absolute value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf core_radius_1: @@ -40,11 +36,11 @@ Chameleon: width_modifier: type: Absolute value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -52,11 +48,11 @@ Chameleon: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -64,7 +60,7 @@ Chameleon: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 intensity: @@ -74,7 +70,7 @@ Chameleon: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf mass_to_light_ratio: @@ -84,7 +80,7 @@ Chameleon: width_modifier: type: Relative value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf ChameleonSph: @@ -92,24 +88,20 @@ ChameleonSph: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf core_radius_0: @@ -119,7 +111,7 @@ ChameleonSph: width_modifier: type: Absolute value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf core_radius_1: @@ -129,7 +121,7 @@ ChameleonSph: width_modifier: type: Absolute value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf intensity: @@ -139,7 +131,7 @@ ChameleonSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf mass_to_light_ratio: @@ -149,6 +141,6 @@ ChameleonSph: width_modifier: type: Relative value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/mass/stellar/dev_vaucouleurs.yaml b/autogalaxy/config/priors/mass/stellar/dev_vaucouleurs.yaml index 460ac5c23..42052ca08 100644 --- a/autogalaxy/config/priors/mass/stellar/dev_vaucouleurs.yaml +++ b/autogalaxy/config/priors/mass/stellar/dev_vaucouleurs.yaml @@ -3,24 +3,20 @@ DevVaucouleurs: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -30,11 +26,11 @@ DevVaucouleurs: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -42,11 +38,11 @@ DevVaucouleurs: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -54,7 +50,7 @@ DevVaucouleurs: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 intensity: @@ -64,7 +60,7 @@ DevVaucouleurs: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf mass_to_light_ratio: @@ -74,7 +70,7 @@ DevVaucouleurs: width_modifier: type: Relative value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf DevVaucouleursSph: @@ -82,24 +78,20 @@ DevVaucouleursSph: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -109,7 +101,7 @@ DevVaucouleursSph: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf intensity: @@ -119,7 +111,7 @@ DevVaucouleursSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf mass_to_light_ratio: @@ -129,6 +121,6 @@ DevVaucouleursSph: width_modifier: type: Relative value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/mass/stellar/exponential.yaml b/autogalaxy/config/priors/mass/stellar/exponential.yaml index 380bc7123..36724d2fc 100644 --- a/autogalaxy/config/priors/mass/stellar/exponential.yaml +++ b/autogalaxy/config/priors/mass/stellar/exponential.yaml @@ -3,24 +3,20 @@ Exponential: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -30,11 +26,11 @@ Exponential: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -42,11 +38,11 @@ Exponential: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -54,7 +50,7 @@ Exponential: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 intensity: @@ -64,7 +60,7 @@ Exponential: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf mass_to_light_ratio: @@ -74,7 +70,7 @@ Exponential: width_modifier: type: Relative value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf ExponentialSph: @@ -82,24 +78,20 @@ ExponentialSph: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -109,7 +101,7 @@ ExponentialSph: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf intensity: @@ -119,7 +111,7 @@ ExponentialSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf mass_to_light_ratio: @@ -129,6 +121,6 @@ ExponentialSph: width_modifier: type: Relative value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/mass/stellar/gaussian.yaml b/autogalaxy/config/priors/mass/stellar/gaussian.yaml index 591cb9185..b2d09ce7a 100644 --- a/autogalaxy/config/priors/mass/stellar/gaussian.yaml +++ b/autogalaxy/config/priors/mass/stellar/gaussian.yaml @@ -6,35 +6,31 @@ Gaussian: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf centre_0: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -42,11 +38,11 @@ Gaussian: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -54,7 +50,7 @@ Gaussian: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 intensity: @@ -64,7 +60,7 @@ Gaussian: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf mass_to_light_ratio: @@ -74,6 +70,6 @@ Gaussian: width_modifier: type: Relative value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/mass/stellar/gaussian_gradient.yaml b/autogalaxy/config/priors/mass/stellar/gaussian_gradient.yaml index 4d8e5e5a3..a1f6c906c 100644 --- a/autogalaxy/config/priors/mass/stellar/gaussian_gradient.yaml +++ b/autogalaxy/config/priors/mass/stellar/gaussian_gradient.yaml @@ -3,28 +3,24 @@ GaussianGradient: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -32,11 +28,11 @@ GaussianGradient: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -44,7 +40,7 @@ GaussianGradient: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 intensity: @@ -54,7 +50,7 @@ GaussianGradient: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf sigma: @@ -64,7 +60,7 @@ GaussianGradient: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf mass_to_light_ratio_base: @@ -74,7 +70,7 @@ GaussianGradient: width_modifier: type: Relative value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf mass_to_light_gradient: @@ -84,7 +80,7 @@ GaussianGradient: width_modifier: type: Relative value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf mass_to_light_radius: diff --git a/autogalaxy/config/priors/mass/stellar/sersic.yaml b/autogalaxy/config/priors/mass/stellar/sersic.yaml index 8361ff6a4..86c5317fc 100644 --- a/autogalaxy/config/priors/mass/stellar/sersic.yaml +++ b/autogalaxy/config/priors/mass/stellar/sersic.yaml @@ -3,24 +3,20 @@ Sersic: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -30,11 +26,11 @@ Sersic: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -42,11 +38,11 @@ Sersic: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -54,7 +50,7 @@ Sersic: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 intensity: @@ -64,7 +60,7 @@ Sersic: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf mass_to_light_ratio: @@ -74,7 +70,7 @@ Sersic: width_modifier: type: Relative value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf sersic_index: @@ -84,7 +80,7 @@ Sersic: width_modifier: type: Absolute value: 1.5 - gaussian_limits: + limits: lower: 0.8 upper: 5.0 SersicSph: @@ -92,24 +88,20 @@ SersicSph: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -119,7 +111,7 @@ SersicSph: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf intensity: @@ -129,7 +121,7 @@ SersicSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf mass_to_light_ratio: @@ -139,7 +131,7 @@ SersicSph: width_modifier: type: Relative value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf sersic_index: @@ -149,6 +141,6 @@ SersicSph: width_modifier: type: Absolute value: 1.5 - gaussian_limits: + limits: lower: 0.8 upper: 5.0 diff --git a/autogalaxy/config/priors/mass/stellar/sersic_core.yaml b/autogalaxy/config/priors/mass/stellar/sersic_core.yaml index b1fc6f5e0..e6a8a5112 100644 --- a/autogalaxy/config/priors/mass/stellar/sersic_core.yaml +++ b/autogalaxy/config/priors/mass/stellar/sersic_core.yaml @@ -3,24 +3,20 @@ SersicCore: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -30,11 +26,11 @@ SersicCore: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -42,11 +38,11 @@ SersicCore: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -54,7 +50,7 @@ SersicCore: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 intensity: @@ -64,7 +60,7 @@ SersicCore: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf alpha: @@ -83,7 +79,7 @@ SersicCore: width_modifier: type: Relative value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf sersic_index: @@ -93,7 +89,7 @@ SersicCore: width_modifier: type: Absolute value: 1.5 - gaussian_limits: + limits: lower: 0.8 upper: 5.0 SersicCoreSph: @@ -104,24 +100,20 @@ SersicCoreSph: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -131,7 +123,7 @@ SersicCoreSph: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf gamma: @@ -144,7 +136,7 @@ SersicCoreSph: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf mass_to_light_ratio: @@ -154,7 +146,7 @@ SersicCoreSph: width_modifier: type: Relative value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf radius_break: @@ -167,6 +159,6 @@ SersicCoreSph: width_modifier: type: Absolute value: 1.5 - gaussian_limits: + limits: lower: 0.8 upper: 5.0 diff --git a/autogalaxy/config/priors/mass/stellar/sersic_gradient.yaml b/autogalaxy/config/priors/mass/stellar/sersic_gradient.yaml index 32b401797..2391ec01c 100644 --- a/autogalaxy/config/priors/mass/stellar/sersic_gradient.yaml +++ b/autogalaxy/config/priors/mass/stellar/sersic_gradient.yaml @@ -3,24 +3,20 @@ SersicGradient: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -30,11 +26,11 @@ SersicGradient: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -42,11 +38,11 @@ SersicGradient: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -54,7 +50,7 @@ SersicGradient: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 intensity: @@ -64,7 +60,7 @@ SersicGradient: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf mass_to_light_gradient: @@ -74,7 +70,7 @@ SersicGradient: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -inf upper: inf mass_to_light_ratio: @@ -84,7 +80,7 @@ SersicGradient: width_modifier: type: Relative value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf sersic_index: @@ -94,7 +90,7 @@ SersicGradient: width_modifier: type: Absolute value: 1.5 - gaussian_limits: + limits: lower: 0.8 upper: 5.0 SersicGradientSph: @@ -102,24 +98,20 @@ SersicGradientSph: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf effective_radius: @@ -129,7 +121,7 @@ SersicGradientSph: width_modifier: type: Relative value: 1.0 - gaussian_limits: + limits: lower: 0.0 upper: inf intensity: @@ -139,7 +131,7 @@ SersicGradientSph: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf mass_to_light_gradient: @@ -149,7 +141,7 @@ SersicGradientSph: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -inf upper: inf mass_to_light_ratio: @@ -159,7 +151,7 @@ SersicGradientSph: width_modifier: type: Relative value: 0.3 - gaussian_limits: + limits: lower: 0.0 upper: inf sersic_index: @@ -169,6 +161,6 @@ SersicGradientSph: width_modifier: type: Absolute value: 1.5 - gaussian_limits: + limits: lower: 0.8 upper: 5.0 diff --git a/autogalaxy/config/priors/mass/total/isothermal.yaml b/autogalaxy/config/priors/mass/total/isothermal.yaml index bafb6df1d..142a0b415 100644 --- a/autogalaxy/config/priors/mass/total/isothermal.yaml +++ b/autogalaxy/config/priors/mass/total/isothermal.yaml @@ -3,24 +3,20 @@ Isothermal: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf einstein_radius: @@ -30,11 +26,11 @@ Isothermal: width_modifier: type: Relative value: 0.25 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -42,11 +38,11 @@ Isothermal: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -54,7 +50,7 @@ Isothermal: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 IsothermalSph: @@ -62,24 +58,20 @@ IsothermalSph: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf einstein_radius: @@ -89,6 +81,6 @@ IsothermalSph: width_modifier: type: Relative value: 0.25 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/mass/total/isothermal_core.yaml b/autogalaxy/config/priors/mass/total/isothermal_core.yaml index 7f32ff0eb..358281709 100644 --- a/autogalaxy/config/priors/mass/total/isothermal_core.yaml +++ b/autogalaxy/config/priors/mass/total/isothermal_core.yaml @@ -3,24 +3,20 @@ IsothermalCore: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf core_radius: @@ -30,7 +26,7 @@ IsothermalCore: width_modifier: type: Absolute value: 0.1 - gaussian_limits: + limits: lower: 0.0 upper: inf einstein_radius: @@ -40,11 +36,11 @@ IsothermalCore: width_modifier: type: Relative value: 0.25 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -52,11 +48,11 @@ IsothermalCore: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -64,7 +60,7 @@ IsothermalCore: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 IsothermalCoreSph: @@ -72,24 +68,20 @@ IsothermalCoreSph: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf core_radius: @@ -99,7 +91,7 @@ IsothermalCoreSph: width_modifier: type: Absolute value: 0.1 - gaussian_limits: + limits: lower: 0.0 upper: inf einstein_radius: @@ -109,6 +101,6 @@ IsothermalCoreSph: width_modifier: type: Relative value: 0.25 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/mass/total/power_law.yaml b/autogalaxy/config/priors/mass/total/power_law.yaml index c4cdb210d..d0b73133f 100644 --- a/autogalaxy/config/priors/mass/total/power_law.yaml +++ b/autogalaxy/config/priors/mass/total/power_law.yaml @@ -3,24 +3,20 @@ PowerLaw: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf einstein_radius: @@ -30,11 +26,11 @@ PowerLaw: width_modifier: type: Relative value: 0.25 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -42,11 +38,11 @@ PowerLaw: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -54,7 +50,7 @@ PowerLaw: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 slope: @@ -64,7 +60,7 @@ PowerLaw: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: 1.0 upper: 3.0 PowerLawSph: @@ -72,24 +68,20 @@ PowerLawSph: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf einstein_radius: @@ -99,7 +91,7 @@ PowerLawSph: width_modifier: type: Relative value: 0.25 - gaussian_limits: + limits: lower: 0.0 upper: inf slope: @@ -109,6 +101,6 @@ PowerLawSph: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: 1.0 upper: 3.0 diff --git a/autogalaxy/config/priors/mass/total/power_law_broken.yaml b/autogalaxy/config/priors/mass/total/power_law_broken.yaml index f07a61200..40e52deeb 100644 --- a/autogalaxy/config/priors/mass/total/power_law_broken.yaml +++ b/autogalaxy/config/priors/mass/total/power_law_broken.yaml @@ -6,31 +6,27 @@ PowerLawBroken: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf centre_0: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf einstein_radius: @@ -40,11 +36,11 @@ PowerLawBroken: width_modifier: type: Relative value: 0.25 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -52,11 +48,11 @@ PowerLawBroken: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -64,7 +60,7 @@ PowerLawBroken: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 inner_slope: @@ -74,7 +70,7 @@ PowerLawBroken: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: 3.0 outer_slope: @@ -84,7 +80,7 @@ PowerLawBroken: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: 3.0 PowerLawBrokenSph: @@ -95,31 +91,27 @@ PowerLawBrokenSph: width_modifier: type: Absolute value: 0.1 - gaussian_limits: + limits: lower: 0.0 upper: inf centre_0: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf einstein_radius: @@ -129,7 +121,7 @@ PowerLawBrokenSph: width_modifier: type: Relative value: 0.25 - gaussian_limits: + limits: lower: 0.0 upper: inf inner_slope: @@ -139,7 +131,7 @@ PowerLawBrokenSph: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: 3.0 outer_slope: @@ -149,6 +141,6 @@ PowerLawBrokenSph: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: 3.0 diff --git a/autogalaxy/config/priors/mass/total/power_law_core.yaml b/autogalaxy/config/priors/mass/total/power_law_core.yaml index 72f9f8de4..c5b2ab6cb 100644 --- a/autogalaxy/config/priors/mass/total/power_law_core.yaml +++ b/autogalaxy/config/priors/mass/total/power_law_core.yaml @@ -3,24 +3,20 @@ PowerLawCore: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf core_radius: @@ -30,7 +26,7 @@ PowerLawCore: width_modifier: type: Absolute value: 0.1 - gaussian_limits: + limits: lower: 0.0 upper: inf einstein_radius: @@ -40,11 +36,11 @@ PowerLawCore: width_modifier: type: Relative value: 0.25 - gaussian_limits: + limits: lower: 0.0 upper: inf ell_comps_0: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -52,11 +48,11 @@ PowerLawCore: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 ell_comps_1: - type: Gaussian + type: TruncatedGaussian mean: 0.0 sigma: 0.3 lower_limit: -1.0 @@ -64,7 +60,7 @@ PowerLawCore: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: -1.0 upper: 1.0 slope: @@ -74,7 +70,7 @@ PowerLawCore: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: 1.0 upper: 3.0 PowerLawCoreSph: @@ -82,24 +78,20 @@ PowerLawCoreSph: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf core_radius: @@ -109,7 +101,7 @@ PowerLawCoreSph: width_modifier: type: Absolute value: 0.1 - gaussian_limits: + limits: lower: 0.0 upper: inf einstein_radius: @@ -119,7 +111,7 @@ PowerLawCoreSph: width_modifier: type: Relative value: 0.25 - gaussian_limits: + limits: lower: 0.0 upper: inf slope: @@ -129,6 +121,6 @@ PowerLawCoreSph: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: 1.0 upper: 3.0 diff --git a/autogalaxy/config/priors/mass/total/power_law_multipole.yaml b/autogalaxy/config/priors/mass/total/power_law_multipole.yaml index 66f96df5d..9ad385680 100644 --- a/autogalaxy/config/priors/mass/total/power_law_multipole.yaml +++ b/autogalaxy/config/priors/mass/total/power_law_multipole.yaml @@ -6,24 +6,20 @@ PowerLawMultipole: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.1 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf einstein_radius: @@ -33,7 +29,7 @@ PowerLawMultipole: width_modifier: type: Relative value: 0.25 - gaussian_limits: + limits: lower: 0.0 upper: inf slope: @@ -43,7 +39,7 @@ PowerLawMultipole: width_modifier: type: Absolute value: 0.2 - gaussian_limits: + limits: lower: 1.0 upper: 3.0 multipole_comps_0: @@ -53,7 +49,7 @@ PowerLawMultipole: width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf multipole_comps_1: @@ -63,6 +59,6 @@ PowerLawMultipole: width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf \ No newline at end of file diff --git a/autogalaxy/config/priors/mesh/rectangular.yaml b/autogalaxy/config/priors/mesh/rectangular.yaml index 53c565cd6..1c3e6a4fa 100644 --- a/autogalaxy/config/priors/mesh/rectangular.yaml +++ b/autogalaxy/config/priors/mesh/rectangular.yaml @@ -6,7 +6,7 @@ Rectangular: width_modifier: type: Absolute value: 8.0 - gaussian_limits: + limits: lower: 3.0 upper: inf shape_1: @@ -16,6 +16,6 @@ Rectangular: width_modifier: type: Absolute value: 8.0 - gaussian_limits: + limits: lower: 3.0 upper: inf diff --git a/autogalaxy/config/priors/point_sources.yaml b/autogalaxy/config/priors/point_sources.yaml index 5ff02c31c..ce44f3f6a 100644 --- a/autogalaxy/config/priors/point_sources.yaml +++ b/autogalaxy/config/priors/point_sources.yaml @@ -3,24 +3,20 @@ Point: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf PointFlux: @@ -28,24 +24,20 @@ PointFlux: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf flux: @@ -55,7 +47,7 @@ PointFlux: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf PointSourceChi: @@ -63,23 +55,19 @@ PointSourceChi: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf centre_1: type: Gaussian mean: 0.0 sigma: 0.3 - lower_limit: -inf - upper_limit: inf width_modifier: type: Absolute value: 0.05 - gaussian_limits: + limits: lower: -inf upper: inf diff --git a/autogalaxy/config/priors/regularization/adaptive_brightness.yaml b/autogalaxy/config/priors/regularization/adaptive_brightness.yaml index 5e911e9dc..0d69dcddd 100644 --- a/autogalaxy/config/priors/regularization/adaptive_brightness.yaml +++ b/autogalaxy/config/priors/regularization/adaptive_brightness.yaml @@ -6,7 +6,7 @@ AdaptiveBrightness: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf outer_coefficient: @@ -16,7 +16,7 @@ AdaptiveBrightness: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf signal_scale: @@ -26,7 +26,7 @@ AdaptiveBrightness: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf AdaptiveBrightnessSplit: @@ -37,7 +37,7 @@ AdaptiveBrightnessSplit: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf outer_coefficient: @@ -47,7 +47,7 @@ AdaptiveBrightnessSplit: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf signal_scale: @@ -57,6 +57,6 @@ AdaptiveBrightnessSplit: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/regularization/adaptive_brightness_split_zeroth.yaml b/autogalaxy/config/priors/regularization/adaptive_brightness_split_zeroth.yaml index 812cd282e..6fd086a67 100644 --- a/autogalaxy/config/priors/regularization/adaptive_brightness_split_zeroth.yaml +++ b/autogalaxy/config/priors/regularization/adaptive_brightness_split_zeroth.yaml @@ -6,7 +6,7 @@ AdaptiveBrightnessSplitZeroth: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf zeroth_signal_scale: @@ -16,7 +16,7 @@ AdaptiveBrightnessSplitZeroth: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf inner_coefficient: @@ -26,7 +26,7 @@ AdaptiveBrightnessSplitZeroth: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf outer_coefficient: @@ -36,7 +36,7 @@ AdaptiveBrightnessSplitZeroth: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf signal_scale: @@ -46,6 +46,6 @@ AdaptiveBrightnessSplitZeroth: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf \ No newline at end of file diff --git a/autogalaxy/config/priors/regularization/constant.yaml b/autogalaxy/config/priors/regularization/constant.yaml index 35b1dbb9f..d21d98f91 100644 --- a/autogalaxy/config/priors/regularization/constant.yaml +++ b/autogalaxy/config/priors/regularization/constant.yaml @@ -6,6 +6,6 @@ Constant: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/regularization/constant_split.yaml b/autogalaxy/config/priors/regularization/constant_split.yaml index 2ea6fba46..036651ed2 100644 --- a/autogalaxy/config/priors/regularization/constant_split.yaml +++ b/autogalaxy/config/priors/regularization/constant_split.yaml @@ -6,6 +6,6 @@ ConstantSplit: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/regularization/constant_zeroth.yaml b/autogalaxy/config/priors/regularization/constant_zeroth.yaml index a58d659de..ef47c14c3 100644 --- a/autogalaxy/config/priors/regularization/constant_zeroth.yaml +++ b/autogalaxy/config/priors/regularization/constant_zeroth.yaml @@ -6,7 +6,7 @@ ConstantZeroth: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf coefficient_zeroth: @@ -16,6 +16,6 @@ ConstantZeroth: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/regularization/exponential_kernel.yaml b/autogalaxy/config/priors/regularization/exponential_kernel.yaml index 8618c8d98..add53a05d 100644 --- a/autogalaxy/config/priors/regularization/exponential_kernel.yaml +++ b/autogalaxy/config/priors/regularization/exponential_kernel.yaml @@ -6,7 +6,7 @@ ExponentialKernel: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf scale: @@ -16,6 +16,6 @@ ExponentialKernel: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/regularization/gaussian_kernel.yaml b/autogalaxy/config/priors/regularization/gaussian_kernel.yaml index 9aec65be7..48f050ee2 100644 --- a/autogalaxy/config/priors/regularization/gaussian_kernel.yaml +++ b/autogalaxy/config/priors/regularization/gaussian_kernel.yaml @@ -6,7 +6,7 @@ GaussianKernel: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf scale: @@ -16,6 +16,6 @@ GaussianKernel: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/regularization/matern_kernel.yaml b/autogalaxy/config/priors/regularization/matern_kernel.yaml index 60b7cd02d..f2fed72e4 100644 --- a/autogalaxy/config/priors/regularization/matern_kernel.yaml +++ b/autogalaxy/config/priors/regularization/matern_kernel.yaml @@ -6,7 +6,7 @@ MaternKernel: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf scale: @@ -16,7 +16,7 @@ MaternKernel: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf nu: @@ -26,6 +26,6 @@ MaternKernel: width_modifier: type: Relative value: 0.2 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/config/priors/regularization/zeroth.yaml b/autogalaxy/config/priors/regularization/zeroth.yaml index 16d05b0d2..92b358f0f 100644 --- a/autogalaxy/config/priors/regularization/zeroth.yaml +++ b/autogalaxy/config/priors/regularization/zeroth.yaml @@ -6,6 +6,6 @@ Zeroth: width_modifier: type: Relative value: 0.5 - gaussian_limits: + limits: lower: 0.0 upper: inf diff --git a/autogalaxy/ellipse/model/analysis.py b/autogalaxy/ellipse/model/analysis.py index 476854ffe..80046e6b9 100644 --- a/autogalaxy/ellipse/model/analysis.py +++ b/autogalaxy/ellipse/model/analysis.py @@ -75,11 +75,8 @@ def log_likelihood_function(self, instance: af.ModelInstance) -> float: float The log likelihood indicating how well this model instance fitted the imaging data. """ - try: - fit_list = self.fit_list_from(instance=instance) - return sum(fit.log_likelihood for fit in fit_list) - except ValueError as e: - raise exc.FitException from e + fit_list = self.fit_list_from(instance=instance) + return sum(fit.log_likelihood for fit in fit_list) def fit_list_from(self, instance: af.ModelInstance) -> List[FitEllipse]: """ @@ -189,60 +186,3 @@ def save_attributes(self, paths: af.DirectoryPaths): visualization, and the pickled objects used by the aggregator output by this function. """ pass - - def profile_log_likelihood_function( - self, instance: af.ModelInstance, paths: Optional[af.DirectoryPaths] = None - ) -> Tuple[Dict, Dict]: - """ - This function is optionally called throughout a model-fit to profile the log likelihood function. - - All function calls inside the `log_likelihood_function` that are decorated with the `profile_func` are timed - with their times stored in a dictionary called the `run_time_dict`. - - An `info_dict` is also created which stores information on aspects of the model and dataset that dictate - run times, so the profiled times can be interpreted with this context. - - The results of this profiling are then output to hard-disk in the `profiling` folder of the model-fit results, - which they can be inspected to ensure run-times are as expected. - - Parameters - ---------- - instance - An instance of the model that is being fitted to the data by this analysis (whose parameters have been set - via a non-linear search). - paths - The paths object which manages all paths, e.g. where the non-linear search outputs are stored, - visualization and the pickled objects used by the aggregator output by this function. - - Returns - ------- - Two dictionaries, the profiling dictionary and info dictionary, which contain the profiling times of the - `log_likelihood_function` and information on the model and dataset used to perform the profiling. - """ - repeats = 1 - - if isinstance(paths, af.DatabasePaths): - return - - run_time_dict = {} - - # Ensure numba functions are compiled before profiling begins. - - self.log_likelihood_function(instance=instance) - - start = time.time() - - for _ in range(repeats): - try: - self.log_likelihood_function(instance=instance) - except Exception: - logger.info( - "Profiling failed. Returning without outputting information." - ) - return - - fit_time = (time.time() - start) / repeats - - run_time_dict["fit_time"] = fit_time - - return run_time_dict, {} diff --git a/autogalaxy/galaxy/galaxies.py b/autogalaxy/galaxy/galaxies.py index 71a406ee1..aa9daff70 100644 --- a/autogalaxy/galaxy/galaxies.py +++ b/autogalaxy/galaxy/galaxies.py @@ -15,7 +15,6 @@ class Galaxies(List, OperateImageGalaxies, OperateDeflections): def __init__( self, galaxies: List[Galaxy], - run_time_dict: Optional[Dict] = None, ): """ A collection of galaxies, used to perform operations on the galaxies as a group. @@ -42,13 +41,9 @@ def __init__( ---------- galaxies The list of galaxies whose calculations are performed by this class. - run_time_dict - A dictionary of information on the run-times of function calls, including the total time and time spent on - different calculations. """ super().__init__(galaxies) - self.run_time_dict = run_time_dict @property def redshift(self): diff --git a/autogalaxy/galaxy/to_inversion.py b/autogalaxy/galaxy/to_inversion.py index 00f47782c..353e09b66 100644 --- a/autogalaxy/galaxy/to_inversion.py +++ b/autogalaxy/galaxy/to_inversion.py @@ -23,7 +23,6 @@ def __init__( dataset: Optional[Union[aa.Imaging, aa.Interferometer, aa.DatasetInterface]], adapt_images: Optional[AdaptImages] = None, settings_inversion: aa.SettingsInversion = aa.SettingsInversion(), - run_time_dict: Optional[Dict] = None, ): """ Abstract class which interfaces a dataset and input modeling object (e.g. galaxies, a tracer) with the @@ -57,8 +56,6 @@ def __init__( the pixelization's pixels to the brightest regions of the image. settings_inversion The settings of the inversion, which controls how the linear algebra calculation is performed. - run_time_dict - A dictionary of run-time values used to compute the inversion, for example the noise-map normalization. """ if dataset is not None: if dataset.noise_covariance_matrix is not None: @@ -78,8 +75,6 @@ def __init__( self.settings_inversion = settings_inversion - self.run_time_dict = run_time_dict - @property def psf(self) -> Optional[aa.Kernel2D]: """ @@ -193,7 +188,6 @@ def __init__( galaxies: List[Galaxy], adapt_images: Optional[AdaptImages] = None, settings_inversion: aa.SettingsInversion = aa.SettingsInversion(), - run_time_dict: Optional[Dict] = None, ): """ Interfaces a dataset and input list of galaxies with the inversion module. to setup a @@ -228,8 +222,6 @@ def __init__( the pixelization's pixels to the brightest regions of the image. settings_inversion The settings of the inversion, which controls how the linear algebra calculation is performed. - run_time_dict - A dictionary of run-time values used to compute the inversion, for example the noise-map normalization. """ self.galaxies = Galaxies(galaxies) @@ -237,7 +229,6 @@ def __init__( dataset=dataset, adapt_images=adapt_images, settings_inversion=settings_inversion, - run_time_dict=run_time_dict, ) @property @@ -491,13 +482,11 @@ def mapper_from( source_plane_mesh_grid=source_plane_mesh_grid, image_plane_mesh_grid=image_plane_mesh_grid, adapt_data=adapt_galaxy_image, - run_time_dict=self.run_time_dict, ) return mapper_from( mapper_grids=mapper_grids, regularization=regularization, - run_time_dict=self.run_time_dict, ) @cached_property @@ -579,7 +568,6 @@ def inversion(self) -> aa.AbstractInversion: dataset=self.dataset, linear_obj_list=self.linear_obj_list, settings=self.settings_inversion, - run_time_dict=self.run_time_dict, ) inversion.linear_obj_galaxy_dict = self.linear_obj_galaxy_dict diff --git a/autogalaxy/imaging/fit_imaging.py b/autogalaxy/imaging/fit_imaging.py index 7bb76275f..c0dc30229 100644 --- a/autogalaxy/imaging/fit_imaging.py +++ b/autogalaxy/imaging/fit_imaging.py @@ -25,7 +25,6 @@ def __init__( dataset_model: Optional[aa.DatasetModel] = None, adapt_images: Optional[AdaptImages] = None, settings_inversion: aa.SettingsInversion = aa.SettingsInversion(), - run_time_dict: Optional[Dict] = None, ): """ Fits an imaging dataset using a list of galaxies. @@ -64,17 +63,13 @@ def __init__( reconstructed galaxy's morphology. settings_inversion Settings controlling how an inversion is fitted for example which linear algebra formalism is used. - run_time_dict - A dictionary which if passed to the fit records how long fucntion calls which have the `profile_func` - decorator take to run. """ - self.galaxies = Galaxies(galaxies=galaxies, run_time_dict=run_time_dict) + self.galaxies = Galaxies(galaxies=galaxies) super().__init__( dataset=dataset, dataset_model=dataset_model, - run_time_dict=run_time_dict, ) AbstractFitInversion.__init__( self=self, @@ -130,7 +125,6 @@ def galaxies_to_inversion(self) -> GalaxiesToInversion: galaxies=self.galaxies, adapt_images=self.adapt_images, settings_inversion=self.settings_inversion, - run_time_dict=self.run_time_dict, ) @cached_property diff --git a/autogalaxy/imaging/model/analysis.py b/autogalaxy/imaging/model/analysis.py index 8e0cbc486..2f27c2a17 100644 --- a/autogalaxy/imaging/model/analysis.py +++ b/autogalaxy/imaging/model/analysis.py @@ -133,24 +133,11 @@ def log_likelihood_function(self, instance: af.ModelInstance) -> float: float The log likelihood indicating how well this model instance fitted the imaging data. """ - - try: - return self.fit_from(instance=instance).figure_of_merit - except ( - PixelizationException, - exc.PixelizationException, - exc.InversionException, - exc.GridException, - ValueError, - np.linalg.LinAlgError, - OverflowError, - ) as e: - raise exc.FitException from e + return self.fit_from(instance=instance).figure_of_merit def fit_from( self, instance: af.ModelInstance, - run_time_dict: Optional[Dict] = None, ) -> FitImaging: """ Given a model instance create a `FitImaging` object. @@ -165,8 +152,6 @@ def fit_from( via a non-linear search). preload_overwrite If a `Preload` object is input this is used instead of the preloads stored as an attribute in the analysis. - run_time_dict - A dictionary which times functions called to fit the model to data, for profiling. Returns ------- @@ -175,7 +160,7 @@ def fit_from( """ galaxies = self.galaxies_via_instance_from( - instance=instance, run_time_dict=run_time_dict + instance=instance, ) dataset_model = self.dataset_model_via_instance_from(instance=instance) @@ -188,7 +173,6 @@ def fit_from( dataset_model=dataset_model, adapt_images=adapt_images, settings_inversion=self.settings_inversion, - run_time_dict=run_time_dict, ) def save_attributes(self, paths: af.DirectoryPaths): @@ -220,44 +204,3 @@ def save_attributes(self, paths: af.DirectoryPaths): visualization, and the pickled objects used by the aggregator output by this function. """ super().save_attributes(paths=paths) - - def profile_log_likelihood_function( - self, instance: af.ModelInstance, paths: Optional[af.DirectoryPaths] = None - ) -> Tuple[Dict, Dict]: - """ - This function is optionally called throughout a model-fit to profile the log likelihood function. - - All function calls inside the `log_likelihood_function` that are decorated with the `profile_func` are timed - with their times stored in a dictionary called the `run_time_dict`. - - An `info_dict` is also created which stores information on aspects of the model and dataset that dictate - run times, so the profiled times can be interpreted with this context. - - The results of this profiling are then output to hard-disk in the `profiling` folder of the model-fit results, - which they can be inspected to ensure run-times are as expected. - - Parameters - ---------- - instance - An instance of the model that is being fitted to the data by this analysis (whose parameters have been set - via a non-linear search). - paths - The paths object which manages all paths, e.g. where the non-linear search outputs are stored, - visualization and the pickled objects used by the aggregator output by this function. - - Returns - ------- - Two dictionaries, the profiling dictionary and info dictionary, which contain the profiling times of the - `log_likelihood_function` and information on the model and dataset used to perform the profiling. - """ - run_time_dict, info_dict = super().profile_log_likelihood_function( - instance=instance, - ) - - info_dict["psf_shape_2d"] = self.dataset.psf.shape_native - - self.output_profiling_info( - paths=paths, run_time_dict=run_time_dict, info_dict=info_dict - ) - - return run_time_dict, info_dict diff --git a/autogalaxy/interferometer/fit_interferometer.py b/autogalaxy/interferometer/fit_interferometer.py index 3aa12c882..282151050 100644 --- a/autogalaxy/interferometer/fit_interferometer.py +++ b/autogalaxy/interferometer/fit_interferometer.py @@ -20,7 +20,6 @@ def __init__( dataset_model: Optional[aa.DatasetModel] = None, adapt_images: Optional[AdaptImages] = None, settings_inversion: aa.SettingsInversion = aa.SettingsInversion(), - run_time_dict: Optional[Dict] = None, ): """ Fits an interferometer dataset using a list of galaxies. @@ -60,9 +59,6 @@ def __init__( reconstructed galaxy's morphology. settings_inversion Settings controlling how an inversion is fitted for example which linear algebra formalism is used. - run_time_dict - A dictionary which if passed to the fit records how long fucntion calls which have the `profile_func` - decorator take to run. """ try: @@ -70,13 +66,12 @@ def __init__( except ImportError: settings_inversion.use_w_tilde = False - self.galaxies = Galaxies(galaxies=galaxies, run_time_dict=run_time_dict) + self.galaxies = Galaxies(galaxies=galaxies) super().__init__( dataset=dataset, dataset_model=dataset_model, use_mask_in_fit=False, - run_time_dict=run_time_dict, ) AbstractFitInversion.__init__( self=self, @@ -119,7 +114,6 @@ def galaxies_to_inversion(self) -> GalaxiesToInversion: galaxies=self.galaxies, adapt_images=self.adapt_images, settings_inversion=self.settings_inversion, - run_time_dict=self.run_time_dict, ) @cached_property diff --git a/autogalaxy/interferometer/model/analysis.py b/autogalaxy/interferometer/model/analysis.py index fa6bf976f..c774e73f9 100644 --- a/autogalaxy/interferometer/model/analysis.py +++ b/autogalaxy/interferometer/model/analysis.py @@ -137,24 +137,11 @@ def log_likelihood_function(self, instance: af.ModelInstance) -> float: float The log likelihood indicating how well this model instance fitted the interferometer data. """ - - try: - return self.fit_from(instance=instance).figure_of_merit - except ( - PixelizationException, - exc.PixelizationException, - exc.InversionException, - exc.GridException, - ValueError, - np.linalg.LinAlgError, - OverflowError, - ) as e: - raise exc.FitException from e + return self.fit_from(instance=instance).figure_of_merit def fit_from( self, instance: af.ModelInstance, - run_time_dict: Optional[Dict] = None, ) -> FitInterferometer: """ Given a model instance create a `FitInterferometer` object. @@ -169,8 +156,6 @@ def fit_from( via a non-linear search). preload_overwrite If a `Preload` object is input this is used instead of the preloads stored as an attribute in the analysis. - run_time_dict - A dictionary which times functions called to fit the model to data, for profiling. Returns ------- @@ -178,7 +163,7 @@ def fit_from( The fit of the galaxies to the interferometer dataset, which includes the log likelihood. """ galaxies = self.galaxies_via_instance_from( - instance=instance, run_time_dict=run_time_dict + instance=instance, ) adapt_images = self.adapt_images_via_instance_from(instance=instance) @@ -188,7 +173,6 @@ def fit_from( galaxies=galaxies, adapt_images=adapt_images, settings_inversion=self.settings_inversion, - run_time_dict=run_time_dict, ) def save_attributes(self, paths: af.DirectoryPaths): @@ -228,45 +212,3 @@ def save_attributes(self, paths: af.DirectoryPaths): paths.save_json( "transformer_class", to_dict(self.dataset.transformer.__class__), "dataset" ) - - def profile_log_likelihood_function( - self, instance: af.ModelInstance, paths: Optional[af.DirectoryPaths] = None - ) -> Tuple[Dict, Dict]: - """ - This function is optionally called throughout a model-fit to profile the log likelihood function. - - All function calls inside the `log_likelihood_function` that are decorated with the `profile_func` are timed - with their times stored in a dictionary called the `run_time_dict`. - - An `info_dict` is also created which stores information on aspects of the model and dataset that dictate - run times, so the profiled times can be interpreted with this context. - - The results of this profiling are then output to hard-disk in the `profiling` folder of the model-fit results, - which they can be inspected to ensure run-times are as expected. - - Parameters - ---------- - instance - An instance of the model that is being fitted to the data by this analysis (whose parameters have been set - via a non-linear search). - paths - The paths object which manages all paths, e.g. where the non-linear search outputs are stored, - visualization and the pickled objects used by the aggregator output by this function. - - Returns - ------- - Two dictionaries, the profiling dictionary and info dictionary, which contain the profiling times of the - `log_likelihood_function` and information on the model and dataset used to perform the profiling. - """ - run_time_dict, info_dict = super().profile_log_likelihood_function( - instance=instance, - ) - - info_dict["number_of_visibilities"] = self.dataset.data.shape[0] - info_dict["transformer_cls"] = self.dataset.transformer.__class__.__name__ - - self.output_profiling_info( - paths=paths, run_time_dict=run_time_dict, info_dict=info_dict - ) - - return run_time_dict, info_dict diff --git a/autogalaxy/operate/image.py b/autogalaxy/operate/image.py index 44a3ab9c6..2170e1f01 100644 --- a/autogalaxy/operate/image.py +++ b/autogalaxy/operate/image.py @@ -30,7 +30,6 @@ def image_2d_from( def has(self, cls) -> bool: raise NotImplementedError - @aa.profile_func def _blurred_image_2d_from( self, image_2d: aa.Array2D, @@ -158,7 +157,6 @@ def unmasked_blurred_image_2d_from(self, grid, psf): return padded_image_2d + padded_image_2d_operated - @aa.profile_func def visibilities_from( self, grid: aa.Grid2D, transformer: aa.type.Transformer ) -> aa.Visibilities: diff --git a/autogalaxy/profiles/basis.py b/autogalaxy/profiles/basis.py index f71777a00..6e0ddd4e9 100644 --- a/autogalaxy/profiles/basis.py +++ b/autogalaxy/profiles/basis.py @@ -152,7 +152,7 @@ def convergence_2d_from(self, grid: aa.type.Grid2DLike, **kwargs) -> aa.Array2D: """ if len(self.mass_profile_list) > 0: return sum( - [mass.convergence_2d_from(grid=grid) for mass in self.mass_profile_list] + [mass.convergence_2d_from(grid=grid) for mass in self.profile_list] ) return np.zeros((grid.shape[0],)) diff --git a/autogalaxy/profiles/light/linear/abstract.py b/autogalaxy/profiles/light/linear/abstract.py index 9ff2b6e02..68fdf2bac 100644 --- a/autogalaxy/profiles/light/linear/abstract.py +++ b/autogalaxy/profiles/light/linear/abstract.py @@ -146,7 +146,6 @@ def __init__( psf: Optional[aa.Kernel2D], light_profile_list: List[LightProfileLinear], regularization=Optional[aa.reg.Regularization], - run_time_dict: Optional[Dict] = None, ): """ A list of linear light profiles which fits a dataset via linear algebra using the images of each linear light @@ -191,8 +190,6 @@ def __init__( A list of the linear light profiles that are used to fit the data via linear algebra. regularization The regularization scheme which may be applied to this linear object in order to smooth its solution. - run_time_dict - A dictionary which contains timing of certain functions calls which is used for profiling. """ for light_profile in light_profile_list: if not isinstance(light_profile, LightProfileLinear): @@ -206,7 +203,8 @@ def __init__( ) super().__init__( - grid=grid, regularization=regularization, run_time_dict=run_time_dict + grid=grid, + regularization=regularization, ) self.blurring_grid = blurring_grid diff --git a/autogalaxy/quantity/model/analysis.py b/autogalaxy/quantity/model/analysis.py index 4c764957d..45cd49be8 100644 --- a/autogalaxy/quantity/model/analysis.py +++ b/autogalaxy/quantity/model/analysis.py @@ -94,13 +94,7 @@ def log_likelihood_function(self, instance: af.ModelInstance) -> float: float The log likelihood indicating how well this model instance fitted the imaging data. """ - - try: - fit = self.fit_quantity_for_instance(instance=instance) - - return fit.figure_of_merit - except (exc.GridException, ValueError) as e: - raise exc.FitException from e + return self.fit_quantity_for_instance(instance=instance).figure_of_merit def fit_quantity_for_instance(self, instance: af.ModelInstance) -> FitQuantity: """ diff --git a/test_autogalaxy/imaging/model/test_analysis_imaging.py b/test_autogalaxy/imaging/model/test_analysis_imaging.py index 318cff56c..7d3173ec9 100644 --- a/test_autogalaxy/imaging/model/test_analysis_imaging.py +++ b/test_autogalaxy/imaging/model/test_analysis_imaging.py @@ -37,25 +37,3 @@ def test__figure_of_merit__matches_correct_fit_given_galaxy_profiles( fit = ag.FitImaging(dataset=masked_imaging_7x7, galaxies=galaxies) assert fit.log_likelihood == fit_figure_of_merit - - -def test__profile_log_likelihood_function(masked_imaging_7x7): - pixelization = ag.Pixelization( - mesh=ag.mesh.Rectangular(shape=(3, 3)), - regularization=ag.reg.Constant(coefficient=1.0), - ) - - galaxy = ag.Galaxy(redshift=0.5, pixelization=pixelization) - - model = af.Collection(galaxies=af.Collection(galaxy=galaxy)) - - instance = model.instance_from_unit_vector([]) - - analysis = ag.AnalysisImaging(dataset=masked_imaging_7x7) - - run_time_dict, info_dict = analysis.profile_log_likelihood_function( - instance=instance - ) - - assert "regularization_term_0" in run_time_dict - assert "log_det_regularization_matrix_term_0" in run_time_dict diff --git a/test_autogalaxy/interferometer/model/test_analysis_interferometer.py b/test_autogalaxy/interferometer/model/test_analysis_interferometer.py index 7f3f59b10..362d1e799 100644 --- a/test_autogalaxy/interferometer/model/test_analysis_interferometer.py +++ b/test_autogalaxy/interferometer/model/test_analysis_interferometer.py @@ -38,25 +38,3 @@ def test__fit_figure_of_merit__matches_correct_fit_given_galaxy_profiles( fit = ag.FitInterferometer(dataset=interferometer_7, galaxies=galaxies) assert fit.log_likelihood == fit_figure_of_merit - - -def test__profile_log_likelihood_function(interferometer_7): - pixelization = ag.Pixelization( - mesh=ag.mesh.Rectangular(shape=(3, 3)), - regularization=ag.reg.Constant(coefficient=1.0), - ) - - galaxy = ag.Galaxy(redshift=0.5, pixelization=pixelization) - - model = af.Collection(galaxies=af.Collection(galaxy=galaxy)) - - instance = model.instance_from_unit_vector([]) - - analysis = ag.AnalysisInterferometer(dataset=interferometer_7) - - run_time_dict, info_dict = analysis.profile_log_likelihood_function( - instance=instance - ) - - assert "regularization_term_0" in run_time_dict - assert "log_det_regularization_matrix_term_0" in run_time_dict