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

Timestamp:

Oct 22, 2010 5: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/sc.c (modified) (4 diffs)

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

@@ -73 +73 @@
         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;
         Da = pars->d_factor*aa;
@@ -80 +85 @@
         /// Angles here are respect to detector coordinate instead of against q coordinate(PRB 36, 3, 1754)
     // a3 axis orientation
-    a3_x = sin(pars->theta) * cos(pars->phi);//negative sign here???
-    a3_y = sin(pars->theta) * sin(pars->phi);
-    a3_z = cos(pars->theta);
+    a3_x = sin(theta) * cos(phi);//negative sign here???
+    a3_y = sin(theta) * sin(phi);
+    a3_z = cos(theta);
 
     // q vector
@@ -93 +98 @@
     a3_dot_q = aa*q*cos_val_a3;
     // a1 axis orientation
-    a1_x = sin(pars->psi);
-    a1_y = cos(pars->psi);
+    a1_x = sin(psi);
+    a1_y = cos(psi);
 
     cos_val_a1 = a1_x*q_x + a1_y*q_y;
@@ -100 +105 @@
 
     // a2 axis orientation
-    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_x = sqrt(1.0-sin(theta)*cos(phi))*cos(psi);
+    a2_y = sqrt(1.0-sin(theta)*cos(phi))*sin(psi);
     // a2 axis
     cos_val_a2 =  sin(acos(cos_val_a1));//a2_x*q_x + a2_y*q_y;