Changeset 9404dd3 in sasmodels for sasmodels/resolution2d.py

Timestamp:

Dec 4, 2015 10:41:47 AM (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/resolution2d.py (modified) (4 diffs)

sasmodels/resolution2d.py

@@ -179 +179 @@
 
     from sas.dataloader import Data2D
-    #for i in range(10): print i, 0.001 + i*0.008/9.0
-    #for i in range(100): print i, int(math.floor( (i/ (100/9.0)) ))
+    #for i in range(10): print(i, 0.001 + i*0.008/9.0)
+    #for i in range(100): print(i, int(math.floor( (i/ (100/9.0)) )))
     out = Data2D()
     out.data = z
@@ -198 +198 @@
     value = smear.get_value()
     ## All data are ones, so the smeared should also be ones.
-    print "Data length =", len(value)
-    print " 2D linear function, I = 0 + 1*qy"
+    print("Data length =", len(value))
+    print(" 2D linear function, I = 0 + 1*qy")
     text = " Gaussian weighted averaging on a 2D linear function will "
     text += "provides the results same as without the averaging."
-    print text
-    print "qx_data", "qy_data", "I_nonsmear", "I_smeared"
+    print(text)
+    print("qx_data", "qy_data", "I_nonsmear", "I_smeared")
     for ind in range(len(value)):
-        print x[ind], y[ind], model.evalDistribution([x, y])[ind], value[ind]
+        print(x[ind], y[ind], model.evalDistribution([x, y])[ind], value[ind])
 
 
@@ -218 +218 @@
 
     from DataLoader import Data2D
-    #for i in range(10): print i, 0.001 + i*0.008/9.0
-    #for i in range(100): print i, int(math.floor( (i/ (100/9.0)) ))
+    #for i in range(10): print(i, 0.001 + i*0.008/9.0)
+    #for i in range(100): print(i, int(math.floor( (i/ (100/9.0)) )))
     out = Data2D()
     out.data = z
@@ -233 +233 @@
     value = Smearer2D(out,model,index).get_value()
     ## All data are ones, so the smeared values should also be ones.
-    print "Data length =",len(value), ", Data=",value
-"""
+    print("Data length =",len(value), ", Data=",value)
+"""