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

Timestamp:

Jul 26, 2016 12:38:21 AM (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/triaxial_ellipsoid.c (modified) (3 diffs)

sasmodels/models/triaxial_ellipsoid.c

@@ -4 +4 @@
 double Iqxy(double qx, double qy, double sld, double solvent_sld,
     double req_minor, double req_major, double rpolar, double theta, double phi, double psi);
+
+//#define INVALID(v) (v.req_minor > v.req_major || v.req_major > v.rpolar)
+
 
 double form_volume(double req_minor, double req_major, double rpolar)
@@ -17 +20 @@
     double rpolar)
 {
-    // if (req_minor > req_major || req_major > rpolar) return NAN;  // Exclude invalid region
-
     double sn, cn;
     // translate a point in [-1,1] to a point in [0, 1]
@@ -57 +58 @@
     double psi)
 {
-    // if (req_minor > req_major || req_major > rpolar) return NAN;  // Exclude invalid region
-
     double stheta, ctheta;
     double sphi, cphi;