Changeset ff1fff5 in sasmodels for sasmodels/models/binary_hard_sphere.c

Timestamp:

Oct 16, 2016 2:14:15 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

7fcdc9f

Parents:

4f79d94 (diff), a0d75ce (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:

allow comparison of different models, such as 'sascomp sphere:ellipsoid radius_polar=:radius radius_equatorial=:radius -mono'

File:

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

sasmodels/models/binary_hard_sphere.c

@@ -7 +7 @@
     );
     
-double Iqxy(double qx, double qy,
-    double lg_radius, double sm_radius,
-    double lg_vol_frac, double sm_vol_frac,
-    double lg_sld, double sm_sld, double solvent_sld
-    );
-
 void calculate_psfs(double qval,
     double r2, double nf2,
@@ -55 +49 @@
     // /* do form factor calculations  */
     
-    v1 = 4.0*M_PI/3.0*r1*r1*r1;
-    v2 = 4.0*M_PI/3.0*r2*r2*r2;
+    v1 = M_4PI_3*r1*r1*r1;
+    v2 = M_4PI_3*r2*r2*r2;
     
     n1 = phi1/v1;
@@ -64 +58 @@
     qr2 = r2*q;
 
-    //if (qr1 == 0){
-        //sc1 = 1.0/3.0;
-    //}else{
-        //sc1 = (sin(qr1)-qr1*cos(qr1))/qr1/qr1/qr1;
-    //}
-    //if (qr2 == 0){
-        //sc2 = 1.0/3.0;
-    //}else{
-        //sc2 = (sin(qr2)-qr2*cos(qr2))/qr2/qr2/qr2;
-    //}
     sc1 = sph_j1c(qr1);
     sc2 = sph_j1c(qr2);
-    b1 = r1*r1*r1*(rho1-rhos)*4.0/3.0*M_PI*sc1;
-    b2 = r2*r2*r2*(rho2-rhos)*4.0/3.0*M_PI*sc2;
+    b1 = r1*r1*r1*(rho1-rhos)*M_4PI_3*sc1;
+    b2 = r2*r2*r2*(rho2-rhos)*M_4PI_3*sc2;
     inten = n1*b1*b1*psf11;
     inten += sqrt(n1*n2)*2.0*b1*b2*psf12;
@@ -88 +72 @@
 }
 
-
-double Iqxy(double qx, double qy,
-    double lg_radius, double sm_radius,
-    double lg_vol_frac, double sm_vol_frac,
-    double lg_sld, double sm_sld, double solvent_sld)
-    
-{
-    double q = sqrt(qx*qx + qy*qy);
-    return Iq(q,
-        lg_radius, sm_radius,
-        lg_vol_frac, sm_vol_frac,
-        lg_sld, sm_sld, solvent_sld);
-}
 
 void calculate_psfs(double qval,