Changeset ce27e21 in sasmodels for sasmodels/models/cylinder.c

Timestamp:

Aug 24, 2014 5:18:14 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:

1780d59

Parents:

14de349

Message:

first pass for sasview wrapper around opencl models

File:

• sasmodels/models/cylinder.c (modified) (3 diffs)

sasmodels/models/cylinder.c

@@ -140 +140 @@
 DOCUMENTATION END
 */
-real volume(real radius, real length);
+real form_volume(real radius, real length);
 real Iq(real q, real sld, real solvent_sld, real radius, real length);
 real Iqxy(real qx, real qy, real sld, real solvent_sld, real radius, real length, real theta, real phi);
 
 
-real volume(real radius, real length)
+real form_volume(real radius, real length)
 {
     return M_PI*radius*radius*length;
 }
-
 
 real Iq(real q,
@@ -170 +169 @@
     // NOTE that for this (Fournet) definition of the integral, one must MULTIPLY by Vcyl
     // The additional volume factor is for polydisperse volume normalization.
-    const real s = (sld - solvent_sld) * volume(radius, length);
+    const real s = (sld - solvent_sld) * form_volume(radius, length);
     return REAL(1.0e-4) * form * s * s;
 }
@@ -203 +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 = REAL(4.0)*bj*bj*si*si;
+    const real form = bj*bj*si*si;
 
     // Multiply by contrast^2, normalize by cylinder volume and convert to cm-1
     // NOTE that for this (Fournet) definition of the integral, one must MULTIPLY by Vcyl
     // The additional volume factor is for polydisperse volume normalization.
-    const real s = (sld - solvent_sld) * volume(radius, length);
+    const real s = (sld - solvent_sld) * form_volume(radius, length);
     return REAL(1.0e-4) * form * s * s; // * correction;
 }