Changeset dc71408 in sasview for src/sas/qtgui

Timestamp:

Jul 26, 2018 7:18:06 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

7dd309a

Parents:

144fe21

Message:

fix sum/multiply models in fitpage (SASVIEW-972)

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (2 diffs)

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -59 +59 @@
 
 DEFAULT_POLYDISP_FUNCTION = 'gaussian'
+
+
+logger = logging.getLogger(__name__)
 
 
@@ -1914 +1917 @@
             name = os.path.join(ModelUtilities.find_plugins_dir(), model_name+".py")
         kernel_module = generate.load_kernel_module(name)
-        self.model_parameters = modelinfo.make_parameter_table(getattr(kernel_module, 'parameters', []))
+
+        if hasattr(kernel_module, 'parameters'):
+            # built-in and custom models
+            self.model_parameters = modelinfo.make_parameter_table(getattr(kernel_module, 'parameters', []))
+
+        elif hasattr(kernel_module, 'model_info'):
+            # for sum/multiply models
+            self.model_parameters = kernel_module.model_info.parameters
+
+        elif hasattr(kernel_module, 'Model') and hasattr(kernel_module.Model, "_model_info"):
+            # this probably won't work if there's no model_info, but just in case
+            self.model_parameters = kernel_module.Model._model_info.parameters
+        else:
+            # no parameters - default to blank table
+            msg = "No parameters found in model '{}'.".format(model_name)
+            logger.warning(msg)
+            self.model_parameters = modelinfo.ParameterTable([])
 
         # Instantiate the current sasmodel