Changeset 4628e31 in sasview for sansmodels/src/sans/models/c_extensions/csparallelepiped.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/csparallelepiped.c (modified) (5 diffs)

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

@@ -48 +48 @@
         double rhoA,rhoB,rhoC, rhoP, rhosolv;
         double dr0, drA,drB, drC;
-        double Pi,retVal;
+        double retVal;
 
         aa = dp[1];
@@ -181 +181 @@
 
         double answer;
-        double pi = 4.0*atan(1.0);
 
         edgeA = pars->shortA;
@@ -187 +186 @@
         edgeC = pars->longC;
 
+        //convert angle degree to radian
+        double pi = 4.0*atan(1.0);
+        double theta = pars->parallel_theta * pi/180.0;
+        double phi = pars->parallel_phi * pi/180.0;
+        double psi = pars->parallel_psi* pi/180.0;
 
     // parallelepiped c axis orientation
-    cparallel_x = sin(pars->parallel_theta) * cos(pars->parallel_phi);
-    cparallel_y = sin(pars->parallel_theta) * sin(pars->parallel_phi);
-    cparallel_z = cos(pars->parallel_theta);
+    cparallel_x = sin(theta) * cos(phi);
+    cparallel_y = sin(theta) * sin(phi);
+    cparallel_z = cos(theta);
 
     // q vector
@@ -202 +206 @@
 
     // parallelepiped a axis orientation
-    parallel_x = sin(pars->parallel_psi);//cos(pars->parallel_theta) * sin(pars->parallel_phi)*sin(pars->parallel_psi);
-    parallel_y = cos(pars->parallel_psi);//cos(pars->parallel_theta) * cos(pars->parallel_phi)*cos(pars->parallel_psi);
+    parallel_x = sin(psi);//cos(pars->parallel_theta) * sin(pars->parallel_phi)*sin(pars->parallel_psi);
+    parallel_y = cos(psi);//cos(pars->parallel_theta) * cos(pars->parallel_phi)*cos(pars->parallel_psi);
 
     cos_val_a = parallel_x*q_x + parallel_y*q_y;
@@ -210 +214 @@
 
     // parallelepiped b axis orientation
-    bparallel_x = sqrt(1.0-sin(pars->parallel_theta)*cos(pars->parallel_phi))*cos(pars->parallel_psi);//cos(pars->parallel_theta) * cos(pars->parallel_phi)* cos(pars->parallel_psi);
-    bparallel_y = sqrt(1.0-sin(pars->parallel_theta)*cos(pars->parallel_phi))*sin(pars->parallel_psi);//cos(pars->parallel_theta) * sin(pars->parallel_phi)* sin(pars->parallel_psi);
+    bparallel_x = sqrt(1.0-sin(theta)*cos(phi))*cos(psi);//cos(pars->parallel_theta) * cos(pars->parallel_phi)* cos(pars->parallel_psi);
+    bparallel_y = sqrt(1.0-sin(theta)*cos(phi))*sin(psi);//cos(pars->parallel_theta) * sin(pars->parallel_phi)* sin(pars->parallel_psi);
     // axis of the parallelepiped
     cos_val_b = sin(acos(cos_val_a)) ;