Changeset a807206 in sasmodels for sasmodels/models/parallelepiped.py

Timestamp:

Sep 30, 2016 10:42:06 PM (8 years ago)

Author:

butler

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

caddb14, 5031ca3

Parents:

2222134

Message:

updating more parameter names addressing #649

File:

• sasmodels/models/parallelepiped.py (modified) (4 diffs)

sasmodels/models/parallelepiped.py

@@ -190 +190 @@
               ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "sld",
                "Solvent scattering length density"],
-              ["a_side", "Ang", 35, [0, inf], "volume",
+              ["length_a", "Ang", 35, [0, inf], "volume",
                "Shorter side of the parallelepiped"],
-              ["b_side", "Ang", 75, [0, inf], "volume",
+              ["length_b", "Ang", 75, [0, inf], "volume",
                "Second side of the parallelepiped"],
-              ["c_side", "Ang", 400, [0, inf], "volume",
+              ["length_c", "Ang", 400, [0, inf], "volume",
                "Larger side of the parallelepiped"],
               ["theta", "degrees", 60, [-inf, inf], "orientation",
@@ -206 +206 @@
 source = ["lib/gauss76.c", "parallelepiped.c"]
 
-def ER(a_side, b_side, c_side):
+def ER(length_a, length_b, length_c):
     """
         Return effective radius (ER) for P(q)*S(q)
@@ -212 +212 @@
 
     # surface average radius (rough approximation)
-    surf_rad = sqrt(a_side * b_side / pi)
-
-    ddd = 0.75 * surf_rad * (2 * surf_rad * c_side + (c_side + surf_rad) * (c_side + pi * surf_rad))
+    surf_rad = sqrt(length_a * length_b / pi)
+
+    ddd = 0.75 * surf_rad * (2 * surf_rad * length_c + (length_c + surf_rad) * (length_c + pi * surf_rad))
     return 0.5 * (ddd) ** (1. / 3.)
 
@@ -222 +222 @@
 demo = dict(scale=1, background=0,
             sld=6.3e-6, sld_solvent=1.0e-6,
-            a_side=35, b_side=75, c_side=400,
+            length_a=35, length_b=75, length_c=400,
             theta=45, phi=30, psi=15,
-            a_side_pd=0.1, a_side_pd_n=10,
-            b_side_pd=0.1, b_side_pd_n=1,
-            c_side_pd=0.1, c_side_pd_n=1,
+            length_a_pd=0.1, length_a_pd_n=10,
+            length_b_pd=0.1, length_b_pd_n=1,
+            length_c_pd=0.1, length_c_pd_n=1,
             theta_pd=10, theta_pd_n=1,
             phi_pd=10, phi_pd_n=1,