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

Timestamp:

Nov 6, 2017 4: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/core_shell_bicelle_elliptical_belt_rough.c (modified) (2 diffs)

sasmodels/models/core_shell_bicelle_elliptical_belt_rough.c

@@ -91 +91 @@
           double sigma)
 {
-    // THIS NEEDS TESTING
+    // integrated 2d seems to match 1d reasonably well, except perhaps at very high Q
     // Vol1,2,3 and dr1,2,3 are now for Vcore, Vcore+rim, Vcore+face,
     const double dr1 = -rhor - rhoh + rhoc + rhosolv;
@@ -103 +103 @@
 
     // Compute effective radius in rotated coordinates
-    const double qr_hat = sqrt(square(r_major*qa) + square(r_minor*qb));
+    const double qr_hat = sqrt(square(r_major*qb) + square(r_minor*qa));
     // does this need to be changed for the "missing corners" where there there is no "belt" ?
-    const double qrshell_hat = sqrt(square((r_major+thick_rim)*qa)
-                                   + square((r_minor+thick_rim)*qb));
+    const double qrshell_hat = sqrt(square((r_major+thick_rim)*qb)
+                                   + square((r_minor+thick_rim)*qa));
     const double be1 = sas_2J1x_x( qr_hat );
     const double be2 = sas_2J1x_x( qrshell_hat );