Changeset f8f5a37 in sasmodels

Timestamp:

Nov 17, 2016 11:51:53 AM (8 years ago)

Author:

krzywon

Branches:

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

Children:

3a45c2c

Parents:

47fafe9

Message:

#795: Working on reparameterized models: Teubner-Strey and Hollow Cylinder load properly.

File:

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

sasmodels/convert.py

@@ -49 +49 @@
 # Convert new style names for polydispersity info to old style names
 PD_DOT = [
-    ("", ""),
     ("_pd", ".width"),
     ("_pd_n", ".npts"),
@@ -55 +54 @@
     ("_pd_type", ".type"),
     ]
-
-CONVERT_OLD =[
-    "fittable",
-    "std",
-    "upper",
-    "lower",
-    "units"
-]
 
 def _rescale(par, scale):
@@ -220 +211 @@
         # now uses radius and thickness
         thickness = oldpars['radius'] - oldpars['core_radius']
-        pd = oldpars['radius.width']*oldpars['radius']/thickness
         oldpars['radius'] = thickness
-        oldpars['radius.width'] = pd
+        if 'radius.width' in oldpars:
+            pd = oldpars['radius.width']*oldpars['radius']/thickness
+            oldpars['radius.width'] = pd
     elif name == 'pearl_necklace':
         pass
@@ -267 +259 @@
         p_c1 = oldpars['c1']
         p_c2= oldpars['c2']
-        xi = math.sqrt(2/(math.sqrt(p_scale/p_c2) + 0.5*p_c1/p_c2))
+        i_1 = 0.5*p_c1/p_c2
+        i_2 = math.sqrt(math.fabs(p_scale/p_c2))
+        i_3 = 2/(i_1 + i_2)
+        xi = math.sqrt(math.fabs(i_3))
 
         # find d from xi
-        k = math.sqrt(1 - 0.5*p_c1/p_c2*xi**2)
+        k = math.sqrt(math.fabs(1 - 0.5*p_c1/p_c2*xi**2))
         d = 2*math.pi*xi/k
 
@@ -302 +297 @@
         model_info = load_model_info(newname)
         translation = _get_translation_table(model_info)
-    newpars = _convert_name(translation, pars.copy())
-    newpars = _hand_convert(newname, newpars)
+    newpars = _hand_convert(newname, pars.copy())
+    newpars = _convert_name(translation, newpars)
     newpars = _convert_pars(newpars, translation)
     if not model_info.structure_factor: