Changeset 4f6f7b63 in sasmodels

Timestamp:

Sep 9, 2018 2:41:17 AM (6 years ago)

Author:

richardh

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3f818b2

Parents:

e8eff7b (diff), c952e59 (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.

Message:

Merge branch 'beta_approx_new_R_eff' of ​https://github.com/SasView/sasmodels into beta_approx_new_R_eff

Location:

sasmodels

Files:

• sasview_model.py (modified) (1 diff)
• models/spherical_sld.py (modified) (1 diff)

sasmodels/sasview_model.py

@@ -381 +381 @@
                 continue
             self.params[p.name] = p.default
-            if p.limits and type(p.limits) is list and len(p.limits) > 1:
-                self.details[p.id] = [p.units if not p.choices else p.choices, p.limits[0], p.limits[1]]
-            else:
-                self.details[p.id] = [p.units if not p.choices else p.choices, None, None]
+            self.details[p.id] = [p.units, p.limits[0], p.limits[1]]
             if p.polydisperse:
                 self.details[p.id+".width"] = [

sasmodels/models/spherical_sld.py

@@ -217 +217 @@
               ["interface[n_shells]",  "Ang",        50.0,   [0, inf],       "volume", "thickness of the interface"],
               ["shape[n_shells]",      "",           0,      [SHAPES],       "", "interface shape"],
-              ["nu[n_shells]",         "",           2.5,    [0, inf],       "", "interface shape exponent"],
+              ["nu[n_shells]",         "",           2.5,    [1, inf],       "", "interface shape exponent"],
               ["n_steps",              "",           35,     [0, inf],       "", "number of steps in each interface (must be an odd integer)"],
              ]