Changeset ae7d639 in sasmodels for Models

Timestamp:

Aug 8, 2014 2:55:23 PM (11 years ago)

Author:

HMP1 <helen.park@…>

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:

a953943

Parents:

1726b21

Message:

Ellipse now MUCH faster!

Location:

Models

Files:

• code_cylinder_f.py (modified) (4 diffs)
• code_ellipse_f.py (added)

Models/code_cylinder_f.py

@@ -2 +2 @@
 # -*- coding: utf-8 -*-
 
-import sys
+
 import ctypes
 from ctypes import c_int, c_double, c_void_p
@@ -45 +45 @@
         loops_b = cl.Buffer(ctx, mf.READ_ONLY | mf.COPY_HOST_PTR, hostbuf=loops)
         loops_l = cl.LocalMemory(len(loops.data))
+
         self.prg.CylinderKernel(queue, self.qx.shape, None,
             self.qx_b, self.qy_b, self.res_b,
@@ -51 +52 @@
             real(pars['sldCyl']-pars['sldSolv']),
             *[np.uint32(pn) for pn in loop_lengths])
+
         cl.enqueue_copy(queue, self.res, self.res_b)
         print toc()*1000, self.qx.shape[0]
@@ -85 +87 @@
         length.get_weights(pars['length'], 0, 10000, True),
         theta.get_weights(pars['cyl_theta'], -np.inf, np.inf, False),
-        theta.get_weights(pars['cyl_phi'], -np.inf, np.inf, False),
+        phi.get_weights(pars['cyl_phi'], -np.inf, np.inf, False),
         ]
     # Make sure that weights are normalized to peaks at 1 so that