Changeset db298c0 in sasview for sansmodels/src/c_models/stackeddisks.cpp

Timestamp:

Sep 14, 2012 12:36:53 PM (12 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:

8106f88

Parents:

162c778

Message:

stackeddisc: 2d angle unit problem fixed

File:

• sansmodels/src/c_models/stackeddisks.cpp (modified) (1 diff)

sansmodels/src/c_models/stackeddisks.cpp

@@ -63 +63 @@
   double d, dum, halfheight;
   double answer;
+  double theta = pars->axis_theta * pi/180.0;
+  double phi = pars->axis_phi * pi/180.0;
 
 
 
   // parallelepiped orientation
-  cyl_x = sin(pars->axis_theta) * cos(pars->axis_phi);
-  cyl_y = sin(pars->axis_theta) * sin(pars->axis_phi);
-  cyl_z = cos(pars->axis_theta);
+  cyl_x = sin(theta) * cos(phi);
+  cyl_y = sin(theta) * sin(phi);
+  cyl_z = cos(theta);
 
   // q vector