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

sasmodels/models/lamellarPC.py

@@ -72 +72 @@
 title = "Random lamellar sheet with paracrystal structure factor"
 description = """\
-        [Random lamellar phase with paracrystal structure factor]
+    [Random lamellar phase with paracrystal structure factor]
         randomly oriented stacks of infinite sheets
-                with paracrytal S(Q), having polydisperse spacing.
-        sld = sheet scattering length density
-                sld_solvent = solvent scattering length density
-                background = incoherent background
-                scale = scale factor
+        with paracrytal S(Q), having polydisperse spacing.
+        sld = sheet 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" ],
-    [ "thickness", "Ang",  33.0, [0, inf], "volume",
-      "sheet thickness" ],
-    [ "Nlayers", "",  20, [0, inf], "",
-      "Number of layers" ],
-    [ "spacing", "Ang", 250., [0.0,inf], "",
-      "d-spacing of paracrystal stack" ],
-    [ "spacing_polydisp", "Ang", 0.0, [0.0,inf], "",
-      "d-spacing of paracrystal stack" ],
-    [ "sld", "1e-6/Ang^2", 1.0, [-inf,inf], "",
-      "layer scattering length density" ],
-    [ "solvent_sld", "1e-6/Ang^2", 6.34, [-inf,inf], "",
-      "Solvent scattering length density" ],
-    ]
+#             ["name", "units", default, [lower, upper], "type","description"],
+parameters = [["thickness", "Ang", 33.0, [0, inf], "volume",
+               "sheet thickness"],
+              ["Nlayers", "", 20, [0, inf], "",
+               "Number of layers"],
+              ["spacing", "Ang", 250., [0.0, inf], "",
+               "d-spacing of paracrystal stack"],
+              ["spacing_polydisp", "Ang", 0.0, [0.0, inf], "",
+               "d-spacing of paracrystal stack"],
+              ["sld", "1e-6/Ang^2", 1.0, [-inf, inf], "",
+               "layer scattering length density"],
+              ["solvent_sld", "1e-6/Ang^2", 6.34, [-inf, inf], "",
+               "Solvent scattering length density"],
+             ]
 
 
-source = [ "lamellarPC_kernel.c"]
+source = ["lamellarPC_kernel.c"]
 
 form_volume = """
@@ -113 +111 @@
 # VR defaults to 1.0
 
-demo = dict(
-    scale=1, background=0,
-    thickness=33, Nlayers=20, spacing=250, spacing_polydisp=0.2,
-    sld=1.0, solvent_sld=6.34,
-    thickness_pd= 0.2, thickness_pd_n=40
-    )
+demo = dict(scale=1, background=0,
+            thickness=33, Nlayers=20, spacing=250, spacing_polydisp=0.2,
+            sld=1.0, solvent_sld=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'
-    )
-
-
+oldpars = dict(spacing_polydisp='pd_spacing', sld='sld_layer',
+               solvent_sld='sld_solvent')