Changeset 86aa992 in sasmodels for sasmodels/models/lamellar_stack_paracrystal.c

Timestamp:

Aug 14, 2018 12:09:49 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

6d90684

Parents:

71b751d (diff), d089a00 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into beta_approx

File:

• sasmodels/models/lamellar_stack_paracrystal.c (modified) (5 diffs)

sasmodels/models/lamellar_stack_paracrystal.c

@@ -18 +18 @@
         int n2 = n1 + 1;
         const double xn = (double)n2 - fp_Nlayers;      //fractional contribution of n1
-        
+
         const double ww = exp(-0.5*square(qval*pd*davg));
 
@@ -27 +27 @@
 
         Znq = xn*Snq;
-        
+
         //calculate the n2 contribution
         an = paraCryst_an(ww,qval,davg,n2);
@@ -33 +33 @@
 
         Znq += (1.0-xn)*Snq;
-        
+
         //and the independent contribution
         Znq += (1.0-ww*ww)/(1.0+ww*ww-2.0*ww*cos(qval*davg));
-        
+
         //the limit when Nlayers approaches infinity
 //      Zq = (1-ww^2)/(1+ww^2-2*ww*cos(qval*davg))
-        
+
         const double xi = th/2.0;               //use 1/2 the bilayer thickness
         const double Pbil = square(sas_sinx_x(qval*xi));
-        
+
         const double contr = sld - solvent_sld;
         const double inten = 2.0*M_PI*contr*contr*Pbil*Znq/(qval*qval);
@@ -52 +52 @@
 double
 paraCryst_sn(double ww, double qval, double davg, int Nlayers, double an) {
-        
+
         double Snq;
 
         Snq = an/( (double)Nlayers*square(1.0+ww*ww-2.0*ww*cos(qval*davg)) );
-        
+
         return Snq;
 }
@@ -63 +63 @@
 paraCryst_an(double ww, double qval, double davg, int Nlayers) {
         double an;
-        
+
         an = 4.0*ww*ww - 2.0*(ww*ww*ww+ww)*cos(qval*davg);
         an -= 4.0*pow(ww,(Nlayers+2))*cos((double)Nlayers*qval*davg);
         an += 2.0*pow(ww,(Nlayers+3))*cos((double)(Nlayers-1)*qval*davg);
         an += 2.0*pow(ww,(Nlayers+1))*cos((double)(Nlayers+1)*qval*davg);
-        
+
         return an;
 }