Changeset 0433203 in sasmodels for sasmodels/models/raspberry.c

Timestamp:

Mar 20, 2016 8:40:09 AM (8 years ago)

Author:

ajj

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:

bb02a35

Parents:

ce346b6

Message:

Updating raspberry model to more stable formulation

File:

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

sasmodels/models/raspberry.c

@@ -21 +21 @@
 double Iq(double q,
           double sld_lg, double sld_sm, double sld_solvent,
-          double volfraction_lg, double volfraction_sm, double surf_fraction,
+          double volfraction_lg, double volfraction_sm, double surface_fraction,
           double radius_lg, double radius_sm, double penetration)
 {
@@ -37 +37 @@
     sldL = sld_lg;
     vfS = volfraction_sm;
+    fSs = surface_fraction;
     rS = radius_sm;
-    aSs = surf_fraction;
     sldS = sld_sm;
     deltaS = penetration;
@@ -48 +48 @@
     VL = M_4PI_3*rL*rL*rL;
     VS = M_4PI_3*rS*rS*rS;
-    Np = aSs*4.0*pow(((rL+deltaS)/rS), 2.0);
-    fSs = Np*vfL*VS/vfS/VL;
-    
-    Np2 = aSs*4.0*(rS/(rL+deltaS))*VL/VS; 
-    fSs2 = Np2*vfL*VS/vfS/VL;
+
+    Np = vfS*fSs*VL/vfL/VS;
+
     slT = delrhoL*VL + Np*delrhoS*VS;
 
@@ -59 +57 @@
         
     f2 = delrhoL*delrhoL*VL*VL*sph_j1c(q*rL)*sph_j1c(q*rL); 
-    f2 += Np2*delrhoS*delrhoS*VS*VS*sph_j1c(q*rS)*sph_j1c(q*rS); 
-    f2 += Np2*(Np2-1)*delrhoS*delrhoS*VS*VS*sfSS; 
-    f2 += 2*Np2*delrhoL*delrhoS*VL*VS*sfLS;
+    f2 += Np*delrhoS*delrhoS*VS*VS*sph_j1c(q*rS)*sph_j1c(q*rS);
+    f2 += Np*(Np-1)*delrhoS*delrhoS*VS*VS*sfSS;
+    f2 += 2*Np*delrhoL*delrhoS*VL*VS*sfLS;
     if (f2 != 0.0){
         f2 = f2/slT/slT;
         }
 
-    f2 = f2*(vfL*delrhoL*delrhoL*VL + vfS*fSs2*Np2*delrhoS*delrhoS*VS);
+    f2 = f2*(vfL*delrhoL*delrhoL*VL + vfS*fSs*Np*delrhoS*delrhoS*VS);
 
     f2+= vfS*(1.0-fSs)*pow(delrhoS, 2)*VS*sph_j1c(q*rS)*sph_j1c(q*rS);