Changeset 4628e31 in sasview for sansmodels/src/sans/models/c_extensions/fcc.c

Timestamp:

Oct 22, 2010 3:50:05 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:

d7b7156

Parents:

67e258c

Message:

changed the unit of angles into degrees

File:

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

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

@@ -73 +73 @@
         dp[3] = pars->sldSolv;
         dp[4] = 0.0;
+        //convert angle degree to radian
+        double theta = pars->theta * Pi/180.0;
+        double phi = pars->phi * Pi/180.0;
+        double psi = pars->psi * Pi/180.0;
 
         aa = pars->dnn;
@@ -85 +89 @@
         ///  instead of against q coordinate in PRB 36(46), 3(6), 1754(3854)
     // b3 axis orientation
-    b3_x = sin(pars->theta) * cos(pars->phi);//negative sign here???
-    b3_y = sin(pars->theta) * sin(pars->phi);
-    b3_z = cos(pars->theta);
+    b3_x = sin(theta) * cos(phi);//negative sign here???
+    b3_y = sin(theta) * sin(phi);
+    b3_z = cos(theta);
     cos_val_b3 =  b3_x*q_x + b3_y*q_y + b3_z*q_z;
     alpha = acos(cos_val_b3);
     // b1 axis orientation
-    b1_x = sin(pars->psi);
-    b1_y = cos(pars->psi);
+    b1_x = sin(psi);
+    b1_y = cos(psi);
         cos_val_b1 = (b1_x*q_x + b1_y*q_y);
     // b2 axis orientation