Changeset ce99754 in sasmodels for sasmodels/product.py

Timestamp:

Nov 2, 2017 3:44:10 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

17db833

Parents:

6aee3ab

Message:

make sure that nominal values get into the weight vector even when there is no pd so that pd loops are simpler

File:

• sasmodels/product.py (modified) (1 diff)

sasmodels/product.py

@@ -279 +279 @@
     weight = values[nvalues + call_details.num_weights: nvalues + 2*call_details.num_weights]
     npars = model_info.parameters.npars
-    pairs = [(value[offset:offset+length], weight[offset:offset+length])
+    # Note: changed from pairs ([v], [w]) to triples (p, [v], [w]), but the
+    # dispersion mesh code doesn't actually care about the nominal parameter
+    # value, p, so set it to None.
+    pairs = [(None, value[offset:offset+length], weight[offset:offset+length])
              for p, offset, length
              in zip(model_info.parameters.call_parameters[2:2+npars],