Changeset ff7119b in sasmodels for sasmodels/sasview_model.py

Timestamp:

Aug 26, 2014 10:27:06 PM (10 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:

5d4777d

Parents:

a7684e5

Message:

docu update

File:

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

sasmodels/sasview_model.py

@@ -1 +1 @@
 import math
 from copy import deepcopy
+import warnings
 
 import numpy as np
 
+try:
+    import pyopencl
+    from .gen import opencl_model as load_model
+except ImportError:
+    warnings.warn("OpenCL not available --- using ctypes instead")
+    from .gen import dll_model as load_model
+
+
 def make_class(kernel_module, dtype='single'):
-    from .core import opencl_model
-    model =  opencl_model(kernel_module, dtype=dtype)
+    """
+    Load the sasview model defined in *kernel_module*.
+    :param kernel_module:
+    :param dtype:
+    :return:
+    """
+    model =  load_model(kernel_module, dtype=dtype)
     def __init__(self, multfactor=1):
         SasviewModel.__init__(self, model)
@@ -242 +256 @@
 
     def calculate_Iq(self, *args):
+        """
+        Calculate Iq for one set of q with the current parameters.
+
+        If the model is 1D, use *q*.  If 2D, use *qx*, *qy*.
+
+        This should NOT be used for fitting since it copies the *q* vectors
+        to the card for each evaluation.
+        """
         q_vectors = [np.asarray(q) for q in args]
         fn = self._model(self._model.make_input(q_vectors))