Changeset d4db147 in sasmodels for sasmodels/models/elliptical_cylinder.c

Timestamp:

Nov 6, 2017 2:11:48 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

9248bf7

Parents:

ff31782 (diff), d8ac2ad (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ticket-786' into generic_integration_loop

File:

• sasmodels/models/elliptical_cylinder.c (modified) (1 diff)

sasmodels/models/elliptical_cylinder.c

@@ -60 +60 @@
     // Compute:  r = sqrt((radius_major*cos_nu)^2 + (radius_minor*cos_mu)^2)
     // Given:    radius_major = r_ratio * radius_minor
-    const double qr = radius_minor*sqrt(square(r_ratio*qa) + square(qb));
+    const double qr = radius_minor*sqrt(square(r_ratio*qb) + square(qa));
     const double be = sas_2J1x_x(qr);
     const double si = sas_sinx_x(qc*0.5*length);