Changeset d277229 in sasmodels for sasmodels/models/mono_gauss_coil.py

Timestamp:

Sep 7, 2018 3:29:38 AM (6 years ago)

Author:

grethevj

Branches:

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

Children:

3c60146

Parents:

2a12351b

Message:

Models updated to include choices for effective interaction radii

File:

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

sasmodels/models/mono_gauss_coil.py

@@ -54 +54 @@
 
 import numpy as np
-from numpy import inf, exp, errstate
+from numpy import inf
 
 name = "mono_gauss_coil"
@@ -69 +69 @@
 parameters = [
     ["i_zero", "1/cm", 70.0, [0.0, inf], "", "Intensity at q=0"],
-    ["rg", "Ang", 75.0, [0.0, inf], "", "Radius of gyration"],
+    ["rg", "Ang", 75.0, [0.0, inf], "volume", "Radius of gyration"],
     ]
+
+source = ["mono_gauss_coil.c"]
+have_Fq = False
+effective_radius_type = ["R_g","2R_g","3R_g","(5/3)^0.5*R_g"]
+
+
 # pylint: enable=bad-whitespace, line-too-long
 
-# NB: Scale and Background are implicit parameters on every model
-def Iq(q, i_zero, rg):
-    # pylint: disable = missing-docstring
-    z = (q * rg)**2
-
-    with errstate(invalid='ignore'):
-        inten = (i_zero * 2.0) * (exp(-z) + z - 1.0)/z**2
-        inten[q == 0] = i_zero
-    return inten
-Iq.vectorized = True # Iq accepts an array of q values
+## NB: Scale and Background are implicit parameters on every model
+#def Iq(q, i_zero, rg):
+#    # pylint: disable = missing-docstring
+#    z = (q * rg)**2
+#
+#    with errstate(invalid='ignore'):
+#        inten = (i_zero * 2.0) * (exp(-z) + z - 1.0)/z**2
+#        inten[q == 0] = i_zero
+#    return inten
+#Iq.vectorized = True # Iq accepts an array of q values
 
 def random():