Changeset 8f20419d in sasview for sansmodels/src/sans/models/c_extensions/sc.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/sc.c (modified) (1 diff)

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

@@ -99 +99 @@
 
     // a2 axis orientation
-    a2_x = sqrt(1-sin(pars->theta)*cos(pars->phi))*cos(pars->psi);
-    a2_y = sqrt(1-sin(pars->theta)*cos(pars->phi))*sin(pars->psi);
+    a2_x = sqrt(1.0-sin(pars->theta)*cos(pars->phi))*cos(pars->psi);
+    a2_y = sqrt(1.0-sin(pars->theta)*cos(pars->phi))*sin(pars->psi);
     // a2 axis
-    cos_val_a2 = sin(acos(cos_val_a1)) ;
+    cos_val_a2 =  a2_x*q_x + a2_y*q_y;//sin(acos(cos_val_a1)) ;
     a2_dot_q = aa*q*cos_val_a2;