Changeset 19e8a2b in sasmodels

Timestamp:

Sep 19, 2018 1:16:52 PM (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:

5d40d0c

Parents:

c5f7aa9 (diff), fb7c176 (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' of ​https://github.com/SasView/sasmodels into beta_approx

Location:

sasmodels

Files:

• compare.py (modified) (1 diff)
• models/mono_gauss_coil.py (modified) (1 diff)

sasmodels/compare.py

@@ -352 +352 @@
 
     # If it is a list of choices, pick one at random with equal probability
-    # In practice, the model specific random generator will override.
     par = model_info.parameters[name]
-    if len(par.limits) > 2:  # choice list
-        return np.random.randint(len(par.limits))
+    if par.choices:  # choice list
+        return np.random.randint(len(par.choices))
 
     # If it is a fixed range, pick from it with equal probability.

sasmodels/models/mono_gauss_coil.py

@@ -75 +75 @@
 source = ["mono_gauss_coil.c"]
 have_Fq = False
-effective_radius_type = ["R_g", "2R_g", "3R_g", "(5/3)^0.5*R_g"]
+effective_radius_type = ["R_g", "2R_g", "3R_g", "sqrt(5/3)*R_g"]