Changeset 9f4409a in sasmodels

Timestamp:

Mar 21, 2016 7:47:14 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:

0a7e5eb4, 0880966

Parents:

a6f9577

Message:

working monodispersity (finally)

File:

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

sasmodels/kernel_iq.c

@@ -63 +63 @@
       pvec[k] = pars[k+2];  // skip scale and background
     }
-    printf("calculating\n");
-
+
+    const double volume = CALL_VOLUME(local_pars);
     #ifdef USE_OPENMP
     #pragma omp parallel for
@@ -70 +70 @@
     for (int i=0; i < nq; i++) {
       const double scattering = CALL_IQ(q, i, local_pars);
-      result[i] += pars[0]*scattering + pars[1];
-    }
-    printf("returning\n");
+      result[i] = pars[0]*scattering/volume + pars[1];
+    }
     return;
   }