Changeset 3eb6b90 in sasmodels

Timestamp:

Feb 18, 2016 1:16:50 PM (9 years ago)

Author:

mathieu

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:

94bd809

Parents:

04b0b30

Message:

Fix pylint

File:

• sasmodels/models/lamellarFFHG.py (modified) (3 diffs)

sasmodels/models/lamellarFFHG.py

@@ -68 +68 @@
 category = "shape:lamellae"
 
+# pylint: disable=bad-whitespace, line-too-long
 #             ["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"],
-             ]
+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"]]
+# pylint: enable=bad-whitespace, line-too-long
 
 # No volume normalization despite having a volume parameter
@@ -113 +109 @@
 
 demo = dict(scale=1, background=0,
-            tail_length=15,head_length=10,
+            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)
+            tail_length_pd=0.2, tail_length_pd_n=40,
+            head_length_pd=0.01, head_length_pd_n=40)
 
 oldname = 'LamellarFFHGModel'
@@ -122 +118 @@
                sld='sld_tail', head_sld='sld_head', solvent_sld='sld_solvent')
 #
-tests = [
-        [ {'scale': 1.0, 'background' : 0.0, 'tail_length' : 15.0, 'head_length' : 10.0,'sld' : 0.4,
-         'head_sld' : 3.0, 'solvent_sld' : 6.0, }, [0.001], [653143.9209]]
-        ]
-
-
+tests = [[{'scale': 1.0, 'background': 0.0, 'tail_length': 15.0, 'head_length': 10.0,
+           'sld': 0.4, 'head_sld': 3.0, 'solvent_sld': 6.0}, [0.001], [653143.9209]]]