Changeset 8f20419d in sasview for sansmodels/src/sans/models/c_extensions/fcc.c

Timestamp:

Oct 14, 2010 2:30:23 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:

29100cb

Parents:

4cc8285c

Message:

more models and some tests

File:

• sansmodels/src/sans/models/c_extensions/fcc.c (modified) (2 diffs)

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

@@ -91 +91 @@
     b1_y = cos(pars->psi);
     // b2 axis orientation
-    b2_x = sqrt(1-sin(pars->theta)*cos(pars->phi))*cos(pars->psi);
-    b2_y = sqrt(1-sin(pars->theta)*cos(pars->phi))*sin(pars->psi);
+    b2_x = sqrt(1.0-sin(pars->theta)*cos(pars->phi))*cos(pars->psi);
+    b2_y = sqrt(1.0-sin(pars->theta)*cos(pars->phi))*sin(pars->psi);
 
     // a3 axis orientation
@@ -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;
     a3_dot_q = aa*q*cos_val_a3;