Changeset aea515c in sasmodels for sasmodels/conversion_table.py

Timestamp:

Oct 24, 2016 8:17:19 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

999c87f

Parents:

97f9b46

Message:

convert model parameters from SasView? 3.1 to sasmodels

File:

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

sasmodels/conversion_table.py

@@ -143 +143 @@
         }
     ],
-    "core_shell_ellipsoid(nonXT)": [
+    "core_shell_ellipsoid:1": [
         "CoreShellEllipsoidModel",
         {
@@ -150 +150 @@
             "sld_solvent": "sld_solvent",
             "equat_core": "equat_core",
-            "equat_shell": "equat_shell",
-            "polar_core": "polar_core",
-            "polar_shell": "polar_shell",
+            "thick_shell": "equat_shell",
+            "x_core": "polar_core",
+            "x_polar_shell": "polar_shell",
             "theta": "axis_theta",
             "phi": "axis_phi",
@@ -399 +399 @@
         "RectangularHollowPrismModel",
         {
+            "sld": "sldPipe",
+            "sld_solvent": "sldSolv",
+            "length_a": "short_side",
             "b2a_ratio": "b2a_ratio",
-            "length_a": "short_side",
-            "sld": "sldPipe",
-            "length_c": "c2a_ratio",
-            "sld_solvent": "sldSolv",
-            "thickness": "thickness"
+            "c2a_ratio": "c2a_ratio",
+            "thickness": "thickness",
         }
     ],
@@ -411 +411 @@
         {
             "sld": "sldPipe",
+            "sld_solvent": "sldSolv",
+            "length_a": "short_side",
             "b2a_ratio": "b2a_ratio",
-            "length_a": "short_side",
-            "length_c": "c2a_ratio",
-            "sld_solvent": "sldSolv"
+            "c2a_ratio": "c2a_ratio",
         }
     ],
@@ -515 +515 @@
         {
             "rg": "rg",
-            "scale": "scale",
-            "background": "background"
+            "i_zero": "scale",
+            "background": "background",
         }
     ],
@@ -576 +576 @@
         {
             "scale": "scale",
-            "string_thickness": "thick_string",
+            "thick_string": "thick_string",
             "sld_string": "sld_string",
             "sld_solvent": "sld_solv",
             "edge_sep": "edge_separation",
-            "number_of_pearls": "num_pearls",
+            "num_pearls": "num_pearls",
             "radius": "radius",
             "background": "background",
@@ -591 +591 @@
             "rg": "rg",
             "polydispersity": "poly_m",
-            "scale": "scale",
-            "background": "background"
+            "i_zero": "scale",
+            "background": "background",
         }
     ],
@@ -638 +638 @@
         {
             "scale": "scale",
-            "solvent_sld": "sld_solvent",
+            "sld_solvent": "sld_solvent",
             "thickness": "thickness",
             "beta": "beta",
@@ -665 +665 @@
         {
             "sld": "sldPipe",
+            "length_a": "short_side",
             "b2a_ratio": "b2a_ratio",
-            "length_a": "short_side",
-            "length_c": "c2a_ratio",
+            "c2a_ratio": "c2a_ratio",
             "sld_solvent": "sldSolv"
         }