Changeset ae7d639 in sasmodels

Timestamp:

Aug 8, 2014 2:55:23 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:

a953943

Parents:

1726b21

Message:

Ellipse now MUCH faster!

Files:

• Kernel/Kernel-Ellipse.cpp (modified) (1 diff)
• Kernel/Kernel-Ellipse_f.cpp (added)
• Models/code_cylinder_f.py (modified) (4 diffs)
• Models/code_ellipse_f.py (added)
• fit.py (modified) (4 diffs)

Kernel/Kernel-Ellipse.cpp

@@ -1 @@
-__kernel void EllipsoidKernel(const real radius_a_weight, const real radius_b_weight, const real axis_theta_weight,
-const real axis_phi_weight, const real scale, const real radius_a, const real radius_b, const real sub, const real axis_theta, const real axis_phi, __global const real *qx,
+__kernel void EllipsoidKernel(const real radius_a_weight, const real radius_b_weight,
+const real axis_theta_weight,
+const real axis_phi_weight, const real scale, const real radius_a, const real radius_b,
+ const real sub, const real axis_theta, const real axis_phi, __global const real *qx,
 __global const real *qy, __global real *_ptvalue, const int length, const int size)
 {

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

fit.py

@@ -8 +8 @@
 from Models.code_cylinder_f import GpuCylinder
 #from Models.code_cylinder import GpuCylinder, OneDGpuCylinder
-from Models.code_ellipse import GpuEllipse
+from Models.code_ellipse_f import GpuEllipse
 from Models.code_lamellar import GpuLamellar
 from Models.code_triaxialellipse import GpuTriEllipse
@@ -31 +31 @@
 
 
-if 0:
+if 1:
     model = SasModel(data, GpuEllipse,
     scale=0.08,
@@ -41 +41 @@
     radius_a_pd=0.222296, radius_a_pd_n=1, radius_a_pd_nsigma=0,
     radius_b_pd=.000128, radius_b_pd_n=1, radius_b_pd_nsigma=0,
-    axis_phi_pd=2.63698e-05, axis_phi_pd_n=20, axis_phi_pd_nsigma=0,
+    axis_phi_pd=2.63698e-05, axis_phi_pd_n=20, axis_phi_pd_nsigma=3,
     dtype='float32')
 
 
     # SET THE FITTING PARAMETERS
-    model.radius_a.range(15, 1000)
-    model.radius_b.range(15, 1000)
+    #model.radius_a.range(15, 1000)
+    #model.radius_b.range(15, 1000)
     #model.axis_theta_pd.range(0, 360)
     #model.background.range(0,1000)
-    #model.scale.range(0, 1)
+    model.scale.range(0, 1)
 
 
@@ -70 +70 @@
 
 
-if 1:
+if 0:
     """
     pars = dict(scale=0.0023, radius=92.5, length=798.3,