Changeset 9404dd3 in sasmodels for sasmodels/resolution.py

Timestamp:

Dec 4, 2015 12:41:47 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

eaca9eb

Parents:

7bb290c

Message:

python 3.x support

File:

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

sasmodels/resolution.py

@@ -134 +134 @@
     Apply the resolution weight matrix to the computed theory function.
     """
-    #print "apply shapes", theory.shape, weight_matrix.shape
+    #print("apply shapes", theory.shape, weight_matrix.shape)
     Iq = np.dot(theory[None,:], weight_matrix)
-    #print "result shape",Iq.shape
+    #print("result shape",Iq.shape)
     return Iq.flatten()
 
@@ -287 +287 @@
     weights = np.zeros((len(q), len(q_calc)), 'd')
 
-    #print q_calc
+    #print(q_calc)
     for i, (qi, w, h) in enumerate(zip(q, width, height)):
         if w == 0. and h == 0.:
@@ -301 +301 @@
             in_x = 1.0 * ((q_calc >= qi-h) & (q_calc <= qi+h))
             abs_x = 1.0*(q_calc < abs(qi - h)) if qi < h else 0.
-            #print qi - h, qi + h
-            #print in_x + abs_x
+            #print(qi - h, qi + h)
+            #print(in_x + abs_x)
             weights[i,:] = (in_x + abs_x) * np.diff(q_edges) / (2*h)
         else:
@@ -320 +320 @@
     u_edges[q_edges > u_limit] = u_limit**2 - qi**2
     weights = np.diff(np.sqrt(u_edges))/w
-    #print "i, qi",i,qi,qi+width
-    #print q_calc
-    #print weights
+    #print("i, qi",i,qi,qi+width)
+    #print(q_calc)
+    #print(weights)
     return weights
 
@@ -521 +521 @@
             u = sqrt((qi+h_grid)**2 + w_grid**2)
             Iu = np.interp(u, q_calc, Iq)
-            #print np.trapz(Iu, w_grid, axis=1)
+            #print(np.trapz(Iu, w_grid, axis=1))
             Is = np.trapz(np.trapz(Iu, w_grid, axis=1), h_grid[:,0])
             result[i] = Is / (2*h*w)
@@ -675 +675 @@
         #idx = abs(err) >= tolerance
         #problem = zip(q[idx], output[idx], answer[idx], err[idx])
-        #print "\n".join(str(v) for v in problem)
+        #print("\n".join(str(v) for v in problem))
         np.testing.assert_allclose(output, answer, rtol=tolerance)
 
@@ -786 +786 @@
         output = resolution.apply(eval_form(resolution.q_calc, form, pars))
         # TODO: 10% is too much error; use better algorithm
-        #print np.max(abs(answer-output)/answer)
+        #print(np.max(abs(answer-output)/answer))
         self.compare(q, output, answer, 0.1)