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

Timestamp:

Oct 17, 2017 6: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/sc_paracrystal.c (modified) (2 diffs)

sasmodels/models/sc_paracrystal.c

@@ -36 +36 @@
 
 
-static double Iq(double q, double dnn,
-  double d_factor, double radius,
-  double sld, double solvent_sld)
+static double
+Iq(double q, double dnn,
+    double d_factor, double radius,
+    double sld, double solvent_sld)
 {
     // translate a point in [-1,1] to a point in [0, 2 pi]
@@ -76 +77 @@
 
 
-static double Iqxy(double qx, double qy,
+static double
+Iqxy(double qa, double qb, double qc,
     double dnn, double d_factor, double radius,
-    double sld, double solvent_sld,
-    double theta, double phi, double psi)
+    double sld, double solvent_sld)
 {
-    double q, zhat, yhat, xhat;
-    ORIENT_ASYMMETRIC(qx, qy, theta, phi, psi, q, xhat, yhat, zhat);
-    const double qa = q*xhat;
-    const double qb = q*yhat;
-    const double qc = q*zhat;
-
-    q = sqrt(qa*qa + qb*qb + qc*qc);
+    const double q = sqrt(qa*qa + qb*qb + qc*qc);
     const double Pq = sphere_form(q, radius, sld, solvent_sld);
     const double Zq = sc_Zq(qa, qb, qc, dnn, d_factor);