Changeset 3e428ec in sasmodels for sasmodels/models/lamellarFFHG.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/lamellarFFHG.py (modified) (2 diffs)

sasmodels/models/lamellarFFHG.py

@@ -53 +53 @@
 title = "Random lamellar phase with Head Groups "
 description = """\
-        [Random lamellar phase with Head Groups]
-                I(q)= 2*pi*P(q)/(2(H+T)*q^(2)), where
-                P(q)= see manual
-                layer thickness =(H+T+T+H) = 2(Head+Tail)
-                sld = Tail scattering length density
-                sld_head = Head scattering length density
-                sld_solvent = solvent scattering length density
-                background = incoherent background
-                scale = scale factor
+    [Random lamellar phase with Head Groups]
+        I(q)= 2*pi*P(q)/(2(H+T)*q^(2)), where
+        P(q)= see manual
+        layer thickness =(H+T+T+H) = 2(Head+Tail)
+        sld = Tail scattering length density
+        sld_head = Head 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" ],
-    [ "tail_length", "Ang",  15, [0, inf], "volume",
-      "Tail thickness" ],
-    [ "head_length", "Ang",  10, [0, inf], "volume",
-      "head thickness" ],
-    [ "sld", "1e-6/Ang^2", 0.4, [-inf,inf], "",
-      "Tail scattering length density" ],
-    [ "head_sld", "1e-6/Ang^2", 3.0, [-inf,inf], "",
-      "Head scattering length density" ],
-    [ "solvent_sld", "1e-6/Ang^2", 6, [-inf,inf], "",
-      "Solvent scattering length density" ],
-    ]
+#             ["name", "units", default, [lower, upper], "type","description"],
+parameters = [["tail_length", "Ang",  15, [0, inf], "volume",
+               "Tail thickness"],
+              ["head_length", "Ang",  10, [0, inf], "volume",
+               "head thickness"],
+              ["sld", "1e-6/Ang^2", 0.4, [-inf,inf], "",
+               "Tail scattering length density"],
+              ["head_sld", "1e-6/Ang^2", 3.0, [-inf,inf], "",
+               "Head scattering length density"],
+              ["solvent_sld", "1e-6/Ang^2", 6, [-inf,inf], "",
+               "Solvent scattering length density"],
+             ]
 
 # No volume normalization despite having a volume parameter
@@ -111 +109 @@
 # VR defaults to 1.0
 
-demo = dict(
-    scale=1, background=0,
-    tail_length=15,head_length=10,
-    sld=0.4, head_sld=3.0, solvent_sld=6.0,
-    tail_length_pd= 0.2, tail_length_pd_n=40,
-    head_length_pd= 0.01, head_length_pd_n=40,
-    )
+demo = dict(scale=1, background=0,
+            tail_length=15,head_length=10,
+            sld=0.4, head_sld=3.0, solvent_sld=6.0,
+            tail_length_pd= 0.2, tail_length_pd_n=40,
+            head_length_pd= 0.01, head_length_pd_n=40)
 
 oldname = 'LamellarFFHGModel'