Changeset e85aa2e in sasmodels for sasmodels/conversion_table.py

Timestamp:

Nov 2, 2016 9:40:32 AM (7 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:

037aa3d

Parents:

fef353f

Message:

support scale ↔ scale_factor conversion in P*S models

File:

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

sasmodels/conversion_table.py

@@ -366 +366 @@
         "HardsphereStructure",
         {
-            "radius_effective_pd": "effect_radius_pd",
+            "scale": "scale_factor",
             "radius_effective": "effect_radius",
-            "radius_effective_pd_n": "effect_radius_pd_n"
         }
     ],
@@ -374 +373 @@
         "HayterMSAStructure",
         {
+            "scale": "scale_factor",
             "radius_effective": "effect_radius",
             "volfraction": "volfraction",
@@ -380 +380 @@
             "concentration_salt": "saltconc",
             "dielectconst": "dielectconst",
-            #"radius_effective_pd_n": "effect_radius_pd_n",
-            #"radius_effective_pd": "effect_radius_pd",
         }
     ],
@@ -738 +736 @@
         "SquareWellStructure",
         {
-            "radius_effective_pd": "effect_radius_pd",
+            "scale": "scale_factor",
             "radius_effective": "effect_radius",
-            "radius_effective_pd_n": "effect_radius_pd_n"
+            "wellwidth": "wellwidth",
+            "welldepth": "welldepth",
         }
     ],
@@ -766 +765 @@
         "StickyHSStructure",
         {
-            "radius_effective_pd": "effect_radius_pd",
+            "scale": "scale_factor",
             "radius_effective": "effect_radius",
-            "radius_effective_pd_n": "effect_radius_pd_n"
         }
     ],