Changeset d4666ca in sasmodels

Timestamp:

Jan 28, 2016 6:07:21 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

1d4017a, 190fc2b

Parents:

841753c

Message:

delint

Files:

• extra/pylint.rc (modified) (1 diff)
• sasmodels/models/lamellarCailleHG.py (modified) (2 diffs)

extra/pylint.rc

@@ -7 +7 @@
 # pygtk.require().
 #init-hook='import os, sys; sys.path.extend([os.getcwd(),os.path.join(os.getcwd(),"extra")])'
+init-hook='import sys; sys.path.append('extra')
 
 # Profiled execution.

sasmodels/models/lamellarCailleHG.py

@@ -92 +92 @@
 
 parameters = [
-              #   [ "name", "units", default, [lower, upper], "type",
-              #     "description" ],
-              [ "tail_length", "Ang",  10, [0, inf], "volume",
-                "Tail thickness" ],
-              [ "head_length", "Ang",  2, [0, inf], "volume",
-                "head thickness" ],
-              [ "Nlayers", "",  30, [0, inf], "",
-                "Number of layers" ],
-              [ "spacing", "Ang", 40., [0.0,inf], "volume",
-                "d-spacing of Caille S(Q)" ],
-              [ "Caille_parameter", "", 0.001, [0.0,0.8], "",
-                "Caille parameter" ],
-              [ "sld", "1e-6/Ang^2", 0.4, [-inf,inf], "",
-                "Tail scattering length density" ],
-              [ "head_sld", "1e-6/Ang^2", 2.0, [-inf,inf], "",
-                "Head scattering length density" ],
-              [ "solvent_sld", "1e-6/Ang^2", 6, [-inf,inf], "",
-                "Solvent scattering length density" ],
+    #   [ "name", "units", default, [lower, upper], "type",
+    #     "description" ],
+    ["tail_length", "Ang", 10, [0, inf], "volume",
+     "Tail thickness"],
+    ["head_length", "Ang", 2, [0, inf], "volume",
+     "head thickness"],
+    ["Nlayers", "", 30, [0, inf], "",
+     "Number of layers"],
+    ["spacing", "Ang", 40., [0.0, inf], "volume",
+     "d-spacing of Caille S(Q)"],
+    ["Caille_parameter", "", 0.001, [0.0, 0.8], "",
+     "Caille parameter"],
+    ["sld", "1e-6/Ang^2", 0.4, [-inf, inf], "",
+     "Tail scattering length density"],
+    ["head_sld", "1e-6/Ang^2", 2.0, [-inf, inf], "",
+     "Head scattering length density"],
+    ["solvent_sld", "1e-6/Ang^2", 6, [-inf, inf], "",
+     "Solvent scattering length density"],
     ]
 
-source = [ "lamellarCailleHG_kernel.c"]
+source = ["lamellarCailleHG_kernel.c"]
 
 # No volume normalization despite having a volume parameter
@@ -128 +128 @@
 
 demo = dict(
-            scale=1, background=0,
-            Nlayers=20,
-            spacing=200., Caille_parameter=0.05,
-            tail_length=15,head_length=10,
-            #sld=-1, head_sld=4.0, solvent_sld=6.0,
-            sld=-1, head_sld=4.1, solvent_sld=6.0,
-            tail_length_pd= 0.1, tail_length_pd_n=20,
-            head_length_pd= 0.05, head_length_pd_n=30,
-            spacing_pd= 0.2, spacing_pd_n=40
-           )
+    scale=1, background=0,
+    Nlayers=20, spacing=200., Caille_parameter=0.05,
+    tail_length=15, head_length=10,
+    #sld=-1, head_sld=4.0, solvent_sld=6.0,
+    sld=-1, head_sld=4.1, solvent_sld=6.0,
+    tail_length_pd=0.1, tail_length_pd_n=20,
+    head_length_pd=0.05, head_length_pd_n=30,
+    spacing_pd=0.2, spacing_pd_n=40,
+    )
 
 oldname = 'LamellarPSHGModel'
-oldpars = dict(tail_length='deltaT',head_length='deltaH',Nlayers='n_plates',Caille_parameter='caille', sld='sld_tail', head_sld='sld_head',solvent_sld='sld_solvent')
+oldpars = dict(
+    tail_length='deltaT', head_length='deltaH', Nlayers='n_plates',
+    Caille_parameter='caille', sld='sld_tail', head_sld='sld_head',
+    solvent_sld='sld_solvent')