Changeset 77bfb5f in sasmodels

Timestamp:

Apr 13, 2017 9:52:23 AM (8 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:

eaa4458

Parents:

597878a

Message:

fix calculation of cos-weighted theta values so tests pass

File:

• sasmodels/details.py (modified) (2 diffs)

sasmodels/details.py

@@ -232 +232 @@
     nvalues = kernel.info.parameters.nvalues
     scalars = [(v[0] if len(v) else np.NaN) for v, w in pairs]
+    # skipping scale and background when building values and weights
     values, weights = zip(*pairs[2:npars+2]) if npars else ((), ())
     weights = correct_theta_weights(kernel.info.parameters, values, weights)
@@ -253 +254 @@
     evaluation strictly at the pole, which would otherwise send the weight to
     zero.
-    """
+
+    Note: values and weights do not include scale and background
+    """
+    # TODO: document code, explaining why scale and background are skipped
+    # given that we don't have scale and background in the list, we
+    # should be calling the variables something other than values and weights
+    # Apparently the parameters.theta_offset similarly skips scale and
+    # and background, so the indexing works out.
     if parameters.theta_offset >= 0:
-        index = parameters.theta_offset+len(parameters.COMMON)
+        index = parameters.theta_offset
         theta = values[index]
         theta_weight = np.minimum(cos(radians(theta)), 1e-6)
         # copy the weights list so we can update it
         weights = list(weights)
-        weights[index] = theta_weight*weights[index]
+        weights[index] = theta_weight*np.asarray(weights[index])
         weights = tuple(weights)
     return weights