Changeset 3e428ec in sasmodels for sasmodels/models/lamellar.py

Timestamp:

Mar 9, 2015 3:14:03 PM (9 years ago)

Author:

Doucet, Mathieu <doucetm@…>

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:

ddfe69c

Parents:

485aee2

Message:

Cleaning up

File:

• sasmodels/models/lamellar.py (modified) (2 diffs)

sasmodels/models/lamellar.py

@@ -52 +52 @@
 title = "Lyotropic lamellar phase with uniform SLD and random distribution"
 description = """\
-        [Dilute Lamellar Form Factor](from a lyotropic lamellar phase)
-                I(q)= 2*pi*P(q)/(delta *q^(2)), where
-                P(q)=2*(contrast/q)^(2)*(1-cos(q*delta))^(2))
-                thickness = layer thickness
-                sld = layer scattering length density
-                sld_solvent = solvent scattering length density
-                background = incoherent background
-                scale = scale factor
+    [Dilute Lamellar Form Factor](from a lyotropic lamellar phase)
+        I(q)= 2*pi*P(q)/(delta *q^(2)), where
+        P(q)=2*(contrast/q)^(2)*(1-cos(q*delta))^(2))
+        thickness = layer thickness
+        sld = layer scattering length density
+        sld_solvent = solvent scattering length density
+        background = incoherent background
+        scale = scale factor
 """
 category = "shape:lamellae"
 
-parameters = [
-#   [ "name", "units", default, [lower, upper], "type",
-#     "description" ],
-    [ "sld", "1e-6/Ang^2", 1, [-inf,inf], "",
-      "Layer scattering length density" ],
-    [ "solvent_sld", "1e-6/Ang^2", 6, [-inf,inf], "",
-      "Solvent scattering length density" ],
-    [ "thickness", "Ang",  50, [0, inf], "volume",
-      "Bilayer thickness" ],
-    ]
+#             ["name", "units", default, [lower, upper], "type","description"],
+parameters = [["sld", "1e-6/Ang^2", 1, [-inf, inf], "",
+               "Layer scattering length density" ],
+              ["solvent_sld", "1e-6/Ang^2", 6, [-inf, inf], "",
+               "Solvent scattering length density" ],
+              ["thickness", "Ang", 50, [0, inf], "volume","Bilayer thickness" ],
+             ]
 
 
@@ -95 +92 @@
 # VR defaults to 1.0
 
-demo = dict(
-        scale=1, background=0,
-        sld=6, solvent_sld=1,
-        thickness=40,
-        thickness_pd= 0.2, thickness_pd_n=40,
-        )
+demo = dict(scale=1, background=0,
+            sld=6, solvent_sld=1,
+            thickness=40,
+            thickness_pd=0.2, thickness_pd_n=40)
 oldname = 'LamellarModel'
 oldpars = dict(sld='sld_bi', solvent_sld='sld_sol', thickness='bi_thick')