Changeset 18f2ca1 in sasview for sansmodels/src/sans/models/c_extensions

Timestamp:

Oct 15, 2010 6:43:06 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

2e862a0

Parents:

495c377

Message:

hope this was the last model left to add

Location:

sansmodels/src/sans/models/c_extensions

Files:

• bcc.c (modified) (1 diff)
• capcyl.h (modified) (1 diff)
• csparallelepiped.c (added)
• csparallelepiped.h (added)
• fcc.c (modified) (3 diffs)
• sc.c (modified) (3 diffs)

sansmodels/src/sans/models/c_extensions/bcc.c

@@ -110 +110 @@
     // Compute the angle btw vector q and the a3 axis
     cos_val_a3 = a3_x*q_x + a3_y*q_y + a3_z*q_z;
-    //alpha = acos(cos_val_a3);
+    alpha = acos(cos_val_a3);
     a3_dot_q = aa*q*cos_val_a3;
 
     // a1 axis
     cos_val_a1 = a1_x*q_x + a1_y*q_y;
-    a1_dot_q = aa*q*cos_val_a1;
+    a1_dot_q = aa*q*cos_val_a1*sin(alpha);
 
     // a2 axis
-    cos_val_a2 = a2_x*q_x + a2_y*q_y; //sin(acos(cos_val_a1)) ;
-    a2_dot_q = aa*q*cos_val_a2;
+    cos_val_a2 = sin(acos(cos_val_a1));//a2_x*q_x + a2_y*q_y;
+    a2_dot_q = aa*q*cos_val_a2*sin(alpha); //aa*q*cos_val_a2
 
     // The following test should always pass

sansmodels/src/sans/models/c_extensions/capcyl.h

@@ -7 +7 @@
  //[PYTHONCLASS] = CappedCylinderModel
  //[DISP_PARAMS] = rad_cyl,len_cyl,rad_cap,phi,  theta
- //[DESCRIPTION] =<text>Calculates the scattering from a cylinder with spherical
- //                             section end-caps. That is, a sphereocylinder
+ //[DESCRIPTION] =<text>Calculates the scattering from a cylinder with spherical section end-caps.
+ //                             That is, a sphereocylinder
  //                             with end caps that have a radius larger than
  //                             that of the cylinder and the center of the

sansmodels/src/sans/models/c_extensions/fcc.c

@@ -77 +77 @@
         Da = pars->d_factor*aa;
         qDa_2 = pow(q*Da,2.0);
-        contrast = pars->sldSph - pars->sldSolv;
+        //contrast = pars->sldSph - pars->sldSolv;
 
         latticeScale = 4.0*(4.0/3.0)*Pi*(dp[1]*dp[1]*dp[1])/pow(aa*sqrt(2.0),3.0);
@@ -109 +109 @@
 
     // Compute the angle btw vector q and the a3 axis
-    cos_val_a3 = a3_x*q_x + a3_y*q_y;// + a3_z*q_z;
+    cos_val_a3 = a3_x*q_x + a3_y*q_y + a3_z*q_z;
+    alpha = acos(cos_val_a3);
     a3_dot_q = aa*q*cos_val_a3;
 
     // a1 axis
     cos_val_a1 = a1_x*q_x + a1_y*q_y;
-    a1_dot_q = aa*q*cos_val_a1;
+    a1_dot_q = aa*q*cos_val_a1*sin(alpha);
 
     // a2 axis
-    cos_val_a2 = a2_x*q_x + a2_y*q_y; //sin(acos(cos_val_a1)) ;
-    a2_dot_q = aa*q*cos_val_a2;
+    cos_val_a2 = sin(acos(cos_val_a1));//a2_x*q_x + a2_y*q_y;
+    a2_dot_q = aa*q*cos_val_a2*sin(alpha);
 
     // The following test should always pass
@@ -134 +135 @@
 
         // Use SphereForm directly from libigor
-        answer = SphereForm_Paracrystal(pars->radius,contrast,q)*Zq;
+        answer = SphereForm(dp,q)*Zq;
 
         //consider scales

sansmodels/src/sans/models/c_extensions/sc.c

@@ -89 +89 @@
     // Compute the angle btw vector q and the a3 axis
     cos_val_a3 = a3_x*q_x + a3_y*q_y + a3_z*q_z;
+    alpha = acos(cos_val_a3);
     //alpha = acos(cos_val_a3);
     a3_dot_q = aa*q*cos_val_a3;
@@ -96 +97 @@
 
     cos_val_a1 = a1_x*q_x + a1_y*q_y;
-    a1_dot_q = aa*q*cos_val_a1;
+    a1_dot_q = aa*q*cos_val_a1*sin(alpha);
 
     // a2 axis orientation
@@ -102 +103 @@
     a2_y = sqrt(1.0-sin(pars->theta)*cos(pars->phi))*sin(pars->psi);
     // a2 axis
-    cos_val_a2 =  a2_x*q_x + a2_y*q_y;//sin(acos(cos_val_a1)) ;
-    a2_dot_q = aa*q*cos_val_a2;
+    cos_val_a2 =  sin(acos(cos_val_a1));//a2_x*q_x + a2_y*q_y;
+    a2_dot_q = aa*q*cos_val_a2*sin(alpha);
 
     // The following test should always pass