Changeset be5d7df in sasmodels

Timestamp:

Jul 11, 2014 2:50:51 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:

496b252

Parents:

2de9a5e

Message:

Added Triaxial Ellipse Code and Kernel
Functions in Kernel are separated from the rest of Kernel code

Files:

• Kernel-TriaxialEllipse.cpp (modified) (2 diffs)
• code_triaxialellipse.py (modified) (1 diff)

Kernel-TriaxialEllipse.cpp

@@ -11 +11 @@
         real q_y = qy[i]/q;
         real pi = 4.0*atan(1.0);
+        real answer=0;
         
         //convert angle degree to radian
@@ -21 +22 @@
         real cos_nu = (-cos(phi)*sin(psi)*sin(theta)+sin(phi)*cos(psi))*q_x + sin(psi)*cos(theta)*q_y;
         real cos_mu = (-sin(theta)*cos(psi)*cos(phi)-sin(psi)*sin(phi))*q_x + cos(theta)*cos(psi)*q_y;
-
-        real answer=0;
         real t = q*sqrt(axisA*axisA*cos_nu*cos_nu+axisB*axisB*cos_mu*cos_mu+axisC*axisC*cos_val*cos_val);
 

code_triaxialellipse.py

@@ -23 +23 @@
 
 class GpuTriEllipse:
-    PARS = {'scale':1, 'axisA':35, 'axisB':100, 'axisC':400, 'sldEll':1e-6, 'sldSolv':6.3e-6, 'background':0, 'theta':0,
-            'phi':0, 'psi':0}
+    PARS = {'scale':1, 'axisA':35, 'axisB':100, 'axisC':400, 'sldEll':1e-6, 'sldSolv':6.3e-6, 'background':0,
+            'theta':0, 'phi':0, 'psi':0}
 
     PD_PARS = ['axisA', 'axisB', 'axisC', 'theta', 'phi', 'psi']