Changeset a8631ca in sasmodels

Timestamp:

Oct 4, 2017 12:51:37 PM (7 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:

18a2bfc

Parents:

5772737

Message:

flexible_cylinder: make sure all branches are tested

Location:

sasmodels/models

Files:

• flexible_cylinder.py (modified) (1 diff)
• lib/wrc_cyl.c (modified) (5 diffs)

sasmodels/models/flexible_cylinder.py

@@ -90 +90 @@
     length = 10**np.random.uniform(2, 6)
     radius = 10**np.random.uniform(1, 3)
-    kuhn_length = 10**np.random.uniform(-2, -0.7)*length  # at least 10 segments
+    kuhn_length = 10**np.random.uniform(-2, 0)*length
     pars = dict(
         length=length,

sasmodels/models/lib/wrc_cyl.c

@@ -54 +54 @@
 
 static double
-a_long(double qp, double L, double b/*, double p1, double p2, double q0*/)
+a_long(double q, double L, double b/*, double p1, double p2, double q0*/)
 {
     const double p1 = 4.12;
@@ -69 +69 @@
 
     const double C = (L/b>10.0 ? 3.06*pow(L/b, -0.44) : 1.0);
+    //printf("branch B-%d q=%g L=%g b=%g\n", C==1.0, q, L, b);
     const double r2 = Rgsquare(L,b);
     const double r = sqrt(r2);
@@ -97 +98 @@
     const double a2 = t1*pow(q0,-p1)*(t12 + b*p1/q0*t13);
 
-    const double ans = a1*pow(qp*b, -p1) + a2*pow(qp*b, -p2) + M_PI/(qp*L);
+    const double ans = a1*pow(q*b, -p1) + a2*pow(q*b, -p2) + M_PI/(q*L);
     return ans;
 }
@@ -173 +174 @@
 
     if (qdel < 0) {
+        //printf("branch A1-%d q=%g L=%g b=%g\n", C==1.0, q, L, b);
         return t9 + Sexv_orig;
     } else {
+        //printf("branch A2-%d q=%g L=%g b=%g\n", C==1.0, q, L, b);
         const double w = w_WR(qr);
         const double t10 = Sdebye(qr*qr)*(1.0 - w);
@@ -198 +201 @@
         if (q*b <= q0short) { // q*b <= fmax(1.9/Rg_short, 3)
             // 2017-10-01 pkienzle: moved low q approximation into Sdebye()
+            //printf("branch C-%d q=%g L=%g b=%g\n", square(q*Rg_short)<DEBYE_CUTOFF, q, L, b);
             ans = Sdebye(square(q*Rg_short));
         } else {  // q*b > max(1.9/Rg_short, 3)
+            //printf("branch D q=%g L=%g b=%g\n", q, L, b);
             ans = a_short(q, L, b /*, p1short, p2short*/, q0short);
         }