Changeset dc6f601 in sasmodels

Timestamp:

Apr 6, 2018 12:14:23 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

fe6aa45, 7c3fb15

Parents:

885753a

Message:

restore up_frac_i/f behaviour of sasview 3.1.2

File:

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

sasmodels/kernel_iq.c

@@ -86 +86 @@
   //     w*I(q, rho1, rho2, ...) = I(q, sqrt(w)*rho1, sqrt(w)*rho2, ...)
   // which is likely to be the case for simple models.
-  weight[0] = ((1.0-in_spin) * (1.0-out_spin)); // dd
-  weight[1] = ((1.0-in_spin) * out_spin);       // du.real
-  weight[2] = (in_spin * (1.0-out_spin));       // ud.real
-  weight[3] = (in_spin * out_spin);             // uu
+  weight[0] = sqrt((1.0-in_spin) * (1.0-out_spin)); // dd
+  weight[1] = sqrt((1.0-in_spin) * out_spin);       // du.real
+  weight[2] = sqrt(in_spin * (1.0-out_spin));       // ud.real
+  weight[3] = sqrt(in_spin * out_spin);             // uu
   weight[4] = weight[1]; // du.imag
   weight[5] = weight[2]; // ud.imag
@@ -678 +678 @@
                     mag_sld(xs, qx, qy, px, py, values[sld_index+2], mx, my, mz);
 //if (q_index==0) printf("%d: (qx,qy)=(%g,%g) xs=%d sld%d=%g p=(%g,%g) m=(%g,%g,%g)\n",
-//q_index, qx, qy, xs, sk, local_values.vector[sld_index], px, py, mx, my, mz);
+//  q_index, qx, qy, xs, sk, local_values.vector[sld_index], px, py, mx, my, mz);
                 }
                 scattering += xs_weight * CALL_KERNEL();