Changeset ed23abe in sasmodels

Timestamp:

Oct 18, 2016 9:45:37 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:

c3ebc71

Parents:

6f676fb

Message:

hollow_cylinder: fix errors introduced by code cleanup

File:

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

sasmodels/models/hollow_cylinder.c

@@ -11 +11 @@
 _hollow_cylinder_scaling(double integrand, double delrho, double volume)
 {
-    return 1.0e-4 * square(volume * delrho * integrand);
+    return 1.0e-4 * square(volume * delrho) * integrand;
 }
 
@@ -32 +32 @@
 form_volume(double radius, double thickness, double length)
 {
-    double v_shell = M_PI*length*((radius+thickness)*(radius+thickness)-radius*radius);
-    return(v_shell);
+    double v_shell = M_PI*length*(square(radius+thickness) - radius*radius);
+    return v_shell;
 }
 
@@ -50 +50 @@
         const double inter = _hollow_cylinder_kernel(q, radius, thickness, length,
                                                      sin_val, cos_val);
-        summ += Gauss76Wt[i] * inter;
+        summ += Gauss76Wt[i] * inter * inter;
     }
 
@@ -69 +69 @@
 
     const double vol = form_volume(radius, thickness, length);
-    return _hollow_cylinder_scaling(Aq, solvent_sld-sld, vol);
+    return _hollow_cylinder_scaling(Aq*Aq, solvent_sld-sld, vol);
 }
 
-