Changeset 496b252 in sasmodels for code_coreshellcyl.py

Timestamp:

Jul 11, 2014 3:09:57 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:

8a21ba3

Parents:

be5d7df

Message:

core shell cylinder is fixed; float converted to real so is interchangeable

File:

• code_coreshellcyl.py (modified) (2 diffs)

code_coreshellcyl.py

@@ -57 +57 @@
         size = len(axis_theta.weight)
 
+        real = np.float32 if self.qx.dtype == np.dtype('float32') else np.float64
         for i in xrange(len(radius.weight)):
             for j in xrange(len(length.weight)):
@@ -64 +65 @@
 
                             self.prg.CoreShellCylinderKernel(queue, self.qx.shape, None, self.qx_b, self.qy_b, self.res_b,
-                                    np.float32(axis_theta.value[k]), np.float32(axis_phi.value[l]), np.float32(thickness.value[f]),
-                                    np.float32(length.value[j]), np.float32(radius.value[i]), np.float32(pars['scale']),
-                                    np.float32(radius.weight[i]), np.float32(length.weight[j]), np.float32(thickness.weight[f]),
-                                    np.float32(axis_theta.weight[k]), np.float32(axis_phi.weight[l]), np.float32(pars['core_sld']),
-                                    np.float32(pars['shell_sld']), np.float32(pars['solvent_sld']),np.uint32(size),
+                                    real(axis_theta.value[k]), real(axis_phi.value[l]), real(thickness.value[f]),
+                                    real(length.value[j]), real(radius.value[i]), real(pars['scale']),
+                                    real(radius.weight[i]), real(length.weight[j]), real(thickness.weight[f]),
+                                    real(axis_theta.weight[k]), real(axis_phi.weight[l]), real(pars['core_sld']),
+                                    real(pars['shell_sld']), real(pars['solvent_sld']),np.uint32(size),
                                     np.uint32(self.qx.size))
                             cl.enqueue_copy(queue, self.res, self.res_b)