Changeset db298c0 in sasview for sansmodels


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • sansmodels/src/c_models/stackeddisks.cpp

    re08bd5b rdb298c0  
    6363  double d, dum, halfheight; 
    6464  double answer; 
     65  double theta = pars->axis_theta * pi/180.0; 
     66  double phi = pars->axis_phi * pi/180.0; 
    6567 
    6668 
    6769 
    6870  // parallelepiped orientation 
    69   cyl_x = sin(pars->axis_theta) * cos(pars->axis_phi); 
    70   cyl_y = sin(pars->axis_theta) * sin(pars->axis_phi); 
    71   cyl_z = cos(pars->axis_theta); 
     71  cyl_x = sin(theta) * cos(phi); 
     72  cyl_y = sin(theta) * sin(phi); 
     73  cyl_z = cos(theta); 
    7274 
    7375  // q vector 
Note: See TracChangeset for help on using the changeset viewer.