Changeset 68e7f9d in sasmodels for sasmodels/generate.py

Timestamp:

Apr 4, 2016 12:18:02 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:

9d96649

Parents:

5b0335b

Message:

remove pyc file after loading custom model

File:

• sasmodels/generate.py (modified) (3 diffs)

sasmodels/generate.py

@@ -193 +193 @@
 
 from .modelinfo import ModelInfo, Parameter, make_parameter_table, set_demo
+from .custom import load_custom_kernel_module
 
 # TODO: identify model files which have changed since loading and reload them.
@@ -662 +663 @@
             return Iq(np.sqrt(qx**2 + qy**2), **kw)
         model_info['Iqxy'] = Iqxy
+
+
+def load_kernel_module(model_name):
+    if model_name.endswith('.py'):
+        kernel_module = load_custom_kernel_module(model_name)
+    else:
+        from sasmodels import models
+        __import__('sasmodels.models.'+model_name)
+        kernel_module = getattr(models, model_name, None)
+    return kernel_module
 
 
@@ -811 +822 @@
     """
     import sys
-    from sasmodels.core import make_model_by_name
     if len(sys.argv) <= 1:
         print("usage: python -m sasmodels.generate modelname")
     else:
         name = sys.argv[1]
-        model_info = make_model_by_name(name)
+        kernel_module = load_kernel_module(name)
+        model_info = make_model_info(kernel_module)
         source = make_source(model_info)
         print(source)