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

Timestamp:

Mar 9, 2015 1: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/lamellarCailleHG.py (modified) (2 diffs)

sasmodels/models/lamellarCailleHG.py

@@ -79 +79 @@
 title = "Random lamellar sheet with Caille structure factor"
 description = """\
-        [Random lamellar phase with Caille  structure factor]
+    [Random lamellar phase with Caille  structure factor]
         randomly oriented stacks of infinite sheets
-                with Caille S(Q), having polydisperse spacing.
-                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
+        with Caille S(Q), having polydisperse spacing.
+        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",  10, [0, inf], "volume",
-      "Tail thickness" ],
-    [ "head_length", "Ang",  2, [0, inf], "volume",
-      "head thickness" ],
-    [ "Nlayers", "",  30, [0, inf], "",
-      "Number of layers" ],
-    [ "spacing", "Ang", 40., [0.0,inf], "volume",
-      "d-spacing of Caille S(Q)" ],
-    [ "Caille_parameter", "", 0.001, [0.0,0.8], "",
-      "Caille parameter" ],
-    [ "sld", "1e-6/Ang^2", 0.4, [-inf,inf], "",
-      "Tail scattering length density" ],
-    [ "head_sld", "1e-6/Ang^2", 2.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" ],
+              [ "tail_length", "Ang",  10, [0, inf], "volume",
+                "Tail thickness" ],
+              [ "head_length", "Ang",  2, [0, inf], "volume",
+                "head thickness" ],
+              [ "Nlayers", "",  30, [0, inf], "",
+                "Number of layers" ],
+              [ "spacing", "Ang", 40., [0.0,inf], "volume",
+                "d-spacing of Caille S(Q)" ],
+              [ "Caille_parameter", "", 0.001, [0.0,0.8], "",
+                "Caille parameter" ],
+              [ "sld", "1e-6/Ang^2", 0.4, [-inf,inf], "",
+                "Tail scattering length density" ],
+              [ "head_sld", "1e-6/Ang^2", 2.0, [-inf,inf], "",
+                "Head scattering length density" ],
+              [ "solvent_sld", "1e-6/Ang^2", 6, [-inf,inf], "",
+                "Solvent scattering length density" ],
     ]
 
@@ -128 +128 @@
 
 demo = dict(
-        scale=1, background=0,
-        Nlayers=20,
-        spacing=200., Caille_parameter=0.05,
-        tail_length=15,head_length=10,
-        #sld=-1, head_sld=4.0, solvent_sld=6.0,
-        sld=-1, head_sld=4.1, solvent_sld=6.0,
-        tail_length_pd= 0.1, tail_length_pd_n=20,
-        head_length_pd= 0.05, head_length_pd_n=30,
-        spacing_pd= 0.2, spacing_pd_n=40
-   )
+            scale=1, background=0,
+            Nlayers=20,
+            spacing=200., Caille_parameter=0.05,
+            tail_length=15,head_length=10,
+            #sld=-1, head_sld=4.0, solvent_sld=6.0,
+            sld=-1, head_sld=4.1, solvent_sld=6.0,
+            tail_length_pd= 0.1, tail_length_pd_n=20,
+            head_length_pd= 0.05, head_length_pd_n=30,
+            spacing_pd= 0.2, spacing_pd_n=40
+           )
 
 oldname = 'LamellarPSHGModel'