Changeset 61104c8 in sasmodels for sasmodels/models/elliptical_cylinder.c
 Timestamp:
 Mar 22, 2017 8:13:13 PM (7 years ago)
 Branches:
 master, core_shell_microgels, costrafo411, magnetic_model, ticket1257vesicleproduct, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
 Children:
 50beefe
 Parents:
 3b571ae
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

sasmodels/models/elliptical_cylinder.c
r592343f r61104c8 67 67 double theta, double phi, double psi) 68 68 { 69 double q, cos_val, cos_mu, cos_nu;70 ORIENT_ASYMMETRIC(qx, qy, theta, phi, psi, q, cos_val, cos_mu, cos_nu);69 double q, xhat, yhat, zhat; 70 ORIENT_ASYMMETRIC(qx, qy, theta, phi, psi, q, xhat, yhat, zhat); 71 71 72 72 // Compute: r = sqrt((radius_major*cos_nu)^2 + (radius_minor*cos_mu)^2) 73 73 // Given: radius_major = r_ratio * radius_minor 74 const double r = radius_minor*sqrt(square(r_ratio* cos_nu) + cos_mu*cos_mu);74 const double r = radius_minor*sqrt(square(r_ratio*xhat) + square(yhat)); 75 75 const double be = sas_2J1x_x(q*r); 76 const double si = sas_sinx_x(q* 0.5*length*cos_val);76 const double si = sas_sinx_x(q*zhat*0.5*length); 77 77 const double Aq = be * si; 78 78 const double delrho = sld  solvent_sld;
Note: See TracChangeset
for help on using the changeset viewer.