Changeset 5d1440e1 in sasview for src/sas/qtgui/Perspectives

Timestamp:

Oct 24, 2017 9:37:57 AM (7 years ago)

Author:

Tim Snow <tim.snow@…>

Branches:

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

Children:

c57ecca, fca1f50

Parents:

def64a0

Message:

Bugfix - Ticket SVCC-74

Structure factors can now be calculated by using the product routines in sasmodels

File:

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

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

@@ -13 +13 @@
 from PyQt4 import QtWebKit
 
+from sasmodels import product
 from sasmodels import generate
 from sasmodels import modelinfo
@@ -1262 +1263 @@
         structure_module = generate.load_kernel_module(structure_factor)
         structure_parameters = modelinfo.make_parameter_table(getattr(structure_module, 'parameters', []))
+        structure_kernel = self.models[structure_factor]()
+
+        self.kernel_module._model_info = product.make_product_info(self.kernel_module._model_info, structure_kernel._model_info)
 
         new_rows = FittingUtilities.addSimpleParametersToModel(structure_parameters, self.is2D)