Feature/visualize refactor #96
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rhayes777
approved these changes
Apr 24, 2023
Comment on lines
+4
to
+6
| if TYPE_CHECKING: | ||
| from autogalaxy.galaxy.galaxy import Galaxy | ||
| from autogalaxy.interferometer.fit_interferometer import FitInterferometer |
| @@ -444,6 +440,9 @@ def output_or_check_figure_of_merit_sanity( | |||
| if os.environ.get("PYAUTOFIT_TEST_MODE") == "1": | |||
| return | |||
|
|
|||
| if conf.instance["general"]["test"]["bypass_figure_of_merit_sanity"]: | |||
There was a problem hiding this comment.
lol why do we want to bypass this?
There was a problem hiding this comment.
Not often, but we had some science runs messed up by it so its good to have an override.
Comment on lines
16
to
19
| adapt_galaxy_image_path_dict=None, | ||
| adapt_model_image=None, | ||
| adapt_galaxy_visibilities_path_dict=None, | ||
| adapt_model_visibilities=None, |
There was a problem hiding this comment.
I appreciate you just renamed these though
|
|
||
| self.search_bc_cls = search_bc_cls or af.DynestyStatic | ||
| self.search_bc_dict = search_bc_dict or { | ||
| self.search_pix_cls = search_pix_cls or af.DynestyStatic |
There was a problem hiding this comment.
Types are immutable so you could instead define this as a default argument
autogalaxy/analysis/visualizer.py
Outdated
| self, | ||
| hyper_galaxy_image_path_dict: {str, aa.Array2D}, | ||
| hyper_model_image: aa.Array2D, | ||
| adapt_galaxy_image_path_dict: {str, aa.Array2D}, |
Comment on lines
117
to
120
| for path, galaxy in self.path_galaxy_tuples: | ||
| hyper_galaxy_visibilities_path_dict[path] = self.visibilities_galaxy_dict[ | ||
| adapt_galaxy_visibilities_path_dict[path] = self.visibilities_galaxy_dict[ | ||
| path | ||
| ] |
There was a problem hiding this comment.
Could be a dict comprehension
| @@ -100,6 +98,13 @@ def cls_list_from(self, cls: Type) -> List: | |||
| def galaxies_with_cls_list_from(self, cls: Type) -> List[Galaxy]: | |||
| return list(filter(lambda galaxy: galaxy.has(cls=cls), self.galaxies)) | |||
|
|
|||
| @property | |||
| def adapt_galaxies_with_pixelization_image_list(self) -> List[aa.Array2D]: | |||
Comment on lines
+60
to
+73
| def tangential_critical_curves(self): | ||
| return self.load( | ||
| value=self._tangential_critical_curves, name="tangential_critical_curves" | ||
| ) | ||
|
|
||
| @property | ||
| def radial_critical_curves(self): | ||
| return self.load( | ||
| value=self._radial_critical_curves, name="radial_critical_curves" | ||
| ) | ||
|
|
||
| @property | ||
| def tangential_caustics(self): | ||
| return self.load(value=self._tangential_caustics, name="tangential_caustics") |
| """ | ||
| super().__init__(centre=centre, ell_comps=(0.0, 0.0)) | ||
|
|
||
| self.m = 4 |
There was a problem hiding this comment.
Where does this number come from?
Comment on lines
+7
to
+29
| setup = ag.legacy.SetupAdapt(search_pix_cls=None, search_pix_dict=None) | ||
| assert setup.search_pix_cls == af.DynestyStatic | ||
| assert setup.search_pix_dict == { | ||
| "nlive": 50, | ||
| "sample": "rwalk", | ||
| } | ||
|
|
||
| setup = ag.legacy.SetupAdapt( | ||
| search_pix_cls=af.DynestyDynamic, | ||
| search_pix_dict={"hello": "there"}, | ||
| ) | ||
| assert setup.search_pix_cls == af.DynestyDynamic | ||
| assert setup.search_pix_dict == {"hello": "there"} | ||
|
|
||
| setup = ag.legacy.SetupAdapt(search_noise_cls=None, search_noise_dict=None) | ||
| assert setup.search_noise_cls == af.DynestyStatic | ||
| assert setup.search_noise_dict == {"nlive": 50, "sample": "rwalk"} | ||
|
|
||
| setup = ag.legacy.SetupAdapt( | ||
| search_noise_cls=af.DynestyDynamic, search_noise_dict={"hello": "there"} | ||
| ) | ||
| assert setup.search_noise_cls == af.DynestyDynamic | ||
| assert setup.search_noise_dict == {"hello": "there"} |
There was a problem hiding this comment.
Should be four separate tests
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cleans up visualization code to make default images appear closer to publication quality.
The
subplot_fitwe use to inspect model-fits now have 9 panels, so we do not have to alternative betweensubplot_of_planes: