Changeset becded3 in sasmodels for sasmodels/models/stacked_disks.c


Ignore:
Timestamp:
Oct 17, 2017 6:21:27 PM (7 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:
8698a0d
Parents:
2a602c7
Message:

update oriented models to new interface (which will be in the next commit)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/models/stacked_disks.c

    rb34fc77 rbecded3  
    1 static double stacked_disks_kernel( 
     1static double 
     2stacked_disks_kernel( 
    23    double qab, 
    34    double qc, 
    … …  
    6061 
    6162 
    62 static double stacked_disks_1d( 
     63static double 
     64stacked_disks_1d( 
    6365    double q, 
    6466    double thick_core, 
    … …  
    102104} 
    103105 
    104 static double form_volume( 
     106static double 
     107form_volume( 
    105108    double thick_core, 
    106109    double thick_layer, 
    … …  
    113116} 
    114117 
    115 static double Iq( 
     118static double 
     119Iq( 
    116120    double q, 
    117121    double thick_core, 
    … …  
    137141 
    138142 
    139 static double Iqxy(double qx, double qy, 
     143static double 
     144Iqxy(double qab, double qc, 
    140145    double thick_core, 
    141146    double thick_layer, 
    … …  
    145150    double core_sld, 
    146151    double layer_sld, 
    147     double solvent_sld, 
    148     double theta, 
    149     double phi) 
     152    double solvent_sld) 
    150153{ 
    151     double q, sin_alpha, cos_alpha; 
    152     ORIENT_SYMMETRIC(qx, qy, theta, phi, q, sin_alpha, cos_alpha); 
    153     const double qab = q*sin_alpha; 
    154     const double qc = q*cos_alpha; 
    155  
    156154    int n_stacking = (int)(fp_n_stacking + 0.5); 
    157155    double d = 2.0 * thick_layer + thick_core; 
Note: See TracChangeset for help on using the changeset viewer.