Changeset 0a82216 in sasmodels

Timestamp:

Feb 18, 2015 11:45:24 AM (10 years ago)

Author:

ajj

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:

3a45c2c

Parents:

6a729a2

Message:

making delivery of class with new name the default. now have to pass parameter to get the old SasView? name

File:

• sasmodels/sasview_model.py (modified) (2 diffs)

sasmodels/sasview_model.py

@@ -32 +32 @@
 
 
-def make_class(kernel_module, dtype='single'):
+def make_class(kernel_module, dtype='single', namestyle='name'):
     """
     Load the sasview model defined in *kernel_module*.
 
     Returns a class that can be used directly as a sasview model.
+
+    Defaults to using the new name for a model. Setting namestyle='name'
+    will produce a class with a name compatible with SasView
     """
     model =  load_model(kernel_module, dtype=dtype)
@@ -42 +45 @@
         SasviewModel.__init__(self, model)
     attrs = dict(__init__=__init__)
-    ConstructedModel = type(model.info['oldname'],  (SasviewModel,), attrs)
+    ConstructedModel = type(model.info[namestyle],  (SasviewModel,), attrs)
     return ConstructedModel