Changeset 5024a56 in sasmodels

Timestamp:

Oct 30, 2018 6:37:19 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:

99658f6

Parents:

23df833

Message:

Make sure that the label radius_effective_mode is used throughout

Location:

sasmodels

Files:

• direct_model.py (modified) (2 diffs)
• model_test.py (modified) (1 diff)
• models/cylinder.py (modified) (1 diff)
• product.py (modified) (3 diffs)
• sasview_model.py (modified) (1 diff)

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])

sasmodels/model_test.py

@@ -386 +386 @@
     for par in sorted(pars.keys()):
         # special handling of R_eff mode, which is not a usual parameter
-        if par == 'radius_effective_type':
+        if par == product.RADIUS_MODE_ID:
             continue
         parts = par.split('_pd')

sasmodels/models/cylinder.py

@@ -185 +185 @@
 radius, length = parameters[2][2], parameters[3][2]
 tests.extend([
-    ({'radius_effective_type': 0}, 0.1, None, None, 0., pi*radius**2*length, 1.0),
-    ({'radius_effective_type': 1}, 0.1, None, None, (0.75*radius**2*length)**(1./3.), None, None),
-    ({'radius_effective_type': 2}, 0.1, None, None, radius, None, None),
-    ({'radius_effective_type': 3}, 0.1, None, None, length/2., None, None),
-    ({'radius_effective_type': 4}, 0.1, None, None, min(radius, length/2.), None, None),
-    ({'radius_effective_type': 5}, 0.1, None, None, max(radius, length/2.), None, None),
-    ({'radius_effective_type': 6}, 0.1, None, None, np.sqrt(4*radius**2 + length**2)/2., None, None),
+    ({'radius_effective_mode': 0}, 0.1, None, None, 0., pi*radius**2*length, 1.0),
+    ({'radius_effective_mode': 1}, 0.1, None, None, (0.75*radius**2*length)**(1./3.), None, None),
+    ({'radius_effective_mode': 2}, 0.1, None, None, radius, None, None),
+    ({'radius_effective_mode': 3}, 0.1, None, None, length/2., None, None),
+    ({'radius_effective_mode': 4}, 0.1, None, None, min(radius, length/2.), None, None),
+    ({'radius_effective_mode': 5}, 0.1, None, None, max(radius, length/2.), None, None),
+    ({'radius_effective_mode': 6}, 0.1, None, None, np.sqrt(4*radius**2 + length**2)/2., None, None),
 ])
 del radius, length

sasmodels/product.py

@@ -37 +37 @@
 #]
 
+STRUCTURE_MODE_ID = "structure_factor_mode"
+RADIUS_MODE_ID = "radius_effective_mode"
 RADIUS_ID = "radius_effective"
 VOLFRAC_ID = "volfraction"
@@ -43 +45 @@
     if p_info.have_Fq:
         par = parse_parameter(
-                "structure_factor_mode",
+                STRUCTURE_MODE_ID,
                 "",
                 0,
@@ -52 +54 @@
     if p_info.effective_radius_type is not None:
         par = parse_parameter(
-                "radius_effective_mode",
+                RADIUS_MODE_ID,
                 "",
                 0,

sasmodels/sasview_model.py

@@ -859 +859 @@
     P = _make_standard_model('cylinder')()
     model = MultiplicationModel(P, S)
-    model.setParam('radius_effective_mode', 1.0)
+    model.setParam(product.RADIUS_MODE_ID, 1.0)
     value = model.evalDistribution([0.1, 0.1])
     if np.isnan(value):