Changeset f95556f in sasmodels for sasmodels

Timestamp:

Aug 1, 2016 8:54:35 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:

d119f34

Parents:

33875e3

Message:

hollow cylinder length is not limited by radius

File:

• sasmodels/models/hollow_cylinder.c (modified) (2 diffs)

sasmodels/models/hollow_cylinder.c

@@ -6 +6 @@
         double solvent_sld, double theta, double phi);
 
-#define INVALID(v) (v.core_radius >= v.radius || v.radius >= v.length)
+#define INVALID(v) (v.core_radius >= v.radius)
 
 // From Igor library
@@ -29 +29 @@
     double q, double core_radius, double radius, double length, double dum)
 {
-    //Note: lim_{r -> r_c} psi = J0(core_radius*qs)
     const double qs = q*sqrt(1.0-dum*dum);
     const double lam1 = sas_J1c(radius*qs);
     const double lam2 = sas_J1c(core_radius*qs);
     const double gamma_sq = square(core_radius/radius);
+    //Note: lim_{r -> r_c} psi = J0(core_radius*qs)
     const double psi = (lam1 - gamma_sq*lam2)/(1.0 - gamma_sq); //SRK 10/19/00
     const double t2 = sinc(q*length*dum/2.0);
-
     return square(psi*t2);
 }