Changeset 9aac25d in sasmodels for sasmodels/models/fcc.c

Timestamp:

Feb 8, 2016 7:27:30 AM (8 years ago)

Author:

piotr

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:

98f3053

Parents:

3882eeb

Message:

Converted SCCrystalModel

File:

• sasmodels/models/fcc.c (modified) (4 diffs)

sasmodels/models/fcc.c

@@ -7 +7 @@
 double _FCC_Integrand(double q, double dnn, double d_factor, double theta, double phi);
 double _FCCeval(double Theta, double Phi, double temp1, double temp3);
-double _sphereform(double q, double radius, double sld, double solvent_sld);
 
 
@@ -39 +38 @@
 
         return (result);
-}
-
-double _sphereform(double q, double radius, double sld, double solvent_sld){
-    const double qr = q*radius;
-    double sn, cn;
-    SINCOS(qr, sn, cn);
-    const double bes = (qr == 0.0 ? 1.0 : 3.0*(sn-qr*cn)/(qr*qr*qr));
-    const double fq = bes * (sld - solvent_sld)*form_volume(radius);
-    return 1.0e-4*fq*fq;
 }
 
@@ -88 +78 @@
 
         answer = (vb-va)/2.0*summ;
-        answer = answer*_sphereform(q,radius,sld,solvent_sld)*latticescale;
+        answer = answer*sphere_form(q,radius,sld,solvent_sld)*latticescale;
 
     return answer;
@@ -175 +165 @@
 
   // Use SphereForm directly from libigor
-  answer = _sphereform(q,radius,sld,solvent_sld)*Zq*latticescale;
+  answer = sphere_form(q,radius,sld,solvent_sld)*Zq*latticescale;
 
   return answer;