Changes in / [0813a99:acfb094] in sasmodels

File:

• sasmodels/resolution.py (modified) (4 diffs)

sasmodels/resolution.py

@@ -84 +84 @@
         self.weight_matrix = pinhole_resolution(self.q_calc, self.q,
                                 np.maximum(q_width, MINIMUM_RESOLUTION))
-        self.q_calc = abs(self.q_calc)
 
     def apply(self, theory):
@@ -126 +125 @@
         self.weight_matrix = \
             slit_resolution(self.q_calc, self.q, qx_width, qy_width)
-        self.q_calc = abs(self.q_calc)
 
     def apply(self, theory):
@@ -155 +153 @@
     # neither trapezoid nor Simpson's rule improved the accuracy.
     edges = bin_edges(q_calc)
-    #edges[edges < 0.0] = 0.0 # clip edges below zero
+    edges[edges < 0.0] = 0.0 # clip edges below zero
     cdf = erf((edges[:, None] - q[None, :]) / (sqrt(2.0)*q_width)[None, :])
     weights = cdf[1:] - cdf[:-1]
@@ -288 +286 @@
     # The current algorithm is a midpoint rectangle rule.
     q_edges = bin_edges(q_calc) # Note: requires q > 0
-    #q_edges[q_edges < 0.0] = 0.0 # clip edges below zero
+    q_edges[q_edges < 0.0] = 0.0 # clip edges below zero
     weights = np.zeros((len(q), len(q_calc)), 'd')