Changeset b34fc77 in sasmodels


Ignore:
Timestamp:
Apr 20, 2017 4:22:52 PM (8 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:
73cbc5b
Parents:
4a43871
Message:

minor code tidying to make q transformation regular

Location:
sasmodels/models
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/models/cylinder.c

    r2a0b2b1 rb34fc77  
    5757    const double qab = q*sin_alpha; 
    5858    const double qc = q*cos_alpha; 
     59 
    5960    const double s = (sld-solvent_sld) * form_volume(radius, length); 
    6061    const double form = fq(qab, qc, radius, length); 

  • sasmodels/models/stacked_disks.c

    r2a0b2b1 rb34fc77  
    149149    double phi) 
    150150{ 
    151     int n_stacking = (int)(fp_n_stacking + 0.5); 
    152151    double q, sin_alpha, cos_alpha; 
    153152    ORIENT_SYMMETRIC(qx, qy, theta, phi, q, sin_alpha, cos_alpha); 
    … …  
    155154    const double qc = q*cos_alpha; 
    156155 
     156    int n_stacking = (int)(fp_n_stacking + 0.5); 
    157157    double d = 2.0 * thick_layer + thick_core; 
    158158    double halfheight = 0.5*thick_core; 
Note: See TracChangeset for help on using the changeset viewer.