Changeset 6ab4ed8 in sasmodels for sasmodels/models/lamellar_stack_caille.py

Timestamp:

Mar 18, 2016 9:55:38 AM (8 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:

5bfb213

Parents:

5852c86

Message:

renamed params etc in more lamellar models

File:

• sasmodels/models/lamellar_stack_caille.py (moved) (moved from sasmodels/models/lamellarCaille.py) (5 diffs)

sasmodels/models/lamellar_stack_caille.py

@@ -11 +11 @@
 .. math::
 
-    I(q) = 2\pi \frac{P(q)S(q)}{\delta q^2}
+    I(q) = 2\pi \frac{P(q)S(q)}{q^2\delta }
 
 The form factor is
@@ -70 +70 @@
 from numpy import inf
 
-name = "lamellarPS"
+name = "lamellar_stack_caille"
 title = "Random lamellar sheet with Caille structure factor"
 description = """\
@@ -92 +92 @@
     ["Caille_parameter", "1/Ang^2",    0.1, [0.0,0.8],  "",       "Caille parameter"],
     ["sld",              "1e-6/Ang^2", 6.3, [-inf,inf], "",       "layer scattering length density"],
-    ["solvent_sld",      "1e-6/Ang^2", 1.0, [-inf,inf], "",       "Solvent scattering length density"],
+    ["sld_solvent",      "1e-6/Ang^2", 1.0, [-inf,inf], "",       "Solvent scattering length density"],
     ]
 # pylint: enable=bad-whitespace, line-too-long
 
-source = ["lamellarCaille_kernel.c"]
+source = ["lamellar_stack_caille_kernel.c"]
 
 # No volume normalization despite having a volume parameter
@@ -113 +113 @@
 demo = dict(scale=1, background=0,
             thickness=67., Nlayers=3.75, spacing=200.,
-            Caille_parameter=0.268, sld=1.0, solvent_sld=6.34,
+            Caille_parameter=0.268, sld=1.0, sld_solvent=6.34,
             thickness_pd=0.1, thickness_pd_n=100,
             spacing_pd=0.05, spacing_pd_n=40)
@@ -120 +120 @@
 oldpars = dict(thickness='delta', Nlayers='N_plates',
                Caille_parameter='caille',
-               sld='sld_bi', solvent_sld='sld_sol')
+               sld='sld_bi', sld_solvent='sld_sol')
 #
 tests = [
     [{'scale': 1.0, 'background': 0.0, 'thickness': 30., 'Nlayers': 20.0,
       'spacing': 400., 'Caille_parameter': 0.1, 'sld': 6.3,
-      'solvent_sld': 1.0, 'thickness_pd': 0.0, 'spacing_pd': 0.0},
+      'sld_solvent': 1.0, 'thickness_pd': 0.0, 'spacing_pd': 0.0},
      [0.001], [28895.13397]]
     ]
+# ADDED by: RKH  ON: 18Mar2016  converted from sasview previously, now renaming everything & sorting the docs