Changeset 2f5c6d4 in sasmodels for sasmodels/models/capped_cylinder.c

Timestamp:

Jul 25, 2016 10:38:21 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

a3a0c5c

Parents:

a4280bd

Message:

move valid parameter test to macro

File:

• sasmodels/models/capped_cylinder.c (modified) (3 diffs)

sasmodels/models/capped_cylinder.c

@@ -4 +4 @@
 double Iqxy(double qx, double qy, double sld, double solvent_sld,
     double radius, double cap_radius, double length, double theta, double phi);
+
+#define INVALID(v) (v.cap_radius < v.radius)
 
 // Integral over a convex lens kernel for t in [h/R,1].  See the docs for
@@ -79 +81 @@
           double radius, double cap_radius, double length)
 {
-    // Exclude invalid inputs.
-    if (cap_radius < radius) return NAN;
     const double h = sqrt(cap_radius*cap_radius - radius*radius);
     const double half_length = 0.5*length;
@@ -121 +121 @@
     const double alpha = acos(cos_val); // rod angle relative to q
 
-    // Exclude invalid inputs.
-    if (cap_radius < radius) return NAN;
     const double h = sqrt(cap_radius*cap_radius - radius*radius);
     const double half_length = 0.5*length;