Changeset becded3 in sasmodels for sasmodels/models/hollow_cylinder.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/hollow_cylinder.c (modified) (4 diffs)

sasmodels/models/hollow_cylinder.c

@@ -1 @@
-double form_volume(double radius, double thickness, double length);
-double Iq(double q, double radius, double thickness, double length, double sld,
-    double solvent_sld);
-double Iqxy(double qx, double qy, double radius, double thickness, double length, double sld,
-    double solvent_sld, double theta, double phi);
-
 //#define INVALID(v) (v.radius_core >= v.radius)
 
@@ -28 +22 @@
 }
 
-double
+static double
 form_volume(double radius, double thickness, double length)
 {
@@ -36 +30 @@
 
 
-double
+static double
 Iq(double q, double radius, double thickness, double length,
     double sld, double solvent_sld)
@@ -57 +51 @@
 }
 
-double
-Iqxy(double qx, double qy,
+static double
+Iqxy(double qab, double qc,
     double radius, double thickness, double length,
-    double sld, double solvent_sld, double theta, double phi)
+    double sld, 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 form = _fq(qab, qc, radius, thickness, length);