Changeset 1dd2854 in sasmodels


Ignore:
Timestamp:
Mar 20, 2016 10:31:37 AM (9 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:
3a45c2c
Parents:
0cc31e1 (diff), 6794301 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of ​https://github.com/SasView/sasmodels

Location:
sasmodels
Files:
1 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/models/fractal_core_shell.c

    r7d4b2ae r6794301  
    4747    double qr = q*radius; 
    4848 
    49     double t1 = frac_dim*exp(lanczos_gamma(frac_1))*sin(frac_1*atan(q*cor_length)); 
     49    double t1 = frac_dim*sas_gamma(frac_1)*sin(frac_1*atan(q*cor_length)); 
    5050    double t2 = (1.0 + 1.0/(q*cor_length)/(q*cor_length)); 
    5151    double t3 = pow(qr, frac_dim) * pow(t2, (frac_1/2.0)); 

  • sasmodels/models/fractal_core_shell.py

    raa2edb2 r6794301  
    7373# pylint: enable=bad-whitespace, line-too-long 
    7474 
    75 source = ["lib/sph_j1c.c", "lib/lanczos_gamma.c", "lib/core_shell.c", "fractal_core_shell.c"] 
     75source = ["lib/sph_j1c.c", "lib/sas_gamma.c", "lib/core_shell.c", "fractal_core_shell.c"] 
    7676 
    7777demo = dict(scale=0.05, 

  • sasmodels/models/mass_fractal.c

    r61fd21d r6794301  
    2828    //calculate S(q) 
    2929    double mmo = mass_dim-1.0; 
    30     double sq = exp(lanczos_gamma(mmo))*sin((mmo)*atan(q*cutoff_length)); 
     30    double sq = sas_gamma(mmo)*sin((mmo)*atan(q*cutoff_length)); 
    3131    sq *= pow(cutoff_length, mmo); 
    3232    sq /= pow((1.0 + (q*cutoff_length)*(q*cutoff_length)),(mmo/2.0)); 

  • sasmodels/models/mass_fractal.py

    raa2edb2 r6794301  
    8585# pylint: enable=bad-whitespace, line-too-long 
    8686 
    87 source = ["lib/sph_j1c.c", "lib/lanczos_gamma.c", "mass_fractal.c"] 
     87source = ["lib/sph_j1c.c", "lib/sas_gamma.c", "mass_fractal.c"] 
    8888 
    8989demo = dict(scale=1, background=0, 

  • sasmodels/models/surface_fractal.c

    r9c461c7 r6794301  
    2626    //calculate S(q) 
    2727    mmo = 5.0 - surface_dim; 
    28     sq  = exp(lanczos_gamma(mmo))*sin(-(mmo)*atan(q*cutoff_length)); 
     28    sq  = sas_gamma(mmo)*sin(-(mmo)*atan(q*cutoff_length)); 
    2929    sq *= pow(cutoff_length, mmo); 
    3030    sq /= pow((1.0 + (q*cutoff_length)*(q*cutoff_length)),(mmo/2.0)); 

  • sasmodels/models/surface_fractal.py

    raa2edb2 r6794301  
    8787# pylint: enable=bad-whitespace, line-too-long 
    8888 
    89 source = ["lib/sph_j1c.c", "lib/lanczos_gamma.c", "surface_fractal.c"] 
     89source = ["lib/sph_j1c.c", "lib/sas_gamma.c", "surface_fractal.c"] 
    9090 
    9191demo = dict(scale=1, background=0, 

  • sasmodels/resolution.py

    r2f63032 r8b935d1  
    689689        self.pars = TEST_PARS_PINHOLE_SPHERE 
    690690        from sasmodels import core 
    691         from sasmodels.models import sphere 
    692         self.model = core.load_model(sphere, dtype='double') 
     691        self.model = core.load_model("sphere", dtype='double') 
    693692 
    694693    def _eval_sphere(self, pars, resolution): 

  • sasmodels/models/correlation_length.py

    r326281f r0cc31e1  
    1616incoherent background B and the two exponents n and m are used as fitting 
    1717parameters. (Respectively $porod\_scale$, $lorentz\_scale$, $background$, $exponent\_p$ and  
    18 $exponent\_l$ in the parameter list.) The remaining parameter \xi is a correlation  
     18$exponent\_l$ in the parameter list.) The remaining parameter \ |xi|\ is a correlation  
    1919length for the polymer chains. Note that when m=2 this functional form becomes the  
    2020familiar Lorentzian function. Some interpretation of the values of A and C may be  

  • sasmodels/models/elliptical_cylinder.py

    r74fd96f r0cc31e1  
    1212.. figure:: img/elliptical_cylinder_geometry.png 
    1313 
    14    Elliptical cylinder geometry $a$ = $r_{minor}$ and \nu = $axis\_ratio$ = $r_{major} / r_{minor}$ 
     14   Elliptical cylinder geometry $a$ = $r_{minor}$ and \ |nu|\ = $axis\_ratio$ = $r_{major} / r_{minor}$ 
    1515 
    1616The function calculated is 

  • sasmodels/models/fuzzy_sphere.py

    raa2edb2 r0cc31e1  
    1919 
    2020    A(q) = \frac{3\left[\sin(qR) - qR \cos(qR)\right]}{(qR)^3} 
    21            \exp\left(\frac{-(o_{fuzzy}q)^2}{2}\right) 
     21           \exp\left(\frac{-(\sigma_{fuzzy}q)^2}{2}\right) 
    2222 
    2323Here *|A(q)|*:sup:`2`\  is the form factor, *P(q)*. The scale is equivalent to the 
    … …  
    2626solvent. 
    2727 
    28 Poly-dispersion in radius and in fuzziness is provided for. 
     28Poly-dispersion in radius and in fuzziness is provided for, though the fuzziness 
     29must be kept much smaller than the sphere radius for meaningful results. 
    2930 
    3031 
    … …  
    6566or just volume fraction for absolute scale data 
    6667radius: radius of the solid sphere 
    67 fuzziness = the STD of the height of fuzzy interfacial 
     68fuzziness = the standard deviation of the fuzzy interfacial 
    6869thickness (ie., so-called interfacial roughness) 
    6970sld: the SLD of the sphere 
    … …  
    7677# pylint: disable=bad-whitespace,line-too-long 
    7778# ["name", "units", default, [lower, upper], "type","description"], 
    78 parameters = [["sld",         "1e-6/Ang^2",  1, [-inf, inf], "",       "Layer scattering length density"], 
    79               ["solvent_sld", "1e-6/Ang^2",  3, [-inf, inf], "",       "Solvent scattering length density"], 
     79parameters = [["sld",         "1e-6/Ang^2",  1, [-inf, inf], "",       "Particle scattering length density"], 
     80              ["sld_solvent", "1e-6/Ang^2",  3, [-inf, inf], "",       "Solvent scattering length density"], 
    8081              ["radius",      "Ang",        60, [0, inf],    "volume", "Sphere radius"], 
    81               ["fuzziness",   "Ang",        10, [0, inf],    "",       "The STD of the height of fuzzy interfacial"], 
     82              ["fuzziness",   "Ang",        10, [0, inf],    "",       "std deviation of Gaussian convolution for interface (must be << radius)"], 
    8283             ] 
    8384# pylint: enable=bad-whitespace,line-too-long 
    … …  
    9596    const double bes = sph_j1c(qr); 
    9697    const double qf = q*fuzziness; 
    97     const double fq = bes * (sld - solvent_sld) * form_volume(radius) * exp(-0.5*qf*qf); 
     98    const double fq = bes * (sld - sld_solvent) * form_volume(radius) * exp(-0.5*qf*qf); 
    9899    return 1.0e-4*fq*fq; 
    99100    """ 
    … …  
    102103    // never called since no orientation or magnetic parameters. 
    103104    //return -1.0; 
    104     return Iq(sqrt(qx*qx + qy*qy), sld, solvent_sld, radius, fuzziness); 
     105    return Iq(sqrt(qx*qx + qy*qy), sld, sld_solvent, radius, fuzziness); 
    105106    """ 
    106107 
    … …  
    114115 
    115116demo = dict(scale=1, background=0.001, 
    116             sld=1, solvent_sld=3, 
     117            sld=1, sld_solvent=3, 
    117118            radius=60, 
    118119            fuzziness=10, 
    … …  
    121122 
    122123oldname = "FuzzySphereModel" 
    123 oldpars = dict(sld='sldSph', solvent_sld='sldSolv', radius='radius', fuzziness='fuzziness') 
     124oldpars = dict(sld='sldSph', sld_solvent='sldSolv', radius='radius', fuzziness='fuzziness') 
    124125 
    125126 
Note: See TracChangeset for help on using the changeset viewer.