Changeset 5ef0633 in sasmodels

Timestamp:

Mar 9, 2015 2:32:53 PM (10 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:

485aee2

Parents:

2e35a40

Message:

update pylint.rc to match design

Files:

• extra/pylint.rc (modified) (1 diff)
• sasmodels/models/barbell.py (modified) (1 diff)

extra/pylint.rc

@@ -137 +137 @@
 
 # Regular expression matching correct constant names
-const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
+const-rgx=(([A-Za-z_][A-Za-z0-9_]*)|(__.*__))$
 
 # Naming hint for constant names

sasmodels/models/barbell.py

@@ -117 +117 @@
 description = """
         Calculates the scattering from a barbell-shaped cylinder. That is a sphereocylinder with spherical end caps that have a radius larger than that of the cylinder and the center of the end cap
-                radius lies outside of the cylinder.
-                Note: As the length of cylinder(bar) -->0,it becomes a dumbbell. And when rad_bar = rad_bell, it is a spherocylinder.
-                It must be that rad_bar <(=) rad_bell.
+        radius lies outside of the cylinder.
+        Note: As the length of cylinder(bar) -->0,it becomes a dumbbell. And when rad_bar = rad_bell, it is a spherocylinder.
+        It must be that rad_bar <(=) rad_bell.
 """
 category = "shape:cylinder"
 
-parameters = [
-#   [ "name", "units", default, [lower, upper], "type","description" ],
-    [ "sld", "1e-6/Ang^2", 4, [-inf,inf], "", "Barbell scattering length density" ],
-    [ "solvent_sld", "1e-6/Ang^2", 1, [-inf,inf], "","Solvent scattering length density" ],
-    [ "bell_radius", "Ang",  40, [0, inf], "volume","Spherical bell radius" ],
-    [ "radius", "Ang",  20, [0, inf], "volume","Cylindrical bar radius" ],
-    [ "length", "Ang",  400, [0, inf], "volume","Cylinder bar length" ],
-    [ "theta", "degrees", 60, [-inf, inf], "orientation","In plane angle" ],
-    [ "phi", "degrees", 60, [-inf, inf], "orientation","Out of plane angle" ],
-    ]
+#             ["name", "units", default, [lower, upper], "type","description"],
+parameters = [["sld", "1e-6/Ang^2", 4, [-inf, inf], "", "Barbell scattering length density"],
+              ["solvent_sld", "1e-6/Ang^2", 1, [-inf, inf], "", "Solvent scattering length density"],
+              ["bell_radius", "Ang", 40, [0, inf], "volume", "Spherical bell radius"],
+              ["radius", "Ang", 20, [0, inf], "volume", "Cylindrical bar radius"],
+              ["length", "Ang", 400, [0, inf], "volume", "Cylinder bar length"],
+              ["theta", "degrees", 60, [-inf, inf], "orientation", "In plane angle"],
+              ["phi", "degrees", 60, [-inf, inf], "orientation", "Out of plane angle"],
+             ]
 
-source = [ "lib/J1.c", "lib/gauss76.c", "barbell.c" ]
+source = ["lib/J1.c", "lib/gauss76.c", "barbell.c"]
 
 # parameters for demo
-demo = dict(
-    scale=1, background=0,
-    sld=6, solvent_sld=1,
-    bell_radius = 40, radius=20, length=400,
-    theta=60, phi=60,
-    radius_pd=.2, radius_pd_n=5,
-    length_pd=.2,length_pd_n=5,
-    theta_pd=15, theta_pd_n=0,
-    phi_pd=15, phi_pd_n=0,
-    )
+demo = dict(scale=1, background=0,
+            sld=6, solvent_sld=1,
+            bell_radius=40, radius=20, length=400,
+            theta=60, phi=60,
+            radius_pd=.2, radius_pd_n=5,
+            length_pd=.2, length_pd_n=5,
+            theta_pd=15, theta_pd_n=0,
+            phi_pd=15, phi_pd_n=0,
+           )
 
 # For testing against the old sasview models, include the converted parameter
 # names and the target sasview model name.
-oldname='BarBellModel'
-oldpars=dict(sld='sld_barbell',
-             solvent_sld='sld_solv', bell_radius='rad_bell',
-             radius='rad_bar',length='len_bar')
+oldname = 'BarBellModel'
+oldpars = dict(sld='sld_barbell',
+               solvent_sld='sld_solv', bell_radius='rad_bell',
+               radius='rad_bar', length='len_bar')