Changeset 02a0920 in sasmodels for sasmodels/models/fcc_paracrystal.py

Timestamp:

Mar 21, 2016 8:37:52 AM (8 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:

728136f

Parents:

3d8283b

Message:

renamed sc_crystal to sc_paracrystal, fcc and bcc.py to fcc_paracrystal etc, renamed sld

File:

• sasmodels/models/fcc_paracrystal.py (moved) (moved from sasmodels/models/fcc.py) (3 diffs)

sasmodels/models/fcc_paracrystal.py

@@ -109 +109 @@
               ["radius", "Ang", 40, [0, inf], "volume", "Particle radius"],
               ["sld", "1e-6/Ang^2", 4, [-inf, inf], "", "Particle scattering length density"],
-              ["solvent_sld", "1e-6/Ang^2", 1, [-inf, inf], "", "Solvent scattering length density"],
+              ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "", "Solvent scattering length density"],
               ["theta", "degrees", 60, [-inf, inf], "orientation", "In plane angle"],
               ["phi", "degrees", 60, [-inf, inf], "orientation", "Out of plane angle"],
@@ -116 +116 @@
 # pylint: enable=bad-whitespace, line-too-long
 
-source = ["lib/sph_j1c.c", "lib/gauss150.c", "lib/sphere_form.c", "fcc.c"]
+source = ["lib/sph_j1c.c", "lib/gauss150.c", "lib/sphere_form.c", "fcc_paracrystal_kernel.c"]
 
 # parameters for demo
 demo = dict(scale=1, background=0,
-            dnn=220, d_factor=0.06, sld=4, solvent_sld=1,
+            dnn=220, d_factor=0.06, sld=4, sld_solvent=1,
             radius=40,
             theta=60, phi=60, psi=60,
@@ -132 +132 @@
 # names and the target sasview model name.
 oldname = 'FCCrystalModel'
-oldpars = dict(sld='sldSph', solvent_sld='sldSolv')
+oldpars = dict(sld='sldSph', sld_solvent='sldSolv')