Changeset b7d432f in sasmodels

Timestamp:

Mar 9, 2015 7:52:41 AM (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:

6c82120

Parents:

9f6f2f8

Message:

Clean up, and put back sanity in pylint.rc

Files:

• extra/pylint.rc (modified) (4 diffs)
• sasmodels/models/HayterMSAsq.py (modified) (2 diffs)

extra/pylint.rc

@@ -20 +20 @@
 # List of plugins (as comma separated values of python modules names) to load,
 # usually to register additional checkers.
-load-plugins=pylint_numpy,pylint_pyopencl
+#load-plugins=pylint_numpy,pylint_pyopencl
 
 # Use multiple processes to speed up Pylint.
@@ -60 +60 @@
 disable=
     multiple-statements,
-    global-statement,
     bare-except,
     broad-except,
-    bad-whitespace,
-    bad-continuation,
     too-many-statements,
     too-many-branches,
@@ -73 +70 @@
     unbalanced-tuple-unpacking,
     locally-disabled,
-    old-style-class,
 
 [REPORTS]
@@ -205 +201 @@
 
 # Maximum number of characters on a single line.
-#max-line-length=100
-max-line-length=80
+max-line-length=100
 
 # Regexp for a line that is allowed to be longer than the limit.

sasmodels/models/HayterMSAsq.py

@@ -50 +50 @@
 from numpy import pi, inf
 
-source=["HayterMSAsq_kernel.c"]
+source = ["HayterMSAsq_kernel.c"]
 
 name = "HayterMSAsq"
 title = "Hayter-Penfold MSA charged sphere interparticle S(Q) structure factor"
 description = """\
-        [Hayter-Penfold MSA charged sphere interparticle S(Q) structure factor]
+    [Hayter-Penfold MSA charged sphere interparticle S(Q) structure factor]
         Interparticle structure factor S(Q)for a charged hard spheres.
-        Routine takes absolute value of charge, use HardSphere if charge goes to zero.          
-                In sasview the effective radius will be calculated from the 
-                parameters used in P(Q).
+        Routine takes absolute value of charge, use HardSphere if charge goes to zero.
+        In sasview the effective radius will be calculated from the
+        parameters used in P(Q).
 """
+#             [ "name", "units", default, [lower, upper], "type", "description" ],
+parameters = [["effect_radius", "Ang", 20.75, [0, inf], "volume",
+               "effective radius of hard sphere"],
+              ["charge", "e", 19.0, [0, inf], "",
+               "charge on sphere (in electrons)"],
+              ["volfraction", "", 0.0192, [0, 0.74], "",
+               "volume fraction of spheres"],
+              ["temperature", "K", 318.16, [0, inf], "",
+               "temperature, in Kelvin, for Debye length calculation"],
+              ["saltconc", "M", 0.0, [-inf, inf], "",
+               "conc of salt, 1:1 electolyte, for Debye length"],
+              ["dielectconst", "", 71.08, [-inf, inf], "",
+               "dielectric constant of solvent (default water), for Debye length"],
+             ]
 
-parameters = [
-#   [ "name", "units", default, [lower, upper], "type",
-#     "description" ],
-    [ "effect_radius", "Ang",  20.75, [0, inf], "volume",
-      "effective radius of hard sphere" ],
-    [ "charge", "e",  19.0, [0, inf], "",
-      "charge on sphere (in electrons)" ],
-    [ "volfraction", "",  0.0192, [0, 0.74], "",
-      "volume fraction of spheres" ],
-    [ "temperature", "K", 318.16, [0, inf], "",
-      "temperature, in Kelvin, for Debye length calculation" ],
-    [ "saltconc", "M",  0.0, [-inf,inf], "",
-      "conc of salt, 1:1 electolyte, for Debye length" ],
-    [ "dielectconst", "",  71.08, [-inf,inf], "",
-      "dielectric constant of solvent (default water), for Debye length" ],
-    ]
-        
 # No volume normalization despite having a volume parameter
 # This should perhaps be volume normalized?
@@ -93 +90 @@
 oldname = 'HayterMSAStructure'
 oldpars = dict()
-demo = dict(effect_radius = 20.75,charge=19.0,volfraction = 0.0192,temperature=318.16,saltconc=0.0,dielectconst=71.08,effect_radius_pd = 0.1,effect_radius_pd_n = 40)
+demo = dict(effect_radius=20.75, charge=19.0, volfraction=0.0192, temperature=318.16, saltconc=0.0, dielectconst=71.08, effect_radius_pd=0.1, effect_radius_pd_n=40)