Changeset 5959da2 in sasmodels for sasmodels/models/HayterMSAsq.py
- Timestamp:
- Mar 9, 2015 11:45:23 AM (9 years ago)
- 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:
- 2e35a40
- Parents:
- ab87a12 (diff), 4840bec (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/models/HayterMSAsq.py
rab87a12 r5959da2 50 50 from numpy import pi, inf 51 51 52 source =["HayterMSAsq_kernel.c"]52 source = ["HayterMSAsq_kernel.c"] 53 53 54 54 name = "HayterMSAsq" 55 55 title = "Hayter-Penfold MSA charged sphere interparticle S(Q) structure factor" 56 56 description = """\ 57 57 [Hayter-Penfold MSA charged sphere interparticle S(Q) structure factor] 58 58 Interparticle structure factor S(Q)for a charged hard spheres. 59 Routine takes absolute value of charge, use HardSphere if charge goes to zero. 60 In sasview the effective radius will be calculated from the 61 59 Routine takes absolute value of charge, use HardSphere if charge goes to zero. 60 In sasview the effective radius will be calculated from the 61 parameters used in P(Q). 62 62 """ 63 # [ "name", "units", default, [lower, upper], "type", "description" ], 64 parameters = [["effect_radius", "Ang", 20.75, [0, inf], "volume", 65 "effective radius of hard sphere"], 66 ["charge", "e", 19.0, [0, inf], "", 67 "charge on sphere (in electrons)"], 68 ["volfraction", "", 0.0192, [0, 0.74], "", 69 "volume fraction of spheres"], 70 ["temperature", "K", 318.16, [0, inf], "", 71 "temperature, in Kelvin, for Debye length calculation"], 72 ["saltconc", "M", 0.0, [-inf, inf], "", 73 "conc of salt, 1:1 electolyte, for Debye length"], 74 ["dielectconst", "", 71.08, [-inf, inf], "", 75 "dielectric constant of solvent (default water), for Debye length"], 76 ] 63 77 64 parameters = [65 # [ "name", "units", default, [lower, upper], "type",66 # "description" ],67 [ "effect_radius", "Ang", 20.75, [0, inf], "volume",68 "effective radius of hard sphere" ],69 [ "charge", "e", 19.0, [0, inf], "",70 "charge on sphere (in electrons)" ],71 [ "volfraction", "", 0.0192, [0, 0.74], "",72 "volume fraction of spheres" ],73 [ "temperature", "K", 318.16, [0, inf], "",74 "temperature, in Kelvin, for Debye length calculation" ],75 [ "saltconc", "M", 0.0, [-inf,inf], "",76 "conc of salt, 1:1 electolyte, for Debye length" ],77 [ "dielectconst", "", 71.08, [-inf,inf], "",78 "dielectric constant of solvent (default water), for Debye length" ],79 ]80 81 78 # No volume normalization despite having a volume parameter 82 79 # This should perhaps be volume normalized? … … 86 83 Iqxy = """ 87 84 // never called since no orientation or magnetic parameters. 88 return -1.0;85 return Iq(sqrt(qx*qx+qy*qy), IQ_PARAMETERS); 89 86 """ 90 87 # ER defaults to 0.0
Note: See TracChangeset
for help on using the changeset viewer.