Changeset 32f87a5 in sasmodels for sasmodels/sasview_model.py
- Timestamp:
- Oct 17, 2017 10:08:54 PM (6 years ago)
- Branches:
- master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
- Children:
- fbb9397
- Parents:
- 8698a0d
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/sasview_model.py
r9f8ade1 r32f87a5 759 759 if par.name not in self.params: 760 760 if par.name == self.multiplicity_info.control: 761 return [self.multiplicity], [1.0]761 return self.multiplicity, [self.multiplicity], [1.0] 762 762 else: 763 763 # For hidden parameters use the default value. 764 value= self._model_info.parameters.defaults.get(par.name, np.NaN)765 return [ value], [1.0]764 default = self._model_info.parameters.defaults.get(par.name, np.NaN) 765 return [default], [1.0] 766 766 elif par.polydisperse: 767 value = self.params[par.name] 767 768 dis = self.dispersion[par.name] 768 769 if dis['type'] == 'array': 769 value, weight = dis['values'], dis['weights']770 dispersity, weight = dis['values'], dis['weights'] 770 771 else: 771 value, weight = weights.get_weights(772 dispersity, weight = weights.get_weights( 772 773 dis['type'], dis['npts'], dis['width'], dis['nsigmas'], 773 self.params[par.name], par.limits, par.relative_pd) 774 return value, weight / np.sum(weight) 775 else: 776 return [self.params[par.name]], [1.0] 774 value, par.limits, par.relative_pd) 775 return value, dispersity, weight 776 else: 777 value = self.params[par.name] 778 return value, [value if par.relative_pd else 0.0], [1.0] 777 779 778 780 def test_cylinder():
Note: See TracChangeset
for help on using the changeset viewer.