Changeset 71b751d in sasmodels for sasmodels/models/raspberry.c


Ignore:
Timestamp:
Aug 14, 2018 12:09:34 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:
86aa992
Parents:
2f8cbb9
Message:

update remaining form factors to use Fq interface

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/raspberry.c

    r925ad6e r71b751d  
    11double form_volume(double radius_lg); 
    22 
    3 double Iq(double q,  
     3double Iq(double q, 
    44          double sld_lg, double sld_sm, double sld_solvent, 
    55          double volfraction_lg, double volfraction_sm, double surf_fraction, 
     
    2727    double sfLS,sfSS; 
    2828    double slT; 
    29   
     29 
    3030    vfL = volfraction_lg; 
    3131    rL = radius_lg; 
     
    3737    deltaS = penetration; 
    3838    sldSolv = sld_solvent; 
    39      
     39 
    4040    delrhoL = fabs(sldL - sldSolv); 
    41     delrhoS = fabs(sldS - sldSolv);  
    42       
     41    delrhoS = fabs(sldS - sldSolv); 
     42 
    4343    VL = M_4PI_3*rL*rL*rL; 
    4444    VS = M_4PI_3*rS*rS*rS; 
     
    7676    //I(q) for free small particles 
    7777    f2+= vfS*(1.0-fSs)*delrhoS*delrhoS*VS*psiS*psiS; 
    78      
     78 
    7979    // normalize to single particle volume and convert to 1/cm 
    8080    f2 *= 1.0e8;        // [=] 1/cm 
    8181    f2 *= 1.0e-12;      // convert for (1/A^-6)^2 to (1/A)^2 
    82      
     82 
    8383    return f2; 
    8484} 
Note: See TracChangeset for help on using the changeset viewer.