Changeset 5024a56 in sasmodels for sasmodels/direct_model.py

Timestamp:

Oct 30, 2018 4:37:19 PM (5 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:

99658f6

Parents:

23df833

Message:

Make sure that the label radius_effective_mode is used throughout

File:

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

sasmodels/direct_model.py

@@ -32 +32 @@
 from .details import make_kernel_args, dispersion_mesh
 from .modelinfo import DEFAULT_BACKGROUND
+from .product import RADIUS_MODE_ID
 
 # pylint: disable=unused-import
@@ -70 +71 @@
 
     For solid objects V_shell is equal to V_form and the volume ratio is 1.
-    """
-    R_eff_type = int(pars.pop('radius_effective_type', 1.0))
+
+    Use parameter *radius_effective_mode* to select the effective radius
+    calculation.
+    """
+    R_eff_type = int(pars.pop(RADIUS_MODE_ID, 1.0))
     mesh = get_mesh(calculator.info, pars, dim=calculator.dim, mono=mono)
     #print("pars", list(zip(*mesh))[0])