Changeset 7c35fda in sasmodels

Timestamp:

May 31, 2018 10:07:31 AM (9 months ago)

Author:

Adam Washington <adam.washington@…>

Branches:

master, F1F2models_grethe, beta_approx, cuda-test, py3, ticket-1015-gpu-mem-error, ticket-1015-quick-fix, ticket-1022-sum_multiplicity, ticket-1157, ticket-608-user-defined-weights, ticket_1156, webgl_jitter_viewer

Children:

befe905

Parents:

84e89cd

Message:

Document reason for change in I(q)

File:

• sasmodels/kernel_iq.c (modified) (1 diff)

sasmodels/kernel_iq.c

@@ -83 +83 @@
   in_spin = clip(in_spin, 0.0, 1.0);
   out_spin = clip(out_spin, 0.0, 1.0);
-  // Note: sasview 3.1 scaled all slds by sqrt(weight) and assumed that
+  // Previous version of this function took the square root of the weights,
+  // under the assumption that 
+  //
   //     w*I(q, rho1, rho2, ...) = I(q, sqrt(w)*rho1, sqrt(w)*rho2, ...)
-  // which is likely to be the case for simple models.
+  //
+  // However, since the weights are applied to the final intensity and
+  // are not interned inside the I(q) function, we want the full
+  // weight and not the square root.  Any function using
+  // set_spin_weights as part of calculating an amplitude will need to
+  // manually take that square root, but there is currently no such
+  // function.
   weight[0] = (1.0-in_spin) * (1.0-out_spin); // dd
   weight[1] = (1.0-in_spin) * out_spin;       // du