Changeset d2bb604 in sasmodels for sasmodels/models/flexible_cylinder.c

Timestamp:

Apr 5, 2016 2:34:30 PM (8 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:

21b116f

Parents:

1e2a1ba

Message:

fix models so all dll tests pass

File:

• sasmodels/models/flexible_cylinder.c (modified) (1 diff)

sasmodels/models/flexible_cylinder.c

@@ -1 @@
-double form_volume(double length, double kuhn_length, double radius);
-double Iq(double q, double length, double kuhn_length, double radius,
-          double sld, double solvent_sld);
-double Iqxy(double qx, double qy, double length, double kuhn_length,
-            double radius, double sld, double solvent_sld);
-double flexible_cylinder_kernel(double q, double length, double kuhn_length,
-                                double radius, double sld, double solvent_sld);
-
-
-double form_volume(double length, double kuhn_length, double radius)
+static double
+form_volume(length, kuhn_length, radius)
 {
-
-      return 0.0;
+    return 1.;
 }
 
-double flexible_cylinder_kernel(double q,
-          double length,
-          double kuhn_length,
-          double radius,
-          double sld,
-          double solvent_sld)
+static double
+Iq(double q,
+   double length,
+   double kuhn_length,
+   double radius,
+   double sld,
+   double solvent_sld)
 {
-
-    const double cont = sld-solvent_sld;
-    const double qr = q*radius;
-    //const double crossSect = (2.0*J1(qr)/qr)*(2.0*J1(qr)/qr);
-    const double crossSect = sas_J1c(qr);
-    double flex = Sk_WR(q,length,kuhn_length);
-    flex *= crossSect*crossSect;
-    flex *= M_PI*radius*radius*length;
-    flex *= cont*cont;
-    flex *= 1.0e-4;
-    return flex;
+    const double contrast = sld - solvent_sld;
+    const double cross_section = sas_J1c(q*radius);
+    const double volume = M_PI*radius*radius*length;
+    const double flex = Sk_WR(q, length, kuhn_length);
+    return 1.0e-4 * volume * square(contrast*cross_section) * flex;
 }
-
-double Iq(double q,
-          double length,
-          double kuhn_length,
-          double radius,
-          double sld,
-          double solvent_sld)
-{
-
-    double result = flexible_cylinder_kernel(q, length, kuhn_length, radius, sld, solvent_sld);
-    return result;
-}
-
-double Iqxy(double qx, double qy,
-            double length,
-            double kuhn_length,
-            double radius,
-            double sld,
-            double solvent_sld)
-{
-    double q;
-    q = sqrt(qx*qx+qy*qy);
-    double result = flexible_cylinder_kernel(q, length, kuhn_length, radius, sld, solvent_sld);
-
-    return result;
-}