Changeset 93cac17 in sasmodels for sasmodels/product.py

Timestamp:

Mar 29, 2019 4:43:48 PM (5 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

ticket-1257-vesicle-product

Children:

7eb2a4d

Parents:

89dba62 (diff), 065d77d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ticket_822_v5_unit_tests' into ticket-1257-vesicle-product

File:

• sasmodels/product.py (modified) (3 diffs)

sasmodels/product.py

@@ -295 +295 @@
     The result may be an array or a float.
     """
+    # CRUFT: remove effective_radius once SasView 5.0 is released.
     if beta_mode:
         # TODO: 1. include calculated Q vector
@@ -304 +305 @@
             ("S_eff(Q)", 1 + (F**2 / Fsq)*(S-1)),
             ("effective_radius", radius_effective),
+            ("radius_effective", radius_effective),
             # ("I(Q)", scale*(Fsq + (F**2)*(S-1)) + bg),
         ))
@@ -311 +313 @@
             ("S(Q)", S),
             ("effective_radius", radius_effective),
+            ("radius_effective", radius_effective),
         ))
     return parts