Changeset aa4946b in sasmodels for sasmodels/bumps_model.py

Timestamp:

Mar 11, 2015 11:15:40 PM (9 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:

af1d68c

Parents:

49d1d42f

Message:

refactor so kernels are loaded via core.load_model

File:

• sasmodels/bumps_model.py (modified) (5 diffs)

sasmodels/bumps_model.py

@@ -1 +1 @@
 """
-Sasmodels core.
+Wrap sasmodels for direct use by bumps.
 """
+
 import datetime
 
-from sasmodels import sesans
+import numpy as np
+
+from . import sesans
 
 # CRUFT python 2.6
@@ -15 +18 @@
         """Return number date-time delta as number seconds"""
         return dt.total_seconds()
-
-import numpy as np
-
-try:
-    from .kernelcl import load_model as _loader
-except RuntimeError, exc:
-    import warnings
-    warnings.warn(str(exc))
-    warnings.warn("OpenCL not available --- using ctypes instead")
-    from .kerneldll import load_model as _loader
-
-def load_model(modelname, dtype='single'):
-    """
-    Load model by name.
-    """
-    sasmodels = __import__('sasmodels.models.' + modelname)
-    module = getattr(sasmodels.models, modelname, None)
-    model = _loader(module, dtype=dtype)
-    return model
 
 
@@ -263 +247 @@
     *data* is the data to be fitted.
 
-    *model* is the SAS model, e.g., from :func:`gen.opencl_model`.
+    *model* is the SAS model from :func:`core.load_model`.
 
     *cutoff* is the integration cutoff, which avoids computing the
@@ -280 +264 @@
         self.model = model
         self.cutoff = cutoff
-# TODO       if  isinstance(data,SESANSData1D)
         if hasattr(data, 'lam'):
             self.data_type = 'sesans'
@@ -431 +414 @@
     def _get_weights(self, par):
         """
-            Get parameter dispersion weights
+        Get parameter dispersion weights
         """
         from . import weights