Changeset 5d4777d in sasmodels for sasmodels/sasview_model.py

Timestamp:

Sep 1, 2014 11:24:38 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:

f4cf580

Parents:

ff7119b

Message:

reorganize, check and update models

File:

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

sasmodels/sasview_model.py

@@ -6 +6 @@
 
 try:
-    import pyopencl
-    from .gen import opencl_model as load_model
-except ImportError:
+    from .gpu import load_model
+except ImportError,exc:
+    warnings.warn(str(exc))
     warnings.warn("OpenCL not available --- using ctypes instead")
-    from .gen import dll_model as load_model
+    from .dll import load_model
 
 
@@ -246 +246 @@
             # Check whether we have a list of ndarrays [qx,qy]
             qx, qy = qdist
-            return self.calculate_Iq(qx, qy)
+            partype = self._model.info['partype']
+            if not partype['orientation'] and not partype['magnetic']:
+                return self.calculate_Iq(np.sqrt(qx**2+qy**2))
+            else:
+                return self.calculate_Iq(qx, qy)
 
         elif isinstance(qdist, np.ndarray):