Changeset 9c461c7 in sasmodels


Ignore:
Timestamp:
Jan 21, 2016 2:47:17 AM (9 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:
790bcc4c
Parents:
9eaadb3
Message:
  1. Code review from PK: renamed J1c to sph_j1c
  2. Fixed mass_fractal
Location:
sasmodels/models
Files:
1 added
1 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/models/ellipsoid.c

    r513efc5 r9c461c7  
    1010    const double u = q*requatorial*sqrt(1.0 
    1111                   + sin_alpha*sin_alpha*(ratio*ratio - 1.0)); 
    12     const double f = J1c(u); 
     12    const double f = sph_j1c(u); 
    1313 
    1414    return f*f; 

  • sasmodels/models/ellipsoid.py

    r513efc5 r9c461c7  
    152152             ] 
    153153 
    154 source = ["lib/J1.c", "lib/J1c.c", "lib/gauss76.c", "ellipsoid.c"] 
     154source = ["lib/J1.c", "lib/sph_j1c.c", "lib/gauss76.c", "ellipsoid.c"] 
    155155 
    156156def ER(rpolar, requatorial): 

  • sasmodels/models/mass_fractal.c

    r5c1d341 r9c461c7  
    1717          double cutoff_length) 
    1818{ 
    19  
    20     //calculate P(q) for the spherical subunits; not normalized 
    21     //double pq = pow((3.0*(sin(q*radius) - q*radius*cos(q*radius))/pow((q*radius),3)),2); 
    22     double pq = J1c(q*radius); 
    23  
    24     //pq = 1.0; 
     19    //calculate P(q) 
     20    double pq = sph_j1c(q*radius); 
     21    pq = pq*pq; 
    2522 
    2623    //calculate S(q) 
    … …  
    3027    sq /= pow((1.0 + (q*cutoff_length)*(q*cutoff_length)),(mmo/2.0)); 
    3128    sq /= q; 
    32  
    33     //sq = 1.0; 
    3429 
    3530    //combine and return 

  • sasmodels/models/mass_fractal.py

    r9eaadb3 r9c461c7  
    8080 
    8181#             ["name", "units", default, [lower, upper], "type","description"], 
    82 parameters = [["radius",        "Ang",  10.0, [0.0, inf], "", 
    83                "Particle radius"], 
    84               ["mass_dim",      "",      1.9, [1.0, 6.0],   "", 
    85                "Mass fractal dimension"], 
    86               ["cutoff_length", "Ang", 100.0, [0.0, inf], "", 
    87                "Cut-off length"], 
     82parameters = [["radius",        "Ang",  10.0, [0.0, inf], "", "Particle radius"], 
     83              ["mass_dim",      "",      1.9, [1.0, 6.0], "", "Mass fractal dimension"], 
     84              ["cutoff_length", "Ang", 100.0, [0.0, inf], "", "Cut-off length"], 
    8885              ] 
    8986 
    9087 
    91 source = ["lib/J1c.c", "lib/lanczos_gamma.c", "mass_fractal.c"] 
     88source = ["lib/sph_j1c.c", "lib/lanczos_gamma.c", "mass_fractal.c"] 
    9289 
    9390demo = dict(scale=1, background=0, 
    … …  
    104101           'mass_dim':      3.3, 
    105102           'cutoff_length': 1.0, 
    106            }, 0.001, 2.68342996226], 
     103           }, 0.5, 1.29016774904], 
    107104 
    108105         [{'radius':        1.0, 
    … …  
    116113           'cutoff_length': 1.0, 
    117114           'scale':        10.0, 
    118            }, 0.051, 11.6258202095], 
     115           }, 0.051, 11.6227966145], 
    119116         ] 

  • sasmodels/models/mass_surface_fractal.py

    r7ed702f r9c461c7  
    9191 
    9292 
    93 source = ["lib/J1c.c", "mass_surface_fractal.c"] 
     93source = ["mass_surface_fractal.c"] 
    9494 
    9595demo = dict(scale=1, background=0, 

  • sasmodels/models/sphere.py

    r513efc5 r9c461c7  
    7878             ] 
    7979 
    80 source = ["lib/J1c.c"] 
     80source = ["lib/sph_j1c.c"] 
    8181 
    8282# No volume normalization despite having a volume parameter 
    … …  
    8888Iq = """ 
    8989    const double qr = q*radius; 
    90     const double bes = J1c(qr); 
     90    const double bes = sph_j1c(qr); 
    9191    const double fq = bes * (sld - solvent_sld) * form_volume(radius); 
    9292    return 1.0e-4*fq*fq; 

  • sasmodels/models/surface_fractal.c

    r5c1d341 r9c461c7  
    2121    //pq = pow((3.0*(sin(q*radius) - q*radius*cos(q*radius))/pow((q*radius),3)),2); 
    2222 
    23     pq = J1c(q*radius); 
     23    pq = sph_j1c(q*radius); 
    2424    pq = pq*pq; 
    2525 

  • sasmodels/models/surface_fractal.py

    r5c1d341 r9c461c7  
    9090 
    9191 
    92 source = ["lib/J1c.c", "lib/lanczos_gamma.c", "surface_fractal.c"] 
     92source = ["lib/sph_j1c.c", "lib/lanczos_gamma.c", "surface_fractal.c"] 
    9393 
    9494demo = dict(scale=1, background=0, 

  • sasmodels/models/triaxial_ellipsoid.c

    r7ed702f r9c461c7  
    3636            const double y = 0.5*(Gauss76Z[j] + 1.0); 
    3737            const double t = q*sqrt(acosx2 + bsinx2*(1.0-y*y) + c2*y*y); 
    38             const double fq = J1c(t); 
     38            const double fq = sph_j1c(t); 
    3939            inner += Gauss76Wt[j] * fq * fq ; 
    4040        } 

  • sasmodels/models/triaxial_ellipsoid.py

    r513efc5 r9c461c7  
    117117             ] 
    118118 
    119 source = ["lib/J1.c", "lib/J1c.c", "lib/gauss76.c", "triaxial_ellipsoid.c"] 
     119source = ["lib/J1.c", "lib/sph_j1c.c", "lib/gauss76.c", "triaxial_ellipsoid.c"] 
    120120 
    121121def ER(req_minor, req_major, rpolar): 
Note: See TracChangeset for help on using the changeset viewer.