Changeset 87bc707 in sasmodels


Ignore:
Timestamp:
Oct 14, 2016 4:12:22 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:
6831fa0
Parents:
9068f4c
Message:

remove trivial Iqxy() functions; let generate.py create them automatically

Location:
sasmodels/models
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/models/binary_hard_sphere.c

    re481a39 r87bc707  
    77    ); 
    88     
    9 double Iqxy(double qx, double qy, 
    10     double lg_radius, double sm_radius, 
    11     double lg_vol_frac, double sm_vol_frac, 
    12     double lg_sld, double sm_sld, double solvent_sld 
    13     ); 
    14  
    159void calculate_psfs(double qval, 
    1610    double r2, double nf2, 
    … …  
    8882} 
    8983 
    90  
    91 double Iqxy(double qx, double qy, 
    92     double lg_radius, double sm_radius, 
    93     double lg_vol_frac, double sm_vol_frac, 
    94     double lg_sld, double sm_sld, double solvent_sld) 
    95      
    96 { 
    97     double q = sqrt(qx*qx + qy*qy); 
    98     return Iq(q, 
    99         lg_radius, sm_radius, 
    100         lg_vol_frac, sm_vol_frac, 
    101         lg_sld, sm_sld, solvent_sld); 
    102 } 
    10384 
    10485void calculate_psfs(double qval, 

  • sasmodels/models/flexible_cylinder_elliptical.c

    rb66d38e r87bc707  
    22double Iq(double q, double length, double kuhn_length, double radius, 
    33          double axis_ratio, double sld, double solvent_sld); 
    4 double Iqxy(double qx, double qy, double length, double kuhn_length, 
    5             double radius, double axis_ratio, double sld, double solvent_sld); 
    64double flexible_cylinder_ex_kernel(double q, double length, double kuhn_length, 
    75                                double radius, double axis_ratio, double sld, 
    … …  
    7775} 
    7876 
    79 double Iqxy(double qx, double qy, 
    80             double length, 
    81             double kuhn_length, 
    82             double radius, 
    83             double axis_ratio, 
    84             double sld, 
    85             double solvent_sld) 
    86 { 
    87     double q; 
    88     q = sqrt(qx*qx+qy*qy); 
    89     double result = flexible_cylinder_ex_kernel(q, 
    90                     length, 
    91                     kuhn_length, 
    92                     radius, 
    93                     axis_ratio, 
    94                     sld, 
    95                     solvent_sld); 
    96  
    97     return result; 
    98 } 

  • sasmodels/models/hollow_rectangular_prism.c

    ra807206 r87bc707  
    22double Iq(double q, double sld, double solvent_sld, double length_a,  
    33          double b2a_ratio, double c2a_ratio, double thickness); 
    4 double Iqxy(double qx, double qy, double sld, double solvent_sld,  
    5             double length_a, double b2a_ratio, double c2a_ratio, double thickness); 
    64 
    75double form_volume(double length_a, double b2a_ratio, double c2a_ratio, double thickness) 
    … …  
    10199     
    102100} 
    103  
    104 double Iqxy(double qx, double qy, 
    105     double sld, 
    106     double solvent_sld, 
    107     double length_a, 
    108     double b2a_ratio, 
    109     double c2a_ratio, 
    110     double thickness) 
    111 { 
    112     double q = sqrt(qx*qx + qy*qy); 
    113     double intensity = Iq(q, sld, solvent_sld, length_a, b2a_ratio, c2a_ratio, thickness);  
    114     return intensity;     
    115 } 

  • sasmodels/models/hollow_rectangular_prism_thin_walls.c

    ra807206 r87bc707  
    22double Iq(double q, double sld, double solvent_sld, double length_a,  
    33          double b2a_ratio, double c2a_ratio); 
    4 double Iqxy(double qx, double qy, double sld, double solvent_sld,  
    5             double length_a, double b2a_ratio, double c2a_ratio); 
    64 
    75double form_volume(double length_a, double b2a_ratio, double c2a_ratio) 
    … …  
    8482     
    8583} 
    86  
    87 double Iqxy(double qx, double qy, 
    88     double sld, 
    89     double solvent_sld, 
    90     double length_a, 
    91     double b2a_ratio, 
    92     double c2a_ratio) 
    93 { 
    94     double q = sqrt(qx*qx + qy*qy); 
    95     double intensity = Iq(q, sld, solvent_sld, length_a, b2a_ratio, c2a_ratio);  
    96     return intensity;     
    97 } 

  • sasmodels/models/rectangular_prism.c

    ra807206 r87bc707  
    22double Iq(double q, double sld, double solvent_sld, double length_a,  
    33          double b2a_ratio, double c2a_ratio); 
    4 double Iqxy(double qx, double qy, double sld, double solvent_sld,  
    5             double length_a, double b2a_ratio, double c2a_ratio); 
    64 
    75double form_volume(double length_a, double b2a_ratio, double c2a_ratio) 
    … …  
    2826   //Integration limits to use in Gaussian quadrature 
    2927    double v1a = 0.0; 
    30     double v1b = 0.5 * M_PI;  //theta integration limits 
     28    double v1b = M_PI_2;  //theta integration limits 
    3129    double v2a = 0.0; 
    32     double v2b = 0.5 * M_PI;  //phi integration limits 
     30    double v2b = M_PI_2;  //phi integration limits 
    3331     
    3432    //Order of integration 
    … …  
    8886     
    8987} 
    90  
    91 double Iqxy(double qx, double qy, 
    92     double sld, 
    93     double solvent_sld, 
    94     double length_a, 
    95     double b2a_ratio, 
    96     double c2a_ratio) 
    97 { 
    98     double q = sqrt(qx*qx + qy*qy); 
    99     double intensity = Iq(q, sld, solvent_sld, length_a, b2a_ratio, c2a_ratio);  
    100     return intensity;     
    101 } 
Note: See TracChangeset for help on using the changeset viewer.