Changeset 890ac7f1 in sasview for sansmodels/src/sans/models/c_extensions/pearlnecklace.c

Timestamp:

Nov 30, 2011 2:43:17 PM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

2138c061

Parents:

e161fac

Message:

Re #5 fixing samsmodels compilation on MSVC

File:

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

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

@@ -37 +37 @@
         //total volume
         double tot_vol;
-        tot_vol = num_strings * string_vol;
+  //each masses
+  double m_r= contrast_string * string_vol;
+  double m_s= contrast_pearl * pearl_vol;
+  double psi;
+  double gamma;
+  double beta;
+  //form factors
+  double sss; //pearls
+  double srr; //strings
+  double srs; //cross
+  double A_s;
+  double srr_1;
+  double srr_2;
+  double srr_3;
+  double form_factor;
+
+  tot_vol = num_strings * string_vol;
         tot_vol += num_pearls * pearl_vol;
 
-        //each masses
-        double m_r= contrast_string * string_vol;
-        double m_s= contrast_pearl * pearl_vol;
-
         //sine functions of a pearl
-        double psi;
         psi = sin(q*radius);
         psi -= q * radius * cos(q * radius);
@@ -52 +63 @@
 
         // Note take only 20 terms in Si series: 10 terms may be enough though.
-        double gamma;
         gamma = Si(q* edge_separation);
         gamma /= (q* edge_separation);
-        double beta;
         beta = Si(q * (edge_separation + radius));
         beta -= Si(q * radius);
         beta /= (q* edge_separation);
 
-        //form factors
-        double sss; //pearls
-        double srr; //strings
-        double srs; //cross
         // center to center distance between the neighboring pearls
-        double A_s = edge_separation + 2.0 * radius;
+        A_s = edge_separation + 2.0 * radius;
 
         // form factor for num_pearls
@@ -76 +81 @@
 
         // form factor for num_strings (like thin rods)
-        double srr_1;
         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-sinc(q*A_s));
         srr_2 *= num_strings;
         srr_2 *= pow(beta, 2);
-        double srr_3;
         srr_3 = 1.0 - pow(sinc(q*A_s), num_strings);
         srr_3 /= pow((1.0-sinc(q*A_s)), 2);
@@ -104 +106 @@
         srs *= (m_r * m_s * beta * psi);
 
-        double form_factor;
         form_factor = sss + srr + srs;
         form_factor /= (tot_vol * 1.0e-8); // norm by volume and A^-1 to cm^-1