Changeset c138211 in sasmodels for sasmodels/kernel_template.c

Timestamp:

Dec 21, 2015 11:32:08 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:

4c2c535

Parents:

5258859

Message:

return NAN to signal invalid kernel parameters

File:

• sasmodels/kernel_template.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); }
     }