Changeset 32f87a5 in sasmodels for sasmodels/direct_model.py

Timestamp:

Oct 18, 2017 12:08:54 AM (7 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:

fbb9397

Parents:

8698a0d

Message:

update sasview wrapper with new way of handling orientation dispersity

File:

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

sasmodels/direct_model.py

@@ -141 +141 @@
     npts = values.get(parameter.name+'_pd_n', 0)
     width = values.get(parameter.name+'_pd', 0.0)
+    relative = parameter.relative_pd
     if npts == 0 or width == 0 or not active:
         # Note: orientation parameters have the viewing angle as the parameter
         # value and the jitter in the distribution, so be sure to set the
         # empty pd for orientation parameters to 0.
-        pd = [value if parameter.type != 'orientation' else 0.0], [1.0]
-    else:
-        relative = parameter.relative_pd
+        pd = [value if relative else 0.0], [1.0]
+    else:
         limits = parameter.limits
         disperser = values.get(parameter.name+'_pd_type', 'gaussian')