Changeset 8136e09 in sasview

Timestamp:

Sep 7, 2018 9:28:15 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:

01b4877

Parents:

73665a8

Message:

support for pars injected by sasmodels.product (e.g. for beta approx. flag)

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (1 diff)

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

@@ -2097 +2097 @@
                 FittingUtilities.markParameterDisabled(self._model_model, row_num)
 
+        # grab list of params injected by sasmodels.product
+        # (only supporting sasmodels master until ESS_GUI merge!!!)
+        num_p_params = len(form_kernel._model_info.parameters.kernel_parameters)
+        num_s_params = len(structure_kernel._model_info.parameters.kernel_parameters)
+        product_params = modelinfo.ParameterTable(
+                self.kernel_module._model_info.parameters.kernel_parameters[num_p_params+num_s_params-1:])
+        product_rows = FittingUtilities.addSimpleParametersToModel(product_params, self.is2D)
+
+        # product params should go at the top of the list, below scale & background
+        row_num = 2
+        for row in product_rows:
+            self._model_model.insertRow(row_num, row)
+            row_num += 1
+
         # Update the counter used for multishell display
         self._last_model_row = self._model_model.rowCount()