Changeset 2de9a5e in sasmodels for code_capcyl.py

Timestamp:

Jul 11, 2014 2:47:47 PM (10 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:

be5d7df

Parents:

8faffcd

Message:

Update for Aaron

File:

• code_capcyl.py (moved) (moved from capcylcope.py) (4 diffs)

code_capcyl.py

@@ -7 +7 @@
 from weights import GaussianDispersion
 from sasmodel import card
+from Capcyl_Gauss import Gauss76Wt, Gauss76Z
 
 def set_precision(src, qx, qy, dtype):
@@ -34 +35 @@
         trala = open('NR_BessJ1.cpp').read()+"\n"+open('Capcyl_Kfun.cpp').read()+"\n"+open('Kernel-Cylinder.cpp').read()
         src, qx, qy = set_precision(trala, qx, qy, dtype=dtype)
+        self.prg = cl.Program(ctx, src).build()
+        self.qx, self.qy = qx, qy
 
-        self.prg = cl.Program(ctx, open('Kernel-CapCyl.cpp').read()).build()
 
         #buffers
@@ -41 +43 @@
         self.qx_b = cl.Buffer(ctx, mf.READ_ONLY | mf.COPY_HOST_PTR, hostbuf=self.qx)
         self.qy_b = cl.Buffer(ctx, mf.READ_ONLY | mf.COPY_HOST_PTR, hostbuf=self.qy)
+        G, Z = Gauss76Wt, Gauss76Z
+        self.Gauss76W_b = cl.Buffer(ctx, mf.READ_ONLY | mf.COPY_HOST_PTR, hostbuf=G)
+        self.Gauss76Z_b = cl.Buffer(ctx, mf.READ_ONLY | mf.COPY_HOST_PTR, hostbuf=Z)
         self.res_b = cl.Buffer(ctx, mf.WRITE_ONLY, qx.nbytes)
         self.res = np.empty_like(self.qx)
@@ -73 +78 @@
                                         np.float32(theta.value[k]), np.float32(phi.value[l]), np.float32(sub), np.float32(pars['scale']),
                                         np.float32(phi.weight[l]), np.float32(theta.weight[k]), np.float32(rad_cap.weight[m]),
-                                        np.float32(rad_cyl.weight[i]), np.float32(length.weight[j]), np.uint32(self.qx.size), np.uint32(size))
+                                        np.float32(rad_cyl.weight[i]), np.float32(length.weight[j]), np.uint32(self.qx.size), np.uint32(size),
+                                        self.Gauss76W_b, self.Gauss76Z_b)
 
                             cl.enqueue_copy(queue, self.res, self.res_b)