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

sasmodels/models/barbell.c

@@ -1 @@
-double form_volume(double radius_bell, double radius, double length);
-double Iq(double q, double sld, double solvent_sld,
-        double radius_bell, double radius, double length);
-double Iqxy(double qx, double qy, double sld, double solvent_sld,
-        double radius_bell, double radius, double length,
-        double theta, double phi);
-
 #define INVALID(v) (v.radius_bell < v.radius)
 
@@ -55 +48 @@
 }
 
-
-double form_volume(double radius_bell,
-        double radius,
-        double length)
+static double
+form_volume(double radius_bell,
+    double radius,
+    double length)
 {
     // bell radius should never be less than radius when this is called
@@ -69 +62 @@
 }
 
-double Iq(double q, double sld, double solvent_sld,
-          double radius_bell, double radius, double length)
+static double
+Iq(double q, double sld, double solvent_sld,
+    double radius_bell, double radius, double length)
 {
     const double h = -sqrt(radius_bell*radius_bell - radius*radius);
@@ -95 +89 @@
 
 
-double Iqxy(double qx, double qy,
-        double sld, double solvent_sld,
-        double radius_bell, double radius, double length,
-        double theta, double phi)
+static double
+Iqxy(double qab, double qc,
+    double sld, double solvent_sld,
+    double radius_bell, double radius, double length)
 {
-    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 h = -sqrt(square(radius_bell) - square(radius));
     const double Aq = _fq(qab, qc, h, radius_bell, radius, 0.5*length);