defaults: do not re-init always

beat: import allow for MixedSourceType result import in geometry mode
hvasbath · Aug 18, 2024 · 2f3a47e · 2f3a47e
1 parent 117c716
commit 2f3a47e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/beat/apps/beat.py b/beat/apps/beat.py
@@ -730,10 +730,9 @@ def setup(parser):
 
         elif options.mode == geometry_mode_str:
             if options.import_from_mode == geometry_mode_str:
-                # TODO update for n_sources refactoring
-                n_sources = problem.config.problem_config.n_sources
                 logger.info("Importing non-linear source geometry results!")
-
+                mapping = problem.config.problem_config.get_variables_mapping()
+                vars2sizes = mapping.unique_variables_sizes()
                 new_source_params = set(list(c.problem_config.priors.keys()))
                 old_source_params = set(source_params)
 
@@ -747,7 +746,7 @@ def setup(parser):
                         new_bounds[param] = extract_bounds_from_summary(
                             summarydf,
                             varname=param,
-                            shape=(n_sources,),
+                            shape=(vars2sizes[param],),
                             roundto=0,
                             alpha=0.06,
                         )

diff --git a/beat/defaults.py b/beat/defaults.py
@@ -320,5 +320,4 @@ def get_defaults(force=True):
     return defaults
 
 
-defaults = get_defaults()
-defaults = get_defaults()
+defaults = get_defaults(force=False)