Changeset e9b17b18 in sasmodels

Timestamp:

Aug 7, 2018 9:17:32 AM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

c11d09f, 97d172c

Parents:

2dcd6e7 (diff), 0d87e79 (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 'master' of github.com:sasview/sasmodels

Location:

sasmodels

Files:

• resolution.py (modified) (5 diffs)
• core.py (modified) (1 diff)

sasmodels/resolution.py

@@ -20 +20 @@
 MINIMUM_RESOLUTION = 1e-8
 MINIMUM_ABSOLUTE_Q = 0.02  # relative to the minimum q in the data
-PINHOLE_N_SIGMA = 2.5 # From: Barker & Pedersen 1995 JAC
+# According to (Barker & Pedersen 1995 JAC), 2.5 sigma is a good limit.
+# According to simulations with github.com:scattering/sansresolution.git
+# it is better to use asymmetric bounds (2.5, 3.0)
+PINHOLE_N_SIGMA = (2.5, 3.0)
 
 class Resolution(object):
@@ -90 +93 @@
         # from the geometry, they may appear since we are using a truncated
         # gaussian to represent resolution rather than a skew distribution.
-        cutoff = MINIMUM_ABSOLUTE_Q*np.min(self.q)
-        self.q_calc = self.q_calc[self.q_calc >= cutoff]
+        #cutoff = MINIMUM_ABSOLUTE_Q*np.min(self.q)
+        #self.q_calc = self.q_calc[self.q_calc >= cutoff]
 
         # Build weight matrix from calculated q values
@@ -188 +191 @@
     cdf = erf((edges[:, None] - q[None, :]) / (sqrt(2.0)*q_width)[None, :])
     weights = cdf[1:] - cdf[:-1]
-    # Limit q range to +/- 2.5 sigma
-    qhigh = q + nsigma*q_width
-    #qlow = q - nsigma*q_width  # linear limits
-    qlow = q*q/qhigh  # log limits
+    # Limit q range to (-2.5,+3) sigma
+    try:
+        nsigma_low, nsigma_high = nsigma
+    except TypeError:
+        nsigma_low = nsigma_high = nsigma
+    qhigh = q + nsigma_high*q_width
+    qlow = q - nsigma_low*q_width  # linear limits
+    ##qlow = q*q/qhigh  # log limits
     weights[q_calc[:, None] < qlow[None, :]] = 0.
     weights[q_calc[:, None] > qhigh[None, :]] = 0.
@@ -365 +372 @@
 
 
-def pinhole_extend_q(q, q_width, nsigma=3):
+def pinhole_extend_q(q, q_width, nsigma=PINHOLE_N_SIGMA):
     """
     Given *q* and *q_width*, find a set of sampling points *q_calc* so
@@ -371 +378 @@
     function.
     """
-    q_min, q_max = np.min(q - nsigma*q_width), np.max(q + nsigma*q_width)
+    try:
+        nsigma_low, nsigma_high = nsigma
+    except TypeError:
+        nsigma_low = nsigma_high = nsigma
+    q_min, q_max = np.min(q - nsigma_low*q_width), np.max(q + nsigma_high*q_width)
     return linear_extrapolation(q, q_min, q_max)
 

sasmodels/core.py

@@ -233 +233 @@
         if not callable(model_info.Iq):
             source = generate.make_source(model_info)['dll']
-            old_path = kerneldll.DLL_PATH
+            old_path = kerneldll.SAS_DLL_PATH
             try:
-                kerneldll.DLL_PATH = path
+                kerneldll.SAS_DLL_PATH = path
                 dll = kerneldll.make_dll(source, model_info, dtype=numpy_dtype)
             finally:
-                kerneldll.DLL_PATH = old_path
+                kerneldll.SAS_DLL_PATH = old_path
             compiled_dlls.append(dll)
     return compiled_dlls