Changeset 8a21ba3 in sasmodels for code_capcyl.py

Timestamp:

Jul 11, 2014 3:40:30 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:

09e15be

Parents:

496b252

Message:

Fixed Ellipse code, update comparison file

File:

• code_capcyl.py (modified) (2 diffs)

code_capcyl.py

@@ -66 +66 @@
         sum, norm, norm_vol, vol = 0.0, 0.0, 0.0, 0.0
         size = len(theta.weight)
-        sub = pars['sld_capcyl']-np.float32(['sld_solv'])
+        sub = pars['sld_capcyl']-pars['sld_solv']
+        real = np.float32 if self.qx.dtype == np.dtype('float32') else np.float64
 
         for i in xrange(len(rad_cyl.weight)):
@@ -75 +76 @@
 
                             self.prg.CapCylinderKernel(queue, self.qx.shape, None, self.qx_b, self.qy_b, self.res_b,
-                                        self.vol_b, np.float32(rad_cyl.value[i]), np.float32(rad_cap.value[m]), np.float32(length.value[j]),
-                                        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),
+                                        self.vol_b, real(rad_cyl.value[i]), real(rad_cap.value[m]), real(length.value[j]),
+                                        real(theta.value[k]), real(phi.value[l]), real(sub), real(pars['scale']),
+                                        real(phi.weight[l]), real(theta.weight[k]), real(rad_cap.weight[m]),
+                                        real(rad_cyl.weight[i]), real(length.weight[j]), np.uint32(self.qx.size), np.uint32(size),
                                         self.Gauss76W_b, self.Gauss76Z_b)