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

sasmodels/models/barbell.c

@@ -5 +5 @@
         double bell_radius, double radius, double length,
         double theta, double phi);
+
+#define INVALID(v) (v.bell_radius < v.radius)
 
 //barbell kernel - same as dumbell
@@ -58 +60 @@
           double bell_radius, double radius, double length)
 {
-    // Exclude invalid inputs.
-    if (bell_radius < radius) return NAN;
     const double h = -sqrt(bell_radius*bell_radius - radius*radius);
     const double half_length = 0.5*length;
@@ -100 +100 @@
     const double alpha = acos(cos_val); // rod angle relative to q
 
-    // Exclude invalid inputs.
-    if (bell_radius < radius) return NAN;
     const double h = -sqrt(square(bell_radius) - square(radius));
     const double half_length = 0.5*length;