Changeset 42356c8 in sasmodels for sasmodels/models/unified_power_Rg.py

Timestamp:

Jul 21, 2016 2:09:17 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

32e3c9b

Parents:

d680a2b

Message:

label all sld parameters

File:

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

sasmodels/models/unified_power_Rg.py

@@ -67 +67 @@
 parameters = [
     ["level",     "",     1,      [0, 6], "", "Level number"],
-    ["Rg[level]", "Ang",  15.8,   [0, inf], "", "Radius of gyration"],
+    ["rg[level]", "Ang",  15.8,   [0, inf], "", "Radius of gyration"],
     ["power[level]", "",  4,      [-inf, inf], "", "Power"],
     ["B[level]",  "1/cm", 4.5e-6, [-inf, inf], "", ""],
@@ -73 +73 @@
     ]
 
-def Iq(q, level, Rg, power, B, G):
+def Iq(q, level, rg, power, B, G):
     ilevel = int(level)
     if ilevel == 0:
@@ -80 +80 @@
     result = np.zeros_like(q)
     for i in range(ilevel):
-        exp_now = exp(-(q*Rg[i])**2/3.)
-        pow_now = (erf(q*Rg[i]/sqrt(6.))**3/q)**power[i]
-        exp_next = exp(-(q*Rg[i+1])**2/3.) if i < ilevel-1 else 1.
+        exp_now = exp(-(q*rg[i])**2/3.)
+        pow_now = (erf(q*rg[i]/sqrt(6.))**3/q)**power[i]
+        exp_next = exp(-(q*rg[i+1])**2/3.) if i < ilevel-1 else 1.
         result += G[i]*exp_now + B[i]*exp_next*pow_now
     result[q==0] = np.sum(G[:ilevel])
@@ -90 +90 @@
 demo = dict(
     level=2,
-    Rg=[15.8, 21],
+    rg=[15.8, 21],
     power=[4, 2],
     B=[4.5e-6, 0.0006],