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

sasmodels/models/lamellarCaille.py

@@ -85 +85 @@
 category = "shape:lamellae"
 
-parameters = [
-#   [ "name", "units", default, [lower, upper], "type",
-#     "description" ],
-    [ "thickness", "Ang",  30.0, [0, inf], "volume",
-      "sheet thickness" ],
-    [ "Nlayers", "",  20, [0, inf], "",
-      "Number of layers" ],
-    [ "spacing", "Ang", 400., [0.0,inf], "volume",
-      "d-spacing of Caille S(Q)" ],
-    [ "Caille_parameter", "1/Ang^2", 0.1, [0.0,0.8], "",
-      "Caille parameter" ],
-    [ "sld", "1e-6/Ang^2", 6.3, [-inf,inf], "",
-      "layer scattering length density" ],
-    [ "solvent_sld", "1e-6/Ang^2", 1.0, [-inf,inf], "",
-      "Solvent scattering length density" ],
-    ]
+#             ["name", "units", default, [lower, upper], "type","description"],
+parameters = [["thickness", "Ang",  30.0, [0, inf], "volume", "sheet thickness"],
+              ["Nlayers", "",  20, [0, inf], "", "Number of layers"],
+              ["spacing", "Ang", 400., [0.0,inf], "volume", "d-spacing of Caille S(Q)"],
+              ["Caille_parameter", "1/Ang^2", 0.1, [0.0,0.8], "", "Caille parameter"],
+              ["sld", "1e-6/Ang^2", 6.3, [-inf,inf], "",
+               "layer scattering length density"],
+              ["solvent_sld", "1e-6/Ang^2", 1.0, [-inf,inf], "",
+               "Solvent scattering length density"],
+             ]
 
-source = [ "lamellarCaille_kernel.c"]
+source = ["lamellarCaille_kernel.c"]
 
 # No volume normalization despite having a volume parameter
@@ -117 +111 @@
 # VR defaults to 1.0
 
-demo = dict(
-        scale=1, background=0,
-                thickness=67.,Nlayers=3.75,spacing=200.,
-        Caille_parameter=0.268,sld=1.0, solvent_sld=6.34,
-                thickness_pd= 0.1, thickness_pd_n=100,
-                spacing_pd= 0.05, spacing_pd_n=40
-         )
+demo = dict(scale=1, background=0,
+            thickness=67.,Nlayers=3.75,spacing=200.,
+            Caille_parameter=0.268,sld=1.0, solvent_sld=6.34,
+            thickness_pd= 0.1, thickness_pd_n=100,
+            spacing_pd= 0.05, spacing_pd_n=40)
 
 oldname = 'LamellarPSModel'
-oldpars = dict(thickness='delta',Nlayers='N_plates',Caille_parameter='caille', sld='sld_bi',solvent_sld='sld_sol')
+oldpars = dict(thickness='delta', Nlayers='N_plates', Caille_parameter='caille',
+               sld='sld_bi',solvent_sld='sld_sol')