Changeset 04972ea in sasview for src/sas/qtgui/Perspectives/Fitting/FittingWidget.py
- Timestamp:
- Aug 3, 2018 8:31:45 AM (6 years ago)
- 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:
- 97df8a9
- Parents:
- 8e2cd79 (diff), 46f59ba (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/Perspectives/Fitting/FittingWidget.py
r8e2cd79 r04972ea 14 14 from PyQt5 import QtWidgets 15 15 16 from sasmodels import product17 16 from sasmodels import generate 18 17 from sasmodels import modelinfo 19 18 from sasmodels.sasview_model import load_standard_models 19 from sasmodels.sasview_model import MultiplicationModel 20 20 from sasmodels.weights import MODELS as POLYDISPERSITY_MODELS 21 21 … … 1404 1404 param_dict = self.paramDictFromResults(res) 1405 1405 1406 if param_dict is None: 1407 return 1408 1406 1409 elapsed = result[1] 1407 1410 if self.calc_fit._interrupting: … … 1645 1648 return 1646 1649 1650 def iterateOverMagnetModel(func): 1651 """ 1652 Take func and throw it inside the magnet model row loop 1653 """ 1654 for row_i in range(self._magnet_model.rowCount()): 1655 func(row_i) 1656 1647 1657 def updateFittedValues(row): 1648 1658 # Utility function for main model update … … 1961 1971 structure_module = generate.load_kernel_module(structure_factor) 1962 1972 structure_parameters = modelinfo.make_parameter_table(getattr(structure_module, 'parameters', [])) 1973 1963 1974 structure_kernel = self.models[structure_factor]() 1964 1965 self.kernel_module._model_info = product.make_product_info(self.kernel_module._model_info, structure_kernel._model_info) 1975 form_kernel = self.kernel_module 1976 1977 self.kernel_module = MultiplicationModel(form_kernel, structure_kernel) 1966 1978 1967 1979 new_rows = FittingUtilities.addSimpleParametersToModel(structure_parameters, self.is2D) 1968 1980 for row in new_rows: 1969 1981 self._model_model.appendRow(row) 1982 # disable fitting of parameters not listed in self.kernel_module (probably radius_effective) 1983 if row[0].text() not in self.kernel_module.params.keys(): 1984 row_num = self._model_model.rowCount() - 1 1985 FittingUtilities.markParameterDisabled(self._model_model, row_num) 1986 1970 1987 # Update the counter used for multishell display 1971 1988 self._last_model_row = self._model_model.rowCount()
Note: See TracChangeset
for help on using the changeset viewer.