Changeset 3c97ff0 in sasmodels

Timestamp:

Jan 6, 2016 9:23:47 PM (9 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:

3f832f9

Parents:

74667d3

Message:

code tidying

Location:

sasmodels/models

Files:

• barbell.c (modified) (4 diffs)
• cylinder.c (modified) (2 diffs)

sasmodels/models/barbell.c

@@ -1 +1 @@
 double form_volume(double bell_radius, double radius, double length);
-double Iq(double q, double sld, double solvent_sld, double bell_radius, double radius, double length);
+double Iq(double q, double sld, double solvent_sld,
+        double bell_radius, double radius, double length);
 double Iqxy(double qx, double qy, double sld, double solvent_sld,
-    double bell_radius, double radius, double length, double theta, double phi);
+        double bell_radius, double radius, double length,
+        double theta, double phi);
 
 //barbell kernel - same as dumbell
 double _bell_kernel(double q, double h, double bell_radius,
-    double length, double sin_alpha, double cos_alpha);
+        double length, double sin_alpha, double cos_alpha);
 double _bell_kernel(double q, double h, double bell_radius,
-    double length, double sin_alpha, double cos_alpha)
+        double length, double sin_alpha, double cos_alpha)
 {
     const double upper = 1.0;
@@ -16 +18 @@
     for (int i = 0; i < 76; i++){
         const double t = 0.5*(Gauss76Z[i]*(upper-lower)+upper+lower);
-            const double arg1 = q*cos_alpha*(bell_radius*t+h+length*0.5);
-            const double arg2 = q*bell_radius*sin_alpha*sqrt(1.0-t*t);
-
+        const double arg1 = q*cos_alpha*(bell_radius*t+h+length*0.5);
+        const double arg2 = q*bell_radius*sin_alpha*sqrt(1.0-t*t);
         const double be = (arg2 == 0.0 ? 0.5 :J1(arg2)/arg2);
-
-            const double Fq = cos(arg1)*(1.0-t*t)*be;
-
-            total += Gauss76Wt[i] * Fq;
+        const double Fq = cos(arg1)*(1.0-t*t)*be;
+        total += Gauss76Wt[i] * Fq;
     }
     const double integral = 0.5*(upper-lower)*total;
@@ -44 +43 @@
 
 double Iq(double q, double sld,
-    double solvent_sld,
-    double bell_radius,
-    double radius,
-    double length)
+        double solvent_sld,
+        double bell_radius,
+        double radius,
+        double length)
 {
     double sn, cn; // slots to hold sincos function output
@@ -84 +83 @@
 
 double Iqxy(double qx, double qy,
-    double sld,
-    double solvent_sld,
-    double bell_radius,
-    double radius,
-    double length,
-    double theta,
-    double phi)
+        double sld,
+        double solvent_sld,
+        double bell_radius,
+        double radius,
+        double length,
+        double theta,
+        double phi)
 {
      double sn, cn; // slots to hold sincos function output

sasmodels/models/cylinder.c

@@ -33 +33 @@
         // translate a point in [-1,1] to a point in [lower,upper]
         //const double alpha = ( Gauss76Z[i]*(upper-lower) + upper + lower )/2.0;
-        const double alpha = 0.5*(Gauss76Z[i]*M_PI_2 + M_PI_2);
+        const double alpha = M_PI_4*(Gauss76Z[i] + 1.0);
         double sn, cn;
         SINCOS(alpha, sn, cn);
         // For a bit of efficiency, we are moving the 2 V delta rho constant
-        // factor, 2Vd, out of the loop, so this is fq/2Vd rather than fq.
+        // factor, 2Vdrho, out of the loop, so this is fq/2Vdrho rather than fq.
         const double fq = _cyl(qr*sn, qh*cn);
         total += Gauss76Wt[i] * fq * fq * sn;
@@ -43 +43 @@
     // translate dx in [-1,1] to dx in [lower,upper]
     //const double form = (upper-lower)/2.0*total;
-    const double twovd = 2.0*(sld-solvent_sld)*form_volume(radius, length);
-    return 1.0e-4 * twovd * twovd * total * M_PI_4;
+    const double twoVdrho = 2.0*(sld-solvent_sld)*form_volume(radius, length);
+    return 1.0e-4 * twoVdrho * twoVdrho * total * M_PI_4;
 }