Changes in sasmodels/sasview_model.py [9c1a59c:3bcb88c] in sasmodels
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/sasview_model.py
r9c1a59c r3bcb88c 565 565 parameters = self._model_info.parameters 566 566 pairs = [self._get_weights(p) for p in parameters.call_parameters] 567 #weights.plot_weights(self._model_info, pairs)568 567 call_details, values, is_magnetic = make_kernel_args(calculator, pairs) 569 568 #call_details.show() … … 619 618 # remember them is kind of funky. 620 619 # Note: can't seem to get disperser parameters from sasview 621 # (1) Could create a sasview model that has not yet been620 # (1) Could create a sasview model that has not yet # been 622 621 # converted, assign the disperser to one of its polydisperse 623 622 # parameters, then retrieve the disperser parameters from the 624 # sasview model. 625 # (2) Could write a disperser parameter retriever in sasview.626 # (3) Could modify sasview to use sasmodels.weightsdispersers.623 # sasview model. (2) Could write a disperser parameter retriever 624 # in sasview. (3) Could modify sasview to use sasmodels.weights 625 # dispersers. 627 626 # For now, rely on the fact that the sasview only ever uses 628 627 # new dispersers in the set_dispersion call and create a new 629 628 # one instead of trying to assign parameters. 629 dispersion = weights.MODELS[dispersion.type]() 630 630 self.dispersion[parameter] = dispersion.get_pars() 631 631 else: … … 658 658 elif par.polydisperse: 659 659 dis = self.dispersion[par.name] 660 if dis['type'] == 'array': 661 value, weight = dis['values'], dis['weights'] 662 else: 663 value, weight = weights.get_weights( 664 dis['type'], dis['npts'], dis['width'], dis['nsigmas'], 665 self.params[par.name], par.limits, par.relative_pd) 660 value, weight = weights.get_weights( 661 dis['type'], dis['npts'], dis['width'], dis['nsigmas'], 662 self.params[par.name], par.limits, par.relative_pd) 666 663 return value, weight / np.sum(weight) 667 664 else:
Note: See TracChangeset
for help on using the changeset viewer.