Changeset d51ea74 in sasmodels


Ignore:
Timestamp:
Feb 25, 2016 7:37:32 AM (7 years ago)
Author:
piotr
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:
d2950f4
Parents:
fa8011eb
Message:

Code review from TN

Location:
sasmodels/models
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/multi_shell.c

    r0471c72 rd51ea74  
    99{ 
    1010    //calculate with a loop, two shells at a time 
    11     int ii=0; 
    12     double fval=0.0; 
     11    int ii = 0; 
     12    double fval = 0.0; 
    1313    double voli = 0.0; 
    1414    const double sldi = core_sld-shell_sld; 
     
    2828 
    2929        //do 2 layers at a time 
    30         ii+=1; 
     30        ii += 1; 
    3131 
    32     } while(ii<=n_pairs-1);  //change to make 0 < n_pairs < 2 correspond to 
    33                              //unilamellar vesicles (C. Glinka, 11/24/03) 
     32    } while(ii <= n_pairs-1);  //change to make 0 < n_pairs < 2 correspond to 
     33                               //unilamellar vesicles (C. Glinka, 11/24/03) 
    3434 
    3535    fval *= 1.0e-4*fval/voli; 
  • sasmodels/models/multi_shell.py

    rb7529e2 rd51ea74  
    44interleaved with layers of solvent. For *N = 1*, this returns the VesicleModel. 
    55 
     6For information about polarised and magnetic scattering, click here_. 
     7 
     8.. _here: polar_mag_help.html 
     9 
    610Definition 
    711---------- 
     12 
     13This model is a trivial extension of the CoreShell function to a larger number 
     14of shells. See the core_shell_ function for a diagram and documentation. 
     15 
     16.. _core_shell: core_shell_sphere.html 
     17 
     18Be careful! The SLDs and scale can be highly correlated. Hold as many of these 
     19parameters fixed as possible. 
    820 
    921.. figure:: img/multi_shell_fig1.jpg 
Note: See TracChangeset for help on using the changeset viewer.