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

Timestamp:

Mar 18, 2016 7: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_paracrystal.py (moved) (moved from sasmodels/models/lamellarPC.py) (5 diffs)

sasmodels/models/lamellar_stack_paracrystal.py

@@ -16 +16 @@
   *not* the total excluded volume of the paracrystal),
 
-- *sld* $-$ *solvent_sld* is the contrast $\Delta \rho$,
+- *sld* $-$ *sld_solvent* is the contrast $\Delta \rho$,
 
 - *thickness* is the layer thickness $t$,
@@ -36 +36 @@
 
 The form factor of the bilayer is approximated as the cross section of an
-infinite, planar bilayer of thickness $t$
+infinite, planar bilayer of thickness $t$ (compare the equations for the
+lamellar model).
 
 .. math::
@@ -94 +95 @@
 from numpy import inf
 
-name = "lamellarPC"
+name = "lamellar_stack_paracrystal"
 title = "Random lamellar sheet with paracrystal structure factor"
 description = """\
@@ -120 +121 @@
               ["sld", "1e-6/Ang^2", 1.0, [-inf, inf], "",
                "layer scattering length density"],
-              ["solvent_sld", "1e-6/Ang^2", 6.34, [-inf, inf], "",
+              ["sld_solvent", "1e-6/Ang^2", 6.34, [-inf, inf], "",
                "Solvent scattering length density"],
              ]
 
 
-source = ["lamellarPC_kernel.c"]
+source = ["lamellar_stack_paracrystal_kernel.c"]
 
 form_volume = """
@@ -140 +141 @@
 demo = dict(scale=1, background=0,
             thickness=33, Nlayers=20, spacing=250, spacing_polydisp=0.2,
-            sld=1.0, solvent_sld=6.34,
+            sld=1.0, sld_solvent=6.34,
             thickness_pd=0.2, thickness_pd_n=40)
 
 oldname = 'LamellarPCrystalModel'
 oldpars = dict(spacing_polydisp='pd_spacing', sld='sld_layer',
-               solvent_sld='sld_solvent')
+               sld_solvent='sld_solvent')
 #
 tests = [
         [ {'scale': 1.0, 'background' : 0.0, 'thickness' : 33.,'Nlayers' : 20.0, 'spacing' : 250., 'spacing_polydisp' : 0.2,
-            'sld' : 1.0, 'solvent_sld' : 6.34,
+            'sld' : 1.0, 'sld_solvent' : 6.34,
             'thickness_pd' : 0.0, 'thickness_pd_n' : 40 }, [0.001, 0.215268], [21829.3, 0.00487686]]
         ]
+# ADDED by: RKH  ON: 18Mar2016  converted from sasview previously, now renaming everything & sorting the docs