Changeset becded3 in sasmodels for sasmodels/models/core_shell_ellipsoid.c

Timestamp:

Oct 17, 2017 4:21:27 PM (7 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:

8698a0d

Parents:

2a602c7

Message:

update oriented models to new interface (which will be in the next commit)

File:

• sasmodels/models/core_shell_ellipsoid.c (modified) (2 diffs)

sasmodels/models/core_shell_ellipsoid.c

@@ -75 +75 @@
 
 static double
-Iqxy(double qx, double qy,
+Iqxy(double qab, double qc,
     double radius_equat_core,
     double x_core,
@@ -82 +82 @@
     double core_sld,
     double shell_sld,
-    double solvent_sld,
-    double theta,
-    double phi)
+    double solvent_sld)
 {
-    double q, sin_alpha, cos_alpha;
-    ORIENT_SYMMETRIC(qx, qy, theta, phi, q, sin_alpha, cos_alpha);
-    const double qab = q*sin_alpha;
-    const double qc = q*cos_alpha;
-
     const double sld_core_shell = core_sld - shell_sld;
     const double sld_shell_solvent = shell_sld - solvent_sld;