Changeset 8136e09 in sasview


Ignore:
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:
1 edited

Legend:

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

    r73665a8 r8136e09  
    20972097                FittingUtilities.markParameterDisabled(self._model_model, row_num) 
    20982098 
     2099        # grab list of params injected by sasmodels.product 
     2100        # (only supporting sasmodels master until ESS_GUI merge!!!) 
     2101        num_p_params = len(form_kernel._model_info.parameters.kernel_parameters) 
     2102        num_s_params = len(structure_kernel._model_info.parameters.kernel_parameters) 
     2103        product_params = modelinfo.ParameterTable( 
     2104                self.kernel_module._model_info.parameters.kernel_parameters[num_p_params+num_s_params-1:]) 
     2105        product_rows = FittingUtilities.addSimpleParametersToModel(product_params, self.is2D) 
     2106 
     2107        # product params should go at the top of the list, below scale & background 
     2108        row_num = 2 
     2109        for row in product_rows: 
     2110            self._model_model.insertRow(row_num, row) 
     2111            row_num += 1 
     2112 
    20992113        # Update the counter used for multishell display 
    21002114        self._last_model_row = self._model_model.rowCount() 
Note: See TracChangeset for help on using the changeset viewer.