Changeset 2de9a5e in sasmodels for code_lamellar.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_lamellar.py (moved) (moved from lamellarcode.py) (3 diffs)

code_lamellar.py

@@ -11 +11 @@
     if dtype == 'double':
         header = """\
+#define real float
+"""
+    else:
+        header = """\
 #pragma OPENCL EXTENSION cl_khr_fp64: enable
 #define real double
 """
-        return header+src,qx,qy
-    else:
-        return src,qx,qy
+    return header+src, qx, qy
 
 
@@ -23 +25 @@
         'scale':1, 'bi_thick':1, 'sld_bi':1e-6, 'sld_sol':0, 'background':0,
     }
-
-    def __init__(self, qx, qy, dtype='float'):
+    PD_PARS = {'bi_thick'}
+    def __init__(self, qx, qy, dtype='float32'):
 
         #create context, queue, and build program
@@ -51 +53 @@
         for i in xrange(len(bi_thick.weight)):
             self.prg.LamellarKernel(self.queue, self.qx.shape, None, self.qx_b, self.qy_b, self.res_b, real(bi_thick.value[i]),
-                                    real(pars['scale']), real(sub), real(pars['background']), np.uint32(self.qx.size))
+                                    real(pars['scale']), real(sub), np.uint32(self.qx.size))
             cl.enqueue_copy(self.queue, self.res, self.res_b)