Changeset da1c8d1 in sasmodels

Timestamp:

Sep 4, 2018 9:38:51 AM (6 years ago)

Author:

butler

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

eb3eb38

Parents:

992299c

Message:

remove VR from cs_shpere and cs_cylinder

Tested that unit tests pass and then P*Q has not been affected

Location:

sasmodels/models

Files:

• core_shell_cylinder.py (modified) (1 diff)
• core_shell_sphere.py (modified) (2 diffs)

sasmodels/models/core_shell_cylinder.py

@@ -130 +130 @@
     Returns the effective radius used in the S*P calculation
     """
+    print("radius")
     radius = radius + thickness
     length = length + 2 * thickness
     ddd = 0.75 * radius * (2 * radius * length + (length + radius) * (length + pi * radius))
     return 0.5 * (ddd) ** (1. / 3.)
-
-def VR(radius, thickness, length):
-    """
-    Returns volume ratio
-    """
-    whole = pi * (radius + thickness) ** 2 * (length + 2 * thickness)
-    core = pi * radius ** 2 * length
-    return whole, whole - core
 
 def random():

sasmodels/models/core_shell_sphere.py

@@ -89 +89 @@
     return radius + thickness
 
-def VR(radius, thickness):
-    """
-        Volume ratio
-        @param radius: core radius
-        @param thickness: shell thickness
-    """
-    return (1, 1)
-    whole = 4.0/3.0 * pi * (radius + thickness)**3
-    core = 4.0/3.0 * pi * radius**3
-    return whole, whole - core
-
 def random():
     outer_radius = 10**np.random.uniform(1.3, 4.3)
@@ -114 +103 @@
 tests = [
     [{'radius': 20.0, 'thickness': 10.0}, 'ER', 30.0],
-    # TODO: VR test suppressed until we sort out new product model
-    # and determine what to do with volume ratio.
-    #[{'radius': 20.0, 'thickness': 10.0}, 'VR', 0.703703704],
 
     # The SasView test result was 0.00169, with a background of 0.001