Changeset cbf4604 in sasmodels

Timestamp:

Aug 5, 2016 4:50:33 PM (8 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:

906cadf

Parents:

baa79c2

Message:

lint

File:

• sasmodels/conversion_table.py (modified) (2 diffs)

sasmodels/conversion_table.py

@@ +1 @@
+"""
+Parameter conversion table
+
+*CONVERSION_TABLE* gives the old model name and a dictionary of old parameter
+names for each parameter in sasmodels.  This is used by :mod:`convert` to
+determine the equivalent parameter set when comparing a sasmodels model to
+the models defined in SasView 3.1.
+"""
+
+
 CONVERSION_TABLE = {
     "adsorbed_layer": [
@@ -700 +710 @@
         # keys from the gnerator expression ((k,v) for k,v in seq) when
         # used as dict((generator), **{...})
-        dict(((field_new+str(index+1),field_old+str(index))
-             for field_new, field_old in [("sld","sld_flat"),
-                                          ("thickness","thick_flat"),
-                                          ("interface","thick_inter"),
-                                          ("shape","func_inter"),
-                                          ("nu","nu_inter"),]
-             for index in range(11)),
+        dict(((field_new+str(index+1), field_old+str(index))
+              for field_new, field_old in [("sld", "sld_flat"),
+                                           ("thickness", "thick_flat"),
+                                           ("interface", "thick_inter"),
+                                           ("shape", "func_inter"),
+                                           ("nu", "nu_inter"),]
+              for index in range(11)),
              **{
-            "n_shells": "n_shells",
-            "n_steps": "npts_inter",
-            "sld_solvent": "sld_solv",
-            "thickness1": "rad_core0",
-            "sld1": "sld_core0",
-        })
+                   "n_shells": "n_shells",
+                   "n_steps": "npts_inter",
+                   "sld_solvent": "sld_solv",
+                   "thickness1": "rad_core0",
+                   "sld1": "sld_core0",
+               })
     ],
     "squarewell": [