Changeset c95dfc63 in sasmodels

Timestamp:

Aug 10, 2016 9:51:47 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

fd19811

Parents:

672978c

Message:

support existing sum and product models

Location:

sasmodels

Files:

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

sasmodels/conversion_table.py

@@ -363 +363 @@
         }
     ],
-    "hardsphere2": [
-        "HardsphereStructure",
-        {}
-    ],
-    "hardsphere3": [
-        "HardsphereStructure",
-        {}
-    ],
-    "hardsphere4": [
-        "HardsphereStructure",
-        {}
-    ],
     "hayter_msa": [
         "HayterMSAStructure",

sasmodels/sasview_model.py

@@ -18 +18 @@
 
 import numpy as np  # type: ignore
-
-# Monkey patch sas.sascalc.fit as sas.models so that sas.models.pluginmodel
-# is available to the plugin modules.
-import sys
-import sas
-import sas.sascalc.fit
-sys.modules['sas.models'] = sas.sascalc.fit
-sas.models = sas.sascalc.fit
 
 from . import core
@@ -46 +38 @@
     pass
 
+SUPPORT_OLD_STYLE_PLUGINS = True
+
+def _register_old_models():
+    # type: () -> None
+    """
+    Place the new models into sasview under the old names.
+
+    Monkey patch sas.sascalc.fit as sas.models so that sas.models.pluginmodel
+    is available to the plugin modules.
+    """
+    import sys
+    import sas
+    import sas.sascalc.fit
+    sys.modules['sas.models'] = sas.sascalc.fit
+    sas.models = sas.sascalc.fit
+
+    import sas.models
+    from sasmodels.conversion_table import CONVERSION_TABLE
+    for new_name, conversion in CONVERSION_TABLE.items():
+        old_name = conversion[0]
+        module_attrs = { old_name: find_model(new_name) }
+        ConstructedModule = type(old_name, (), module_attrs)
+        old_path = 'sas.models.' + old_name
+        setattr(sas.models, old_path, ConstructedModule)
+        sys.modules[old_path] = ConstructedModule
+
 
 # TODO: separate x_axis_label from multiplicity info
@@ -86 +104 @@
         except Exception:
             logging.error(traceback.format_exc())
+    if SUPPORT_OLD_STYLE_PLUGINS:
+        _register_old_models()
+
     return models
 
@@ -676 +697 @@
             raise
 
+def test_old_name():
+    # type: () -> None
+    """
+    Load and run cylinder model from sas.models.CylinderModel
+    """
+    if not SUPPORT_OLD_STYLE_PLUGINS:
+        return
+    try:
+        # if sasview is not on the path then don't try to test it
+        import sas
+    except ImportError:
+        return
+    load_standard_models()
+    from sas.models.CylinderModel import CylinderModel
+    CylinderModel().evalDistribution([0.1, 0.1])
+
 if __name__ == "__main__":
     print("cylinder(0.1,0.1)=%g"%test_model())