Changeset bb584b3 in sasmodels

Timestamp:

Dec 23, 2016 10:55:46 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:

790b16bb

Parents:

0795293

Message:

include model class in conversion table when it differs from model name

Location:

sasmodels

Files:

• conversion_table.py (modified) (12 diffs)
• sasview_model.py (modified) (1 diff)

sasmodels/conversion_table.py

@@ -239 +239 @@
             "lorentz_exp": "exponent_l",
             "cor_length": "length_l"
-        }
+        },
+        "CorrLengthModel"
     ],
     "cylinder": [
@@ -330 +331 @@
             "cor_length": "cor_length",
             "volfraction": "volfraction",
-        }
+        },
+        "FractalCoreShellModel"
     ],
     "fuzzy_sphere": [
@@ -349 +351 @@
             "background": "background",
             "lorentz_scale": "scale_l"
-        }
+        },
+        "GaussLorentzGelModel"
     ],
     "gaussian_peak": [
@@ -356 +359 @@
             "peak_pos": "q0",
             "sigma": "B",
-        }
+        },
+        "PeakGaussModel",
     ],
     "gel_fit": [
@@ -372 +376 @@
         {
             "rg": "rg"
-        }
+        },
+        "GuinierModel",
     ],
     "guinier_porod": [
@@ -382 +387 @@
             "scale": "scale",
             "background": "background"
-        }
+        },
+        "GuinierPorodModel",
     ],
     "hardsphere": [
@@ -510 +516 @@
         {
             "cor_length": "length"
-        }
+        },
+        "LorentzModel",
     ],
     "mass_fractal": [
@@ -536 +543 @@
             "i_zero": "scale",
             "background": "background",
-        }
+        },
+        "DebyeModel",
     ],
     "multilayer_vesicle": [
@@ -589 +597 @@
             "peak_pos": "q0",
             "peak_hwhm": "B"
-        }
+        },
+        "PeakLorentzModel",
     ],
     "pearl_necklace": [
@@ -832 +841 @@
             "lorentz_length_1": "length_1",
             "background": "background"
-        }
+        },
+        "TwoLorentzianModel",
     ],
     "two_power_law": [
@@ -842 +852 @@
             "background": "background",
             "crossover": "qc"
-        }
+        },
+        "TwoPowerLawModel",
     ],
     "unified_power_Rg": [
@@ -855 +866 @@
                    "background": "background",
                    "scale": "scale",
-               })
+               }),
+        "UnifiedPowerRgModel",
     ],
     "vesicle": [

sasmodels/sasview_model.py

@@ -60 +60 @@
         # CoreShellEllipsoidModel => core_shell_ellipsoid:1
         new_name = new_name.split(':')[0]
-        old_name = conversion[0]
+        old_name = conversion[0] if len(conversion) < 3 else conversion[2]
         module_attrs = {old_name: find_model(new_name)}
         ConstructedModule = type(old_name, (), module_attrs)