Changeset aad336c in sasmodels for sasmodels/models/core_shell_parallelepiped.py

Timestamp:

Mar 21, 2016 7:59:28 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:

9418d75

Parents:

728136f

Message:

replaced wrong eqn in broad_peak doc, renamed sld's etc

File:

• sasmodels/models/core_shell_parallelepiped.py (modified) (3 diffs)

sasmodels/models/core_shell_parallelepiped.py

@@ -111 +111 @@
 
 #             ["name", "units", default, [lower, upper], "type","description"],
-parameters = [["core_sld", "1e-6/Ang^2", 1, [-inf, inf], "",
+parameters = [["sld_core", "1e-6/Ang^2", 1, [-inf, inf], "",
                "Parallelepiped core scattering length density"],
-              ["arim_sld", "1e-6/Ang^2", 2, [-inf, inf], "",
+              ["sld_a", "1e-6/Ang^2", 2, [-inf, inf], "",
                "Parallelepiped A rim scattering length density"],
-              ["brim_sld", "1e-6/Ang^2", 4, [-inf, inf], "",
+              ["sld_b", "1e-6/Ang^2", 4, [-inf, inf], "",
                "Parallelepiped B rim scattering length density"],
-              ["crim_sld", "1e-6/Ang^2", 2, [-inf, inf], "",
+              ["sld_c", "1e-6/Ang^2", 2, [-inf, inf], "",
                "Parallelepiped C rim scattering length density"],
-              ["solvent_sld", "1e-6/Ang^2", 6, [-inf, inf], "",
+              ["sld_solvent", "1e-6/Ang^2", 6, [-inf, inf], "",
                "Solvent scattering length density"],
               ["a_side", "Ang", 35, [0, inf], "volume",
@@ -161 +161 @@
 # parameters for demo
 demo = dict(scale=1, background=0.0,
-            core_sld=1e-6, arim_sld=2e-6, brim_sld=4e-6,
-            crim_sld=2e-6, solvent_sld=6e-6,
+            sld_core=1e-6, sld_a=2e-6, sld_b=4e-6,
+            sld_c=2e-6, sld_solvent=6e-6,
             a_side=35, b_side=75, c_side=400,
             arim_thickness=10, brim_thickness=10, crim_thickness=10,
@@ -181 +181 @@
 oldname = 'CSParallelepipedModel'
 oldpars = dict(theta='parallel_theta', phi='parallel_phi', psi='parallel_psi',
-               core_sld='sld_pcore', arim_sld='sld_rimA', brim_sld='sld_rimB',
-               crim_sld='sld_rimC', solvent_sld='sld_solv',
+               sld_core='sld_pcore', sld_a='sld_rimA', sld_b='sld_rimB',
+               sld_c='sld_rimC', sld_solvent='sld_solv',
                a_side='shortA', b_side='midB', c_side='longC',
                arim_thickness='rimA', brim_thickness='rimB', crim_thickness='rimC')