Changeset 5d1440e1 in sasview


Ignore:
Timestamp:
Oct 24, 2017 9:37:57 AM (5 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:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

    rdef64a0 r5d1440e1  
    1313from PyQt4 import QtWebKit 
    1414 
     15from sasmodels import product 
    1516from sasmodels import generate 
    1617from sasmodels import modelinfo 
     
    12621263        structure_module = generate.load_kernel_module(structure_factor) 
    12631264        structure_parameters = modelinfo.make_parameter_table(getattr(structure_module, 'parameters', [])) 
     1265        structure_kernel = self.models[structure_factor]() 
     1266 
     1267        self.kernel_module._model_info = product.make_product_info(self.kernel_module._model_info, structure_kernel._model_info) 
    12641268 
    12651269        new_rows = FittingUtilities.addSimpleParametersToModel(structure_parameters, self.is2D) 
Note: See TracChangeset for help on using the changeset viewer.