Changeset d2fb4af in sasmodels for sasmodels/convert.py

Timestamp:

Nov 22, 2016 8:43:16 AM (7 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:

077666e

Parents:

f80f334

Message:

#795: No longer an issue with multiple backgrounds and scales. A handful of model names were slightly off from the save state names. Currently going through model-by-model to finish this.

File:

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

sasmodels/convert.py

@@ -64 +64 @@
     if id.startswith('M0:'):
         return True
-    if id.startswith('volfraction') or id.startswith('radius_effective'):
-        return False
     if '_pd' in id or '.' in id:
         return False
@@ -75 +73 @@
         if p.id == id:
             return p.type == 'sld'
-    raise ValueError("unknown parameter %r in conversion"%id)
+    return False
 
 def _rescale_sld(model_info, pars, scale):
@@ -137 +135 @@
                 i += 1
                 break
-            elif re.search("background", key_par) or re.search("scale", key_par):
+            elif "background" == key_par or "scale" == key_par:
                 new_pars[key_par] = value_par
                 i += 1
@@ -236 +234 @@
                 oldpars[p + ".upper"] /= 1e-13
     elif name == 'spherical_sld':
-        oldpars["CONTROL"] += 1
+        oldpars["CONTROL"] = 0
+        i = 0
+        while "nu_inter" + str(i) in oldpars:
+            oldpars["CONTROL"] += 1
+            i += 1
     elif name == 'teubner_strey':
         # basically undoing the entire Teubner-Strey calculations here.