Changeset 3e428ec in sasmodels for sasmodels/models/parallelepiped.py

Timestamp:

Mar 9, 2015 3:14:03 PM (9 years ago)

Author:

Doucet, Mathieu <doucetm@…>

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:

ddfe69c

Parents:

485aee2

Message:

Cleaning up

File:

• sasmodels/models/parallelepiped.py (modified) (2 diffs)

sasmodels/models/parallelepiped.py

@@ -116 +116 @@
 category = "shape:parallelpiped"
 
-parameters = [
-    #   [ "name", "units", default, [lower, upper], "type",
-    #     "description" ],
-    ["sld", "1e-6/Ang^2", 4, [-inf, inf], "",
-     "Parallelepiped scattering length density"],
-    ["solvent_sld", "1e-6/Ang^2", 1, [-inf, inf], "",
-     "Solvent scattering length density"],
-    ["a_side", "Ang", 35, [0, inf], "volume",
-     "Shorter side of the parallelepiped"],
-    ["b_side", "Ang", 75, [0, inf], "volume",
-     "Second side of the parallelepiped"],
-    ["c_side", "Ang", 400, [0, inf], "volume",
-     "Larger side of the parallelepiped"],
-    ["theta", "degrees", 60, [-inf, inf], "orientation",
-     "In plane angle"],
-    ["phi", "degrees", 60, [-inf, inf], "orientation",
-     "Out of plane angle"],
-    ["psi", "degrees", 60, [-inf, inf], "orientation",
-     "Rotation angle around its own c axis against q plane"],
-    ]
+#             ["name", "units", default, [lower, upper], "type","description"],
+parameters = [["sld", "1e-6/Ang^2", 4, [-inf, inf], "",
+               "Parallelepiped scattering length density"],
+              ["solvent_sld", "1e-6/Ang^2", 1, [-inf, inf], "",
+               "Solvent scattering length density"],
+              ["a_side", "Ang", 35, [0, inf], "volume",
+               "Shorter side of the parallelepiped"],
+              ["b_side", "Ang", 75, [0, inf], "volume",
+               "Second side of the parallelepiped"],
+              ["c_side", "Ang", 400, [0, inf], "volume",
+               "Larger side of the parallelepiped"],
+              ["theta", "degrees", 60, [-inf, inf], "orientation",
+               "In plane angle"],
+              ["phi", "degrees", 60, [-inf, inf], "orientation",
+               "Out of plane angle"],
+              ["psi", "degrees", 60, [-inf, inf], "orientation",
+               "Rotation angle around its own c axis against q plane"],
+             ]
 
 source = ["lib/J1.c", "lib/gauss76.c", "parallelepiped.c"]
@@ -154 +152 @@
 
 # parameters for demo
-demo = dict(
-    scale=1, background=0,
-    sld=6.3e-6, solvent_sld=1.0e-6,
-    a_side=35, b_side=75, c_side=400,
-    theta=45, phi=30, psi=15,
-    a_side_pd=0.1, a_side_pd_n=10,
-    b_side_pd=0.1, b_side_pd_n=1,
-    c_side_pd=0.1, c_side_pd_n=10,
-    theta_pd=10, theta_pd_n=1,
-    phi_pd=10, phi_pd_n=1,
-    psi_pd=10, psi_pd_n=10,
-    )
+demo = dict(scale=1, background=0,
+            sld=6.3e-6, solvent_sld=1.0e-6,
+            a_side=35, b_side=75, c_side=400,
+            theta=45, phi=30, psi=15,
+            a_side_pd=0.1, a_side_pd_n=10,
+            b_side_pd=0.1, b_side_pd_n=1,
+            c_side_pd=0.1, c_side_pd_n=10,
+            theta_pd=10, theta_pd_n=1,
+            phi_pd=10, phi_pd_n=1,
+            psi_pd=10, psi_pd_n=10)
 
 # For testing against the old sasview models, include the converted parameter