Changeset 110f69c in sasmodels for sasmodels/details.py
- Timestamp:
- Nov 28, 2017 11:17:57 AM (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:
- e65c3ba
- Parents:
- 167d0f1
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/details.py
rce99754 r110f69c 23 23 # CRUFT: np.meshgrid requires multiple vectors 24 24 def meshgrid(*args): 25 """See docs from a recent version of numpy""" 25 26 if len(args) > 1: 26 27 return np.meshgrid(*args) … … 231 232 npars = kernel.info.parameters.npars 232 233 nvalues = kernel.info.parameters.nvalues 233 scalars = [value for value, dispersity,weight in mesh]234 scalars = [value for value, _dispersity, _weight in mesh] 234 235 # skipping scale and background when building values and weights 235 values, dispersity, weights = zip(*mesh[2:npars+2]) if npars else ((), (), ())236 _values, dispersity, weights = zip(*mesh[2:npars+2]) if npars else ((), (), ()) 236 237 #weights = correct_theta_weights(kernel.info.parameters, dispersity, weights) 237 238 length = np.array([len(w) for w in weights]) … … 287 288 mag = values[parameters.nvalues-3*parameters.nmagnetic:parameters.nvalues] 288 289 mag = mag.reshape(-1, 3) 289 scale = mag[:, 0]290 scale = mag[:, 0] 290 291 if np.any(scale): 291 292 theta, phi = radians(mag[:, 1]), radians(mag[:, 2])
Note: See TracChangeset
for help on using the changeset viewer.