Changeset c138211 in sasmodels

Timestamp:

Dec 21, 2015 9:32:08 AM (9 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:

4c2c535

Parents:

5258859

Message:

return NAN to signal invalid kernel parameters

Location:

sasmodels

Files:

• kernel_template.c (modified) (2 diffs)
• models/barbell.c (modified) (2 diffs)
• models/capped_cylinder.c (modified) (2 diffs)
• models/triaxial_ellipsoid.c (modified) (2 diffs)

sasmodels/kernel_template.c

@@ -125 +125 @@
     if (weight > cutoff) {
       const double scattering = Iq(qi, IQ_PARAMETERS);
-      //if (scattering >= 0.0) { // scattering cannot be negative
+      // allow kernels to exclude invalid regions by returning NaN
+      if (!isnan(scattering)) {
         ret += weight*scattering;
         norm += weight;
@@ -133 +134 @@
         norm_vol += vol_weight;
       #endif
-      //}
+      }
     //else { printf("exclude qx,qy,I:%%g,%%g,%%g\n",qi,scattering); }
     }

sasmodels/models/barbell.c

@@ -51 +51 @@
     double sn, cn; // slots to hold sincos function output
 
-    if (bell_radius < radius) return -1.0;
+    if (bell_radius < radius) return NAN;
 
     const double lower = 0.0;
@@ -95 +95 @@
 
     // Exclude invalid inputs.
-    if (bell_radius < radius) return -1.0;
+    if (bell_radius < radius) return NAN;
 
     // Compute angle alpha between q and the cylinder axis

sasmodels/models/capped_cylinder.c

@@ -88 +88 @@
 
     // Exclude invalid inputs.
-    if (cap_radius < radius) return -1.0;
+    if (cap_radius < radius) return NAN;
 
     const double lower = 0.0;
@@ -138 +138 @@
 
     // Exclude invalid inputs.
-    if (cap_radius < radius) return -1.0;
+    if (cap_radius < radius) return NAN;
 
     // Compute angle alpha between q and the cylinder axis

sasmodels/models/triaxial_ellipsoid.c

@@ -17 +17 @@
     double rpolar)
 {
-    // if (req_minor > req_major || req_major > rpolar) return -1.0;  // Exclude invalid region
+    // if (req_minor > req_major || req_major > rpolar) return NAN;  // Exclude invalid region
 
     double sn, cn;
@@ -62 +62 @@
     double psi)
 {
-    // if (req_minor > req_major || req_major > rpolar) return -1.0;  // Exclude invalid region
+    // if (req_minor > req_major || req_major > rpolar) return NAN;  // Exclude invalid region
 
     double stheta, ctheta;