Changeset 9aa4881 in sasmodels

Timestamp:

Oct 17, 2016 11:46:14 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

92ce163

Parents:

f719764

Message:

fix error introduced with sas_J1c() usage 'correction'; accidentally introduced a factor of 4 error

File:

• sasmodels/models/core_shell_cylinder.c (modified) (4 diffs)

sasmodels/models/core_shell_cylinder.c

@@ -5 +5 @@
     double radius, double thickness, double length, double theta, double phi);
 
-// twovd = 2 * volume * delta_rho
+// vd = volume * delta_rho
 // besarg = q * R * sin(alpha)
 // siarg = q * L/2 * cos(alpha)
-double _cyl(double twovd, double besarg, double siarg);
-double _cyl(double twovd, double besarg, double siarg)
+double _cyl(double vd, double besarg, double siarg);
+double _cyl(double vd, double besarg, double siarg)
 {
-    return twovd * sinc(siarg) * sas_J1c(besarg);
+    return vd * sinc(siarg) * sas_J1c(besarg);
 }
 
@@ -30 +30 @@
     const double core_qr = q*radius;
     const double core_qh = q*0.5*length;
-    const double core_twovd = 2.0 * form_volume(radius,0,length)
-                            * (core_sld-shell_sld);
+    const double core_vd = form_volume(radius,0,length) * (core_sld-shell_sld);
     const double shell_qr = q*(radius + thickness);
     const double shell_qh = q*(0.5*length + thickness);
-    const double shell_twovd = 2.0 * form_volume(radius,thickness,length)
-                             * (shell_sld-solvent_sld);
+    const double shell_vd = form_volume(radius,thickness,length) * (shell_sld-solvent_sld);
     double total = 0.0;
     // double lower=0, upper=M_PI_2;
@@ -44 +42 @@
         const double alpha = 0.5*(Gauss76Z[i]*M_PI_2 + M_PI_2);
         SINCOS(alpha, sn, cn);
-        const double fq = _cyl(core_twovd, core_qr*sn, core_qh*cn)
-            + _cyl(shell_twovd, shell_qr*sn, shell_qh*cn);
+        const double fq = _cyl(core_vd, core_qr*sn, core_qh*cn)
+            + _cyl(shell_vd, shell_qr*sn, shell_qh*cn);
         total += Gauss76Wt[i] * fq * fq * sn;
     }
@@ -69 +67 @@
     const double core_qr = q*radius;
     const double core_qh = q*0.5*length;
-    const double core_twovd = 2.0 * form_volume(radius,0,length)
-                            * (core_sld-shell_sld);
+    const double core_vd = form_volume(radius,0,length) * (core_sld-shell_sld);
     const double shell_qr = q*(radius + thickness);
     const double shell_qh = q*(0.5*length + thickness);
-    const double shell_twovd = 2.0 * form_volume(radius,thickness,length)
-                             * (shell_sld-solvent_sld);
+    const double shell_vd = form_volume(radius,thickness,length) * (shell_sld-solvent_sld);
 
-    const double fq = _cyl(core_twovd, core_qr*sin_alpha, core_qh*cos_alpha)
-        + _cyl(shell_twovd, shell_qr*sin_alpha, shell_qh*cos_alpha);
+    const double fq = _cyl(core_vd, core_qr*sin_alpha, core_qh*cos_alpha)
+        + _cyl(shell_vd, shell_qr*sin_alpha, shell_qh*cos_alpha);
     return 1.0e-4 * fq * fq;
 }