Changeset 463eb76e in sasview for sansmodels/src/sans/models/c_extensions/pearlnecklace.c

Timestamp:

Jul 25, 2011 3:43:34 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

bc7bc839

Parents:

38155f7

Message:

implementation of pearlneckclace model: need utest and doc

File:

• sansmodels/src/sans/models/c_extensions/pearlnecklace.c (modified) (4 diffs)

sansmodels/src/sans/models/c_extensions/pearlnecklace.c

@@ -53 +53 @@
         // Note take only 20 terms in Si series: 10 terms may be enough though.
         double gamma;
-        gamma = Si(q* edge_separation, 6);
+        gamma = Si(q* edge_separation);
         gamma /= (q* edge_separation);
         double beta;
-        beta = Si(q * (edge_separation + radius), 6);
-        beta -= Si(q * radius, 6);
+        beta = Si(q * (edge_separation + radius));
+        beta -= Si(q * radius);
         beta /= (q* edge_separation);
 
@@ -68 +68 @@
 
         // form factor for num_pearls
-        sss = 1.0 - pow(sin_x(q*A_s), (int)num_pearls );
-        sss /= pow((1.0-sin_x(q*A_s)), 2);
-        sss *= sin_x(q*A_s);
+        sss = 1.0 - pow(sinc(q*A_s), num_pearls );
+        sss /= pow((1.0-sinc(q*A_s)), 2);
+        sss *= -sinc(q*A_s);
         sss -= num_pearls/2.0;
-        sss += num_pearls/(1.0-sin_x(q*A_s));
+        sss += num_pearls/(1.0-sinc(q*A_s));
         sss *= 2.0 * pow((m_s*psi), 2);
 
         // form factor for num_strings (like thin rods)
         double srr_1;
-        srr_1 = -pow(sin_x(q*edge_separation/2.0), 2);
-        //printf ("sss %g, %g, %g\n",sss, srr_1, gamma);
+        srr_1 = -pow(sinc(q*edge_separation/2.0), 2);
+
         srr_1 += 2.0 * gamma;
         srr_1 *= num_strings;
         double srr_2;
-        srr_2 = 2.0/(1.0-sin_x(q*A_s));
+        srr_2 = 2.0/(1.0-sinc(q*A_s));
         srr_2 *= num_strings;
         srr_2 *= pow(beta, 2);
         double srr_3;
-        srr_3 = 1.0 - pow(sin_x(q*A_s), (int)num_strings);
-        srr_3 /= pow((1.0-sin_x(q*A_s)), 2);
+        srr_3 = 1.0 - pow(sinc(q*A_s), num_strings);
+        srr_3 /= pow((1.0-sinc(q*A_s)), 2);
         srr_3 *= pow(beta, 2);
         srr_3 *= -2.0;
@@ -96 +96 @@
 
         // form factor for correlations
-        srs = -1.0;
-        srs -= pow(sin_x(q*A_s), (int)num_strings);
-        srs /= pow((1.0-sin_x(q*A_s)), 2);
-        srs *= sin_x(q*A_s);
-        srs += (num_strings/(1.0-sin_x(q*A_s)));
+        srs = 1.0;
+        srs -= pow(sinc(q*A_s), num_strings);
+        srs /= pow((1.0-sinc(q*A_s)), 2);
+        srs *= -sinc(q*A_s);
+        srs += (num_strings/(1.0-sinc(q*A_s)));
         srs *= 4.0;
         srs *= (m_r * m_s * beta * psi);
@@ -111 +111 @@
         form_factor *= scale;
         form_factor += background;
-
     return (form_factor);
 }