Changeset 398aa94 in sasmodels

Timestamp:

Apr 6, 2016 5:19:56 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:

ee8f734

Parents:

3fb3449

Message:

protect against zero norm

File:

• sasmodels/kernel_iq.c (modified) (3 diffs)

sasmodels/kernel_iq.c

@@ -84 +84 @@
 
     const double norm = CALL_VOLUME(local_values);
+    const double scale = values[0];
+    const double background = values[1];
     #ifdef USE_OPENMP
     #pragma omp parallel for
@@ -90 +92 @@
     for (int i=0; i < nq; i++) {
       double scattering = CALL_IQ(q, i, local_values);
-      result[i] = values[0]*scattering/norm + values[1];
+      result[i] = (norm>0. ? scale*scattering/norm + background : background);
     }
     return;
@@ -203 +205 @@
   }
 
-  // Make normalization available for the next round
+  // Accumulate norm.
   result[nq] += norm;
 
   // End of the PD loop we can normalize
   if (pd_stop >= problem->total_pd) {
+    const double scale = values[0];
+    const double background = values[1];
     #ifdef USE_OPENMP
     #pragma omp parallel for
     #endif
     for (int i=0; i < nq; i++) {
-      result[i] = values[0]*result[i]/norm + values[1];
+      result[i] = (norm>0. ? scale*scattering/norm + background : background);
     }
   }