Changeset 1f21edf in sasmodels

Timestamp:

Aug 24, 2014 8:44:15 PM (10 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:

32c160a

Parents:

1780d59

Message:

restore missing 4x in cylinder.c form

Location:

sasmodels/models

Files:

• cylinder.c (modified) (1 diff)
• cylinder_clone.c (modified) (2 diffs)

sasmodels/models/cylinder.c

@@ -202 +202 @@
     const real bj = (besarg == REAL(0.0) ? REAL(0.5) : J1(besarg)/besarg);
     const real si = (siarg == REAL(0.0) ? REAL(1.0) : sin(siarg)/siarg);
-    const real form = bj*bj*si*si;
+    const real form = REAL(4.0)*bj*bj*si*si;
 
     // Multiply by contrast^2, normalize by cylinder volume and convert to cm-1

sasmodels/models/cylinder_clone.c

@@ -203 +203 @@
     const real bj = (besarg == REAL(0.0) ? REAL(0.5) : J1(besarg)/besarg);
     const real si = (siarg == REAL(0.0) ? REAL(1.0) : sin(siarg)/siarg);
-    const real form = bj*bj*si*si;
+    const real form = REAL(4.0)*bj*bj*si*si;
 
     // Multiply by contrast^2, normalize by cylinder volume and convert to cm-1
@@ -209 +209 @@
     // The additional volume factor is for polydisperse volume normalization.
     const real s = (sldCyl - sldSolv) * form_volume(radius, length);
-    return REAL(4.0e8) * form * s * s; // * correction;
-}
+    return REAL(1.0e8) * form * s * s; // * correction;
+}