Changeset 49da079 in sasmodels

Timestamp:

Mar 21, 2016 5:53:21 AM (9 years ago)

Author:

richardh

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:

5430333

Parents:

1e9a108

Message:

sld name changes, hide experimental spherepy.py from docs by rename to _spherepy.py

Location:

sasmodels/models

Files:

• _spherepy.py (moved) (moved from sasmodels/models/spherepy.py) (6 diffs)
• sphere.py (modified) (6 diffs)
• triaxial_ellipsoid.py (modified) (1 diff)

sasmodels/models/_spherepy.py

@@ -17 +17 @@
 where *scale* is a volume fraction, $V$ is the volume of the scatterer,
 $r$ is the radius of the sphere, *background* is the background level and
-*sld* and *solvent_sld* are the scattering length densities (SLDs) of the
+*sld* and *sld_solvent* are the scattering length densities (SLDs) of the
 scatterer and the solvent respectively.
 
@@ -47 +47 @@
 from numpy import pi, inf, sin, cos, sqrt, log
 
-name = "sphere (python)"
-title = "Spheres with uniform scattering length density"
+name = " _sphere (python)"
+title = "PAK testing ideas for Spheres with uniform scattering length density"
 description = """\
-P(q)=(scale/V)*[3V(sld-solvent_sld)*(sin(qr)-qr cos(qr))
+P(q)=(scale/V)*[3V(sld-sld_solvent)*(sin(qr)-qr cos(qr))
                 /(qr)^3]^2 + background
     r: radius of sphere
     V: The volume of the scatter
     sld: the SLD of the sphere
-    solvent_sld: the SLD of the solvent
+    sld_solvent: the SLD of the solvent
 """
 category = "shape:sphere"
@@ -62 +62 @@
 parameters = [["sld", "1e-6/Ang^2", 1, [-inf, inf], "",
                "Layer scattering length density"],
-              ["solvent_sld", "1e-6/Ang^2", 6, [-inf, inf], "",
+              ["sld_solvent", "1e-6/Ang^2", 6, [-inf, inf], "",
                "Solvent scattering length density"],
               ["radius", "Ang", 50, [0, inf], "volume",
@@ -72 +72 @@
     return 1.333333333333333 * pi * radius ** 3
 
-def Iq(q, sld, solvent_sld, radius):
+def Iq(q, sld, sld_solvent, radius):
     #print "q",q
-    #print "sld,r",sld,solvent_sld,radius
+    #print "sld,r",sld,sld_solvent,radius
     qr = q * radius
     sn, cn = sin(qr), cos(qr)
@@ -85 +85 @@
     bes = 3 * (sn - qr * cn) / qr ** 3 # may be 0/0 but we fix that next line
     bes[qr == 0] = 1
-    fq = bes * (sld - solvent_sld) * form_volume(radius)
+    fq = bes * (sld - sld_solvent) * form_volume(radius)
     return 1.0e-4 * fq ** 2
 Iq.vectorized = True  # Iq accepts an array of q values
 
-def Iqxy(qx, qy, sld, solvent_sld, radius):
-    return Iq(sqrt(qx ** 2 + qy ** 2), sld, solvent_sld, radius)
+def Iqxy(qx, qy, sld, sld_solvent, radius):
+    return Iq(sqrt(qx ** 2 + qy ** 2), sld, sld_solvent, radius)
 Iqxy.vectorized = True  # Iqxy accepts arrays of qx, qy values
 
-def sesans(z, sld, solvent_sld, radius):
+def sesans(z, sld, sld_solvent, radius):
     """
     Calculate SESANS-correlation function for a solid sphere.
@@ -115 +115 @@
 
 demo = dict(scale=1, background=0,
-            sld=6, solvent_sld=1,
+            sld=6, sld_solvent=1,
             radius=120,
             radius_pd=.2, radius_pd_n=45)
 oldname = "SphereModel"
-oldpars = dict(sld='sldSph', solvent_sld='sldSolv', radius='radius')
+oldpars = dict(sld='sldSph', sld_solvent='sldSolv', radius='radius')

sasmodels/models/sphere.py

@@ -17 +17 @@
 where *scale* is a volume fraction, $V$ is the volume of the scatterer,
 $r$ is the radius of the sphere, *background* is the background level and
-*sld* and *solvent_sld* are the scattering length densities (SLDs) of the
+*sld* and *sld_solvent* are the scattering length densities (SLDs) of the
 scatterer and the solvent respectively.
 
@@ -49 +49 @@
 title = "Spheres with uniform scattering length density"
 description = """\
-P(q)=(scale/V)*[3V(sld-solvent_sld)*(sin(qr)-qr cos(qr))
+P(q)=(scale/V)*[3V(sld-sld_solvent)*(sin(qr)-qr cos(qr))
                 /(qr)^3]^2 + background
     r: radius of sphere
     V: The volume of the scatter
     sld: the SLD of the sphere
-    solvent_sld: the SLD of the solvent
+    sld_solvent: the SLD of the solvent
 """
 category = "shape:sphere"
@@ -61 +61 @@
 parameters = [["sld", "1e-6/Ang^2", 1, [-inf, inf], "",
                "Layer scattering length density"],
-              ["solvent_sld", "1e-6/Ang^2", 6, [-inf, inf], "",
+              ["sld_solvent", "1e-6/Ang^2", 6, [-inf, inf], "",
                "Solvent scattering length density"],
               ["radius", "Ang", 50, [0, inf], "volume",
@@ -76 +76 @@
 
 Iq = """
-    return sphere_form(q, radius, sld, solvent_sld);
+    return sphere_form(q, radius, sld, sld_solvent);
     """
 
@@ -82 +82 @@
     // never called since no orientation or magnetic parameters.
     //return -1.0;
-    return Iq(sqrt(qx*qx + qy*qy), sld, solvent_sld, radius);
+    return Iq(sqrt(qx*qx + qy*qy), sld, sld_solvent, radius);
     """
 
@@ -94 +94 @@
 
 demo = dict(scale=1, background=0,
-            sld=6, solvent_sld=1,
+            sld=6, sld_solvent=1,
             radius=120,
             radius_pd=.2, radius_pd_n=45)
 oldname = "SphereModel"
-oldpars = dict(sld='sldSph', solvent_sld='sldSolv', radius='radius')
+oldpars = dict(sld='sldSph', sld_solvent='sldSolv', radius='radius')

sasmodels/models/triaxial_ellipsoid.py

@@ -91 +91 @@
                "Solvent scattering length density"],
               ["req_minor", "Ang", 20, [0, inf], "volume",
-               "Minor equitorial radius"],
+               "Minor equatorial radius"],
               ["req_major", "Ang", 400, [0, inf], "volume",
                "Major equatorial radius"],