Changeset d2fb4af in sasmodels

Timestamp:

Nov 22, 2016 6: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.

Location:

sasmodels

Files:

• conversion_table.py (modified) (12 diffs)
• convert.py (modified) (4 diffs)

sasmodels/conversion_table.py

@@ -211 +211 @@
     ],
     "correlation_length": [
-        "CorrLengthModel",
+        "CorrLength",
         {
             "porod_scale": "scale_p",
@@ -299 +299 @@
     ],
     "fractal_core_shell": [
-        "FractalCoreShellModel",
+        "FractalCoreShell",
         {
             "sld_core": "core_sld",
@@ -321 +321 @@
     ],
     "gauss_lorentz_gel": [
-        "GaussLorentzGelModel",
+        "GaussLorentzGel",
         {
             "gauss_scale": "scale_g",
@@ -331 +331 @@
     ],
     "gaussian_peak": [
-        "PeakGaussModel",
+        "Peak Gauss Model",
         {
             "peak_pos": "q0",
@@ -348 +348 @@
     ],
     "guinier": [
-        "GuinierModel",
+        "Guinier",
         {
             "rg": "rg"
@@ -354 +354 @@
     ],
     "guinier_porod": [
-        "GuinierPorodModel",
+        "GuinierPorod",
         {
             "s": "dim",
@@ -486 +486 @@
     ],
     "lorentz": [
-        "LorentzModel",
+        "Lorentz",
         {
             "cor_length": "length"
@@ -510 +510 @@
     ],
     "mono_gauss_coil": [
-        "DebyeModel",
+        "Debye",
         {
             "rg": "rg",
@@ -564 +564 @@
     ],
     "peak_lorentz": [
-        "PeakLorentzModel",
+        "Peak Lorentz Model",
         {
             "peak_pos": "q0",
@@ -802 +802 @@
     ],
     "two_lorentzian": [
-        "TwoLorentzianModel",
+        "TwoLorentzian",
         {
             "lorentz_scale_1": "scale_1",
@@ -814 +814 @@
     ],
     "two_power_law": [
-        "TwoPowerLawModel",
+        "TwoPowerLaw",
         {
             "coefficent_1": "coef_A",
@@ -824 +824 @@
     ],
     "unified_power_Rg": [
-        "UnifiedPowerRgModel",
+        "UnifiedPowerRg",
         {
         }

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.