Changeset cd55ac3 in sasmodels


Ignore:
Timestamp:
Feb 20, 2015 4:05:57 AM (10 years ago)
Author:
richardh
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
80768fc, d60b433
Parents:
143e2f7
Message:

fixed my bug in lamellarCailleHG

Location:
sasmodels/models
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/models/lamellarCailleHG.py

    rdc02af0 rcd55ac3  
    128128                tail_length_pd= 0.1, tail_length_pd_n=20, 
    129129                head_length_pd= 0.05, head_length_pd_n=30, 
    130                 spacing_pd= 0, spacing_pd_n=40 
     130                spacing_pd= 0.2, spacing_pd_n=40 
    131131         ) 
    132132 

  • sasmodels/models/lamellarCailleHG_kernel.c

    rdc02af0 rcd55ac3  
    3636  Pq = (head_sld-solvent_sld)*(sin(qval*(head_length+tail_length))-sin(qval*tail_length)) +  
    3737              (tail_sld-solvent_sld)*sin(qval*tail_length); 
     38  Pq *= Pq; 
     39  Pq *= 4.0/(qval*qval); 
    3840 
    3941  NNint = (int)NN;    //cast to an integer for the loop 
Note: See TracChangeset for help on using the changeset viewer.