Changes in sasmodels/models/hollow_cylinder.c [a807206:aea2e2a] in sasmodels

File:

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

sasmodels/models/hollow_cylinder.c

@@ -1 @@
-double form_volume(double radius, double radius_core, double length);
+double form_volume(double radius, double thickness, double length);
 
-double Iq(double q, double radius, double radius_core, double length, double sld,
+double Iq(double q, double radius, double thickness, double length, double sld,
         double solvent_sld);
-double Iqxy(double qx, double qy, double radius, double radius_core, double length, double sld,
+double Iqxy(double qx, double qy, double radius, double thickness, double length, double sld,
         double solvent_sld, double theta, double phi);
 
-#define INVALID(v) (v.radius_core >= v.radius)
+//#define INVALID(v) (v.radius_core >= v.radius)
 
 // From Igor library
@@ -27 +27 @@
 
 static double _hollow_cylinder_kernel(
-    double q, double radius_core, double radius, double length, double dum)
+    double q, double radius, double thickness, double length, double dum)
 {
     const double qs = q*sqrt(1.0-dum*dum);
-    const double lam1 = sas_J1c(radius*qs);
-    const double lam2 = sas_J1c(radius_core*qs);
-    const double gamma_sq = square(radius_core/radius);
+    const double lam1 = sas_J1c((radius+thickness)*qs);
+    const double lam2 = sas_J1c(radius*qs);
+    const double gamma_sq = square(radius/(radius+thickness));
     //Note: lim_{r -> r_c} psi = J0(radius_core*qs)
     const double psi = (lam1 - gamma_sq*lam2)/(1.0 - gamma_sq); //SRK 10/19/00
@@ -41 +41 @@
 
 static double hollow_cylinder_analytical_2D_scaled(
-    double q, double q_x, double q_y, double radius, double radius_core,
+    double q, double q_x, double q_y, double radius, double thickness,
     double length, double sld, double solvent_sld, double theta, double phi)
 {
@@ -65 +65 @@
     cos_val = cyl_x*q_x + cyl_y*q_y;// + cyl_z*q_z;
 
-    answer = _hollow_cylinder_kernel(q, radius_core, radius, length, cos_val);
+    answer = _hollow_cylinder_kernel(q, radius, thickness, length, cos_val);
 
-    vol = form_volume(radius, radius_core, length);
+    vol = form_volume(radius, thickness, length);
     answer = hollow_cylinder_scaling(answer, delrho, vol);
 
@@ -74 +74 @@
 
 
-double form_volume(double radius, double radius_core, double length)
+double form_volume(double radius, double thickness, double length)
 {
-    double v_shell = M_PI*length*(radius*radius-radius_core*radius_core);
+    double v_shell = M_PI*length*((radius+thickness)*(radius+thickness)-radius*radius);
     return(v_shell);
 }
 
 
-double Iq(double q, double radius, double radius_core, double length,
+double Iq(double q, double radius, double thickness, double length,
     double sld, double solvent_sld)
 {
@@ -95 +95 @@
     for (i=0;i<76;i++) {
         zi = ( Gauss76Z[i] * (upper-lower) + lower + upper )/2.0;
-        inter = Gauss76Wt[i] * _hollow_cylinder_kernel(q, radius_core, radius, length, zi);
+        inter = Gauss76Wt[i] * _hollow_cylinder_kernel(q, radius, thickness, length, zi);
         summ += inter;
     }
 
     norm = summ*(upper-lower)/2.0;
-    volume = form_volume(radius, radius_core, length);
+    volume = form_volume(radius, thickness, length);
     delrho = solvent_sld - sld;
     answer = hollow_cylinder_scaling(norm, delrho, volume);
@@ -108 +108 @@
 
 
-double Iqxy(double qx, double qy, double radius, double radius_core,
+double Iqxy(double qx, double qy, double radius, double thickness,
     double length, double sld, double solvent_sld, double theta, double phi)
 {
     const double q = sqrt(qx*qx+qy*qy);
-    return hollow_cylinder_analytical_2D_scaled(q, qx/q, qy/q, radius, radius_core, length, sld, solvent_sld, theta, phi);
+    return hollow_cylinder_analytical_2D_scaled(q, qx/q, qy/q, radius, thickness, length, sld, solvent_sld, theta, phi);
 }