Changes in / [e42b0b9:728136f] in sasmodels

Location:

sasmodels/models

Files:

• barbell.py (modified) (3 diffs)
• bcc.c (deleted)
• bcc.py (deleted)
• bcc_paracrystal.py (added)
• bcc_paracrystal_kernel.c (added)
• fcc.c (deleted)
• fcc.py (deleted)
• fcc_paracrystal.py (added)
• fcc_paracrystal_kernel.c (added)
• sc_crystal.c (deleted)
• sc_crystal.py (deleted)
• sc_paracrystal.py (added)
• sc_paracrystal_kernel.c (added)

sasmodels/models/barbell.py

@@ -101 +101 @@
 # pylint: disable=bad-whitespace, line-too-long
 #             ["name", "units", default, [lower, upper], "type","description"],
-parameters = [["sld",         "4e-6/Ang^2",   4, [-inf, inf], "",            "Barbell scattering length density"],
-              ["solvent_sld", "1e-6/Ang^2",   1, [-inf, inf], "",            "Solvent scattering length density"],
+parameters = [["sld",         "1e-6/Ang^2",   4, [-inf, inf], "",            "Barbell scattering length density"],
+              ["sld_solvent", "1e-6/Ang^2",   1, [-inf, inf], "",            "Solvent scattering length density"],
               ["bell_radius", "Ang",         40, [0, inf],    "volume",      "Spherical bell radius"],
               ["radius",      "Ang",         20, [0, inf],    "volume",      "Cylindrical bar radius"],
@@ -115 +115 @@
 # parameters for demo
 demo = dict(scale=1, background=0,
-            sld=6, solvent_sld=1,
+            sld=6, sld_solvent=1,
             bell_radius=40, radius=20, length=400,
             theta=60, phi=60,
@@ -128 +128 @@
 oldname = 'BarBellModel'
 oldpars = dict(sld='sld_barbell',
-               solvent_sld='sld_solv', bell_radius='rad_bell',
+               sld_solvent='sld_solv', bell_radius='rad_bell',
                radius='rad_bar', length='len_bar')