Changeset 08376e7 in sasmodels for sasmodels/sasview_model.py

Timestamp:

Mar 18, 2016 9:36:02 AM (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:

3a45c2c

Parents:

aceac39

Message:

sasview wrapper hackery

File:

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

sasmodels/sasview_model.py

@@ -38 +38 @@
     model_info = core.load_model_info(model_name)
     def __init__(self, multfactor=1):
-        SasviewModel.__init__(self, model_info)
-    attrs = dict(__init__=__init__)
+        SasviewModel.__init__(self)
+    attrs = dict(__init__=__init__, _model_info=model_info)
     ConstructedModel = type(model_info[namestyle], (SasviewModel,), attrs)
     return ConstructedModel
@@ -47 +47 @@
     Sasview wrapper for opencl/ctypes model.
     """
-    def __init__(self, model_info):
-        self._model_info = model_info
+    def __init__(self):
         self._kernel = None
+        model_info = self._model_info
 
         self.name = model_info['name']