Changeset e85aa2e in sasmodels

Timestamp:

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

037aa3d

Parents:

fef353f

Message:

support scale ↔ scale_factor conversion in P*S models

Location:

sasmodels

Files:

• conversion_table.py (modified) (5 diffs)
• convert.py (modified) (3 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"
         }
     ],

sasmodels/convert.py

@@ -161 +161 @@
         oldpars['rimB.width'] = 0.0
         oldpars['rimC.width'] = 0.0
+    elif name == 'core_shell_ellipsoid:1':
     elif name == 'hollow_cylinder':
         # now uses radius and thickness
@@ -228 +229 @@
     if newname is None:
         return name, pars
-    if newname.endswith(':1'):
+    if ':' in newname:   # core_shell_ellipsoid:1
         model_info = load_model_info(newname[:-2])
         # Know that the table exists and isn't multiplicity so grab it directly
+        # Can't use _get_translation_table since that will return the 'bare'
+        # version.
         translation = CONVERSION_TABLE[newname]
     else:
@@ -305 +308 @@
         composition_type, parts = model_info.composition
         if composition_type == 'product':
-            translation = {'scale':'scale_factor'}
-            translation.update(_get_translation_table(parts[0]))
+            translation = _get_translation_table(parts[0])
+            # structure factor models include scale:scale_factor mapping
             translation.update(_get_translation_table(parts[1]))
         else: